Revision 8592461c
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/main/ObjectType.java | ||
|---|---|---|
| 34 | 34 |
|
| 35 | 35 |
public enum ObjectType |
| 36 | 36 |
{
|
| 37 |
CUBE_2 ( 2, 12, R.drawable.small_cube2, R.drawable.medium_cube2, R.drawable.big_cube2, R.drawable.huge_cube2),
|
|
| 38 |
CUBE_3 ( 3, 17, R.drawable.small_cube3, R.drawable.medium_cube3, R.drawable.big_cube3, R.drawable.huge_cube3),
|
|
| 39 |
CUBE_4 ( 4, 24, R.drawable.small_cube4, R.drawable.medium_cube4, R.drawable.big_cube4, R.drawable.huge_cube4),
|
|
| 40 |
CUBE_5 ( 5, 28, R.drawable.small_cube5, R.drawable.medium_cube5, R.drawable.big_cube5, R.drawable.huge_cube5),
|
|
| 41 |
JING_2 ( 2, 11, R.drawable.small_jing2, R.drawable.medium_jing2, R.drawable.big_jing2, R.drawable.huge_jing2),
|
|
| 42 |
PYRA_3 ( 3, 10, R.drawable.small_pyra3, R.drawable.medium_pyra3, R.drawable.big_pyra3, R.drawable.huge_pyra3),
|
|
| 43 |
PYRA_4 ( 4, 17, R.drawable.small_pyra4, R.drawable.medium_pyra4, R.drawable.big_pyra4, R.drawable.huge_pyra4),
|
|
| 44 |
PYRA_5 ( 5, 23, R.drawable.small_pyra5, R.drawable.medium_pyra5, R.drawable.big_pyra5, R.drawable.huge_pyra5),
|
|
| 45 |
KILO_3 ( 3, 18, R.drawable.small_kilo3, R.drawable.medium_kilo3, R.drawable.big_kilo3, R.drawable.huge_kilo3),
|
|
| 46 |
KILO_5 ( 5, 33, R.drawable.small_kilo5, R.drawable.medium_kilo5, R.drawable.big_kilo5, R.drawable.huge_kilo5),
|
|
| 47 |
MEGA_3 ( 3, 21, R.drawable.small_mega3, R.drawable.medium_mega3, R.drawable.big_mega3, R.drawable.huge_mega3),
|
|
| 48 |
MEGA_5 ( 5, 37, R.drawable.small_mega5, R.drawable.medium_mega5, R.drawable.big_mega5, R.drawable.huge_mega5),
|
|
| 49 |
ULTI_2 ( 2, 18, R.drawable.small_ulti , R.drawable.medium_ulti , R.drawable.big_ulti , R.drawable.huge_ulti ),
|
|
| 50 |
DIAM_2 ( 2, 12, R.drawable.small_diam2, R.drawable.medium_diam2, R.drawable.big_diam2, R.drawable.huge_diam2),
|
|
| 51 |
DIAM_3 ( 3, 24, R.drawable.small_diam3, R.drawable.medium_diam3, R.drawable.big_diam3, R.drawable.huge_diam3),
|
|
| 52 |
DIAM_4 ( 4, 32, R.drawable.small_diam4, R.drawable.medium_diam4, R.drawable.big_diam4, R.drawable.huge_diam4),
|
|
| 53 |
DINO_3 ( 3, 10, R.drawable.small_dino , R.drawable.medium_dino , R.drawable.big_dino , R.drawable.huge_dino ),
|
|
| 54 |
DIN4_3 ( 3, 7, R.drawable.small_din4 , R.drawable.medium_din4 , R.drawable.big_din4 , R.drawable.huge_din4 ),
|
|
| 55 |
REDI_3 ( 3, 16, R.drawable.small_redi , R.drawable.medium_redi , R.drawable.big_redi , R.drawable.huge_redi ),
|
|
| 56 |
HELI_3 ( 3, 20, R.drawable.small_heli , R.drawable.medium_heli , R.drawable.big_heli , R.drawable.huge_heli ),
|
|
| 57 |
SKEW_2 ( 2, 11, R.drawable.small_skew2, R.drawable.medium_skew2, R.drawable.big_skew2, R.drawable.huge_skew2),
|
|
| 58 |
SKEW_3 ( 3, 21, R.drawable.small_skew3, R.drawable.medium_skew3, R.drawable.big_skew3, R.drawable.huge_skew3),
|
|
| 59 |
IVY_2 ( 2, 8, R.drawable.small_ivy , R.drawable.medium_ivy , R.drawable.big_ivy , R.drawable.huge_ivy ),
|
|
| 60 |
REX_3 ( 3, 19, R.drawable.small_rex , R.drawable.medium_rex , R.drawable.big_rex , R.drawable.huge_rex ),
|
|
| 61 |
BAN1_3 ( 3, 16, R.drawable.small_ban1 , R.drawable.medium_ban1 , R.drawable.big_ban1 , R.drawable.huge_ban1 ),
|
|
| 62 |
BAN2_3 ( 3, 16, R.drawable.small_ban2 , R.drawable.medium_ban2 , R.drawable.big_ban2 , R.drawable.huge_ban2 ),
|
|
| 63 |
BAN3_3 ( 3, 16, R.drawable.small_ban3 , R.drawable.medium_ban3 , R.drawable.big_ban3 , R.drawable.huge_ban3 ),
|
|
| 64 |
BAN4_3 ( 3, 16, R.drawable.small_ban4 , R.drawable.medium_ban4 , R.drawable.big_ban4 , R.drawable.huge_ban4 ),
|
|
| 65 |
SQU1_3 ( 3, 24, R.drawable.small_squa1, R.drawable.medium_squa1, R.drawable.big_squa1, R.drawable.huge_squa1),
|
|
| 66 |
SQU2_3 ( 3, 24, R.drawable.small_squa2, R.drawable.medium_squa2, R.drawable.big_squa2, R.drawable.huge_squa2),
|
|
| 67 |
MIRR_2 ( 2, 12, R.drawable.small_mirr2, R.drawable.medium_mirr2, R.drawable.big_mirr2, R.drawable.huge_mirr2),
|
|
| 68 |
MIRR_3 ( 3, 17, R.drawable.small_mirr3, R.drawable.medium_mirr3, R.drawable.big_mirr3, R.drawable.huge_mirr3),
|
|
| 37 |
CUBE_2 ( 2, 12, R.drawable.s_cube_2, R.drawable.m_cube_2, R.drawable.b_cube_2, R.drawable.h_cube_2),
|
|
| 38 |
CUBE_3 ( 3, 17, R.drawable.s_cube_3, R.drawable.m_cube_3, R.drawable.b_cube_3, R.drawable.h_cube_3),
|
|
| 39 |
CUBE_4 ( 4, 24, R.drawable.s_cube_4, R.drawable.m_cube_4, R.drawable.b_cube_4, R.drawable.h_cube_4),
|
|
| 40 |
CUBE_5 ( 5, 28, R.drawable.s_cube_5, R.drawable.m_cube_5, R.drawable.b_cube_5, R.drawable.h_cube_5),
|
|
| 41 |
JING_2 ( 2, 11, R.drawable.s_jing_2, R.drawable.m_jing_2, R.drawable.b_jing_2, R.drawable.h_jing_2),
|
|
| 42 |
PYRA_3 ( 3, 10, R.drawable.s_pyra_3, R.drawable.m_pyra_3, R.drawable.b_pyra_3, R.drawable.h_pyra_3),
|
|
| 43 |
PYRA_4 ( 4, 17, R.drawable.s_pyra_4, R.drawable.m_pyra_4, R.drawable.b_pyra_4, R.drawable.h_pyra_4),
|
|
| 44 |
PYRA_5 ( 5, 23, R.drawable.s_pyra_5, R.drawable.m_pyra_5, R.drawable.b_pyra_5, R.drawable.h_pyra_5),
|
|
| 45 |
KILO_3 ( 3, 18, R.drawable.s_kilo_3, R.drawable.m_kilo_3, R.drawable.b_kilo_3, R.drawable.h_kilo_3),
|
|
| 46 |
KILO_5 ( 5, 33, R.drawable.s_kilo_5, R.drawable.m_kilo_5, R.drawable.b_kilo_5, R.drawable.h_kilo_5),
|
|
| 47 |
MEGA_3 ( 3, 21, R.drawable.s_mega_3, R.drawable.m_mega_3, R.drawable.b_mega_3, R.drawable.h_mega_3),
|
|
| 48 |
MEGA_5 ( 5, 37, R.drawable.s_mega_5, R.drawable.m_mega_5, R.drawable.b_mega_5, R.drawable.h_mega_5),
|
|
| 49 |
ULTI_2 ( 2, 18, R.drawable.s_ulti_2, R.drawable.m_ulti_2, R.drawable.b_ulti_2, R.drawable.h_ulti_2),
|
|
| 50 |
DIAM_2 ( 2, 12, R.drawable.s_diam_2, R.drawable.m_diam_2, R.drawable.b_diam_2, R.drawable.h_diam_2),
|
|
| 51 |
DIAM_3 ( 3, 24, R.drawable.s_diam_3, R.drawable.m_diam_3, R.drawable.b_diam_3, R.drawable.h_diam_3),
|
|
| 52 |
DIAM_4 ( 4, 32, R.drawable.s_diam_4, R.drawable.m_diam_4, R.drawable.b_diam_4, R.drawable.h_diam_4),
|
|
| 53 |
DINO_3 ( 3, 10, R.drawable.s_dino_3, R.drawable.m_dino_3, R.drawable.b_dino_3, R.drawable.h_dino_3),
|
|
| 54 |
DIN4_3 ( 3, 7, R.drawable.s_din4_3, R.drawable.m_din4_3, R.drawable.b_din4_3, R.drawable.h_din4_3),
|
|
| 55 |
REDI_3 ( 3, 16, R.drawable.s_redi_3, R.drawable.m_redi_3, R.drawable.b_redi_3, R.drawable.h_redi_3),
|
|
| 56 |
HELI_3 ( 3, 20, R.drawable.s_heli_3, R.drawable.m_heli_3, R.drawable.b_heli_3, R.drawable.h_heli_3),
|
|
| 57 |
SKEW_2 ( 2, 11, R.drawable.s_skew_2, R.drawable.m_skew_2, R.drawable.b_skew_2, R.drawable.h_skew_2),
|
|
| 58 |
SKEW_3 ( 3, 21, R.drawable.s_skew_3, R.drawable.m_skew_3, R.drawable.b_skew_3, R.drawable.h_skew_3),
|
|
| 59 |
IVY_2 ( 2, 8, R.drawable.s_ivy_2 , R.drawable.m_ivy_2 , R.drawable.b_ivy_2 , R.drawable.h_ivy_2 ),
|
|
| 60 |
REX_3 ( 3, 19, R.drawable.s_rex_3 , R.drawable.m_rex_3 , R.drawable.b_rex_3 , R.drawable.h_rex_3 ),
|
|
| 61 |
BAN1_3 ( 3, 16, R.drawable.s_ban1_3, R.drawable.m_ban1_3, R.drawable.b_ban1_3, R.drawable.h_ban1_3),
|
|
| 62 |
BAN2_3 ( 3, 16, R.drawable.s_ban2_3, R.drawable.m_ban2_3, R.drawable.b_ban2_3, R.drawable.h_ban2_3),
|
|
| 63 |
BAN3_3 ( 3, 16, R.drawable.s_ban3_3, R.drawable.m_ban3_3, R.drawable.b_ban3_3, R.drawable.h_ban3_3),
|
|
| 64 |
BAN4_3 ( 3, 16, R.drawable.s_ban4_3, R.drawable.m_ban4_3, R.drawable.b_ban4_3, R.drawable.h_ban4_3),
|
|
| 65 |
SQU1_3 ( 3, 24, R.drawable.s_squ1_3, R.drawable.m_squ1_3, R.drawable.b_squ1_3, R.drawable.h_squ1_3),
|
|
| 66 |
SQU2_3 ( 3, 24, R.drawable.s_squ2_3, R.drawable.m_squ2_3, R.drawable.b_squ2_3, R.drawable.h_squ2_3),
|
|
| 67 |
MIRR_2 ( 2, 12, R.drawable.s_mirr_2, R.drawable.m_mirr_2, R.drawable.b_mirr_2, R.drawable.h_mirr_2),
|
|
| 68 |
MIRR_3 ( 3, 17, R.drawable.s_mirr_3, R.drawable.m_mirr_3, R.drawable.b_mirr_3, R.drawable.h_mirr_3),
|
|
| 69 | 69 |
; |
| 70 | 70 |
|
| 71 | 71 |
public static final int NUM_OBJECTS = values().length; |
| src/main/java/org/distorted/objectlib/objects/TwistyBandagedAbstract.java | ||
|---|---|---|
| 34 | 34 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 35 | 35 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| 36 | 36 |
import org.distorted.objectlib.helpers.ScrambleState; |
| 37 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 37 | 38 |
import org.distorted.objectlib.main.Twisty6; |
| 38 | 39 |
|
| 39 | 40 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 288 | 289 |
X /= (2*MAX); |
| 289 | 290 |
Y /= (2*MAX); |
| 290 | 291 |
|
| 291 |
float R = 0.10f / MAX;
|
|
| 292 |
float S = 0.08f / MAX;
|
|
| 292 |
float radius = 0.10f / MAX;
|
|
| 293 |
float stroke = 0.08f / MAX;
|
|
| 293 | 294 |
float[] coords = { -X,-Y, +X,-Y, +X,+Y, -X,+Y};
|
| 294 |
float[] radii = new float[] {R,R,R,R};
|
|
| 295 |
mStickers[s] = new ObjectSticker(coords,null,radii,S); |
|
| 295 |
float[] radii = new float[] {radius,radius,radius,radius};
|
|
| 296 |
|
|
| 297 |
if( ObjectControl.isInIconMode() ) |
|
| 298 |
{
|
|
| 299 |
stroke*=2.0f; |
|
| 300 |
} |
|
| 301 |
|
|
| 302 |
mStickers[s] = new ObjectSticker(coords,null,radii,stroke); |
|
| 296 | 303 |
} |
| 297 | 304 |
} |
| 298 | 305 |
|
| src/main/java/org/distorted/objectlib/objects/TwistyCube.java | ||
|---|---|---|
| 32 | 32 |
import org.distorted.objectlib.R; |
| 33 | 33 |
import org.distorted.objectlib.main.Movement; |
| 34 | 34 |
import org.distorted.objectlib.main.Movement6; |
| 35 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 35 | 36 |
import org.distorted.objectlib.main.ObjectType; |
| 36 | 37 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 37 | 38 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| ... | ... | |
| 262 | 263 |
{
|
| 263 | 264 |
final float[][] STICKERS = new float[][] { { -0.5f, -0.5f, 0.5f, -0.5f, 0.5f, 0.5f, -0.5f, 0.5f } };
|
| 264 | 265 |
final float radius = 0.10f; |
| 265 |
final float stroke = 0.08f; |
|
| 266 | 266 |
final float[] radii = {radius,radius,radius,radius};
|
| 267 | 267 |
mStickers = new ObjectSticker[STICKERS.length]; |
| 268 |
float stroke = 0.08f; |
|
| 269 |
|
|
| 270 |
if( ObjectControl.isInIconMode() ) |
|
| 271 |
{
|
|
| 272 |
switch(getNumLayers()) |
|
| 273 |
{
|
|
| 274 |
case 2: stroke*=1.8f; break; |
|
| 275 |
case 3: stroke*=2.0f; break; |
|
| 276 |
case 4: stroke*=2.1f; break; |
|
| 277 |
default:stroke*=2.2f; break; |
|
| 278 |
} |
|
| 279 |
} |
|
| 280 |
|
|
| 268 | 281 |
mStickers[0] = new ObjectSticker(STICKERS[0],null,radii,stroke ); |
| 269 | 282 |
} |
| 270 | 283 |
|
| src/main/java/org/distorted/objectlib/objects/TwistyDiamond.java | ||
|---|---|---|
| 32 | 32 |
import org.distorted.objectlib.R; |
| 33 | 33 |
import org.distorted.objectlib.main.Movement; |
| 34 | 34 |
import org.distorted.objectlib.main.Movement8; |
| 35 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 35 | 36 |
import org.distorted.objectlib.main.ObjectType; |
| 36 | 37 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 37 | 38 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| ... | ... | |
| 499 | 500 |
float radius = 0.06f; |
| 500 | 501 |
float stroke = 0.07f; |
| 501 | 502 |
float[] radii = new float[] {radius,radius,radius};
|
| 503 |
|
|
| 504 |
if( ObjectControl.isInIconMode() ) |
|
| 505 |
{
|
|
| 506 |
switch(getNumLayers()) |
|
| 507 |
{
|
|
| 508 |
case 2: stroke*=1.4f; break; |
|
| 509 |
case 3: stroke*=2.0f; break; |
|
| 510 |
case 4: stroke*=2.1f; break; |
|
| 511 |
default:stroke*=2.2f; break; |
|
| 512 |
} |
|
| 513 |
} |
|
| 514 |
|
|
| 502 | 515 |
mStickers = new ObjectSticker[STICKERS.length]; |
| 503 | 516 |
mStickers[0] = new ObjectSticker(STICKERS[0],null,radii,stroke); |
| 504 | 517 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyDino.java | ||
|---|---|---|
| 35 | 35 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 36 | 36 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| 37 | 37 |
import org.distorted.objectlib.helpers.ScrambleState; |
| 38 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 38 | 39 |
import org.distorted.objectlib.main.Twisty6; |
| 39 | 40 |
|
| 40 | 41 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 226 | 227 |
float radius = 0.025f; |
| 227 | 228 |
float stroke = 0.050f; |
| 228 | 229 |
float[] radii = new float[] {radius,radius,radius};
|
| 230 |
|
|
| 231 |
if( ObjectControl.isInIconMode() ) |
|
| 232 |
{
|
|
| 233 |
stroke*=1.5f; |
|
| 234 |
} |
|
| 235 |
|
|
| 229 | 236 |
mStickers = new ObjectSticker[STICKERS.length]; |
| 230 | 237 |
mStickers[0] = new ObjectSticker(STICKERS[0],null,radii,stroke); |
| 231 | 238 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyHelicopter.java | ||
|---|---|---|
| 32 | 32 |
import org.distorted.objectlib.R; |
| 33 | 33 |
import org.distorted.objectlib.main.Movement; |
| 34 | 34 |
import org.distorted.objectlib.main.Movement6; |
| 35 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 35 | 36 |
import org.distorted.objectlib.main.ObjectType; |
| 36 | 37 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 37 | 38 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| ... | ... | |
| 419 | 420 |
float radius = 0.03f; |
| 420 | 421 |
float stroke = 0.05f; |
| 421 | 422 |
float[] radii = new float[] {radius,radius,radius};
|
| 423 |
|
|
| 424 |
if( ObjectControl.isInIconMode() ) |
|
| 425 |
{
|
|
| 426 |
stroke*=2.0f; |
|
| 427 |
} |
|
| 428 |
|
|
| 422 | 429 |
mStickers = new ObjectSticker[STICKERS.length]; |
| 423 | 430 |
mStickers[0] = new ObjectSticker(STICKERS[0],null,radii,stroke); |
| 424 | 431 |
} |
| src/main/java/org/distorted/objectlib/objects/TwistyIvy.java | ||
|---|---|---|
| 32 | 32 |
import org.distorted.objectlib.R; |
| 33 | 33 |
import org.distorted.objectlib.main.Movement; |
| 34 | 34 |
import org.distorted.objectlib.main.Movement6; |
| 35 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 35 | 36 |
import org.distorted.objectlib.main.ObjectType; |
| 36 | 37 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 37 | 38 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| ... | ... | |
| 447 | 448 |
final float[][] angles = { { 0,0,D },{ D,D } };
|
| 448 | 449 |
final float[][] radii = { { 0,0.04f,0 },{ 0.06f,0.06f } };
|
| 449 | 450 |
final float[] strokes = { 0.03f, 0.08f };
|
| 451 |
|
|
| 452 |
if( ObjectControl.isInIconMode() ) |
|
| 453 |
{
|
|
| 454 |
float mult = 1.5f; |
|
| 455 |
strokes[0]*=mult; |
|
| 456 |
strokes[1]*=mult; |
|
| 457 |
} |
|
| 458 |
|
|
| 450 | 459 |
for(int s=0; s<NUM_STICKERS; s++) mStickers[s] = new ObjectSticker(STICKERS[s], angles[s],radii[s],strokes[s]); |
| 451 | 460 |
} |
| 452 | 461 |
|
| src/main/java/org/distorted/objectlib/objects/TwistyJing.java | ||
|---|---|---|
| 32 | 32 |
import org.distorted.objectlib.R; |
| 33 | 33 |
import org.distorted.objectlib.main.Movement; |
| 34 | 34 |
import org.distorted.objectlib.main.Movement4; |
| 35 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 35 | 36 |
import org.distorted.objectlib.main.ObjectType; |
| 36 | 37 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 37 | 38 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| ... | ... | |
| 401 | 402 |
final float R2 = 0.10f; |
| 402 | 403 |
final float R3 = 0.03f; |
| 403 | 404 |
final float[][] radii = { { R1,R1,R1,R1 },{ R3,R3,R2,R2 },{ R1,R1,R1 } };
|
| 404 |
final float[] strokes = { 0.06f, 0.03f, 0.05f };
|
|
| 405 |
float[] strokes = { 0.06f, 0.03f, 0.05f };
|
|
| 406 |
|
|
| 407 |
if( ObjectControl.isInIconMode() ) |
|
| 408 |
{
|
|
| 409 |
strokes[0]*=2.0f; |
|
| 410 |
strokes[1]*=2.0f; |
|
| 411 |
strokes[2]*=2.0f; |
|
| 412 |
} |
|
| 405 | 413 |
|
| 406 | 414 |
for(int s=0; s<STICKERS.length; s++) |
| 407 | 415 |
{
|
| src/main/java/org/distorted/objectlib/objects/TwistyKilominx.java | ||
|---|---|---|
| 32 | 32 |
import org.distorted.library.main.QuatHelper; |
| 33 | 33 |
|
| 34 | 34 |
import org.distorted.objectlib.R; |
| 35 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 35 | 36 |
import org.distorted.objectlib.main.ObjectType; |
| 36 | 37 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 37 | 38 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| ... | ... | |
| 671 | 672 |
|
| 672 | 673 |
float R = 0.10f; |
| 673 | 674 |
final float[][] radii = { {R,R,R,R},{R,R,R,R},{R,R,R,R} };
|
| 674 |
final float[] strokes = { 0.20f, 0.11f, 0.10f };
|
|
| 675 |
float[] strokes = { 0.20f, 0.11f, 0.10f };
|
|
| 676 |
|
|
| 677 |
if( ObjectControl.isInIconMode() ) |
|
| 678 |
{
|
|
| 679 |
float mult = getNumLayers()==3 ? 1.0f : 1.5f; |
|
| 680 |
|
|
| 681 |
strokes[0]*=mult; |
|
| 682 |
strokes[1]*=mult; |
|
| 683 |
strokes[2]*=mult; |
|
| 684 |
} |
|
| 675 | 685 |
|
| 676 | 686 |
for(int s=0; s<STICKERS.length; s++) |
| 677 | 687 |
{
|
| src/main/java/org/distorted/objectlib/objects/TwistyMegaminx.java | ||
|---|---|---|
| 32 | 32 |
import org.distorted.library.main.QuatHelper; |
| 33 | 33 |
|
| 34 | 34 |
import org.distorted.objectlib.R; |
| 35 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 35 | 36 |
import org.distorted.objectlib.main.ObjectType; |
| 36 | 37 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 37 | 38 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| ... | ... | |
| 568 | 569 |
final float R3 = 0.08f; |
| 569 | 570 |
final float R4 = 0.10f; |
| 570 | 571 |
final float[][] radii = { {R0,R0,R0,R0},{R1,R1,R1,R1},{R2,R2,R2,R2},{R3,R3,R3,R3},{R4,R4,R4,R4,R4} };
|
| 571 |
final float[] strokes = { 0.10f,0.12f,0.12f,0.08f,0.07f };
|
|
| 572 |
float[] strokes = { 0.10f,0.12f,0.12f,0.08f,0.07f };
|
|
| 573 |
|
|
| 574 |
if( ObjectControl.isInIconMode() ) |
|
| 575 |
{
|
|
| 576 |
float mult = getNumLayers()==3 ? 1.5f : 2.2f; |
|
| 577 |
|
|
| 578 |
strokes[0]*=mult; |
|
| 579 |
strokes[1]*=mult; |
|
| 580 |
strokes[2]*=mult; |
|
| 581 |
strokes[3]*=mult; |
|
| 582 |
strokes[4]*=mult; |
|
| 583 |
} |
|
| 572 | 584 |
|
| 573 | 585 |
for(int s=0; s<STICKERS.length; s++) |
| 574 | 586 |
{
|
| src/main/java/org/distorted/objectlib/objects/TwistyMirror.java | ||
|---|---|---|
| 32 | 32 |
import org.distorted.objectlib.R; |
| 33 | 33 |
import org.distorted.objectlib.main.Movement; |
| 34 | 34 |
import org.distorted.objectlib.main.Movement6; |
| 35 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 35 | 36 |
import org.distorted.objectlib.main.ObjectType; |
| 36 | 37 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 37 | 38 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| ... | ... | |
| 396 | 397 |
if( mStickers==null ) |
| 397 | 398 |
{
|
| 398 | 399 |
final float[][] STICKERS = generateStickers(); |
| 399 |
final float[] STROKES = generateStrokes(); |
|
| 400 | 400 |
final int NUM_STICKERS = STICKERS.length; |
| 401 | 401 |
final float radius = 0.10f; |
| 402 | 402 |
final float[] radii = {radius,radius,radius,radius};
|
| 403 |
float[] STROKES = generateStrokes(); |
|
| 404 |
|
|
| 405 |
if( ObjectControl.isInIconMode() ) |
|
| 406 |
{
|
|
| 407 |
int len = STROKES.length; |
|
| 408 |
float mult = getNumLayers()==2 ? 1.8f: 2.0f; |
|
| 409 |
for(int i=0; i<len; i++) STROKES[i]*=mult; |
|
| 410 |
} |
|
| 411 |
|
|
| 403 | 412 |
mStickers = new ObjectSticker[NUM_STICKERS]; |
| 404 | 413 |
|
| 405 | 414 |
for(int i=0; i<NUM_STICKERS; i++) |
| src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java | ||
|---|---|---|
| 32 | 32 |
import org.distorted.objectlib.R; |
| 33 | 33 |
import org.distorted.objectlib.main.Movement; |
| 34 | 34 |
import org.distorted.objectlib.main.Movement4; |
| 35 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 35 | 36 |
import org.distorted.objectlib.main.ObjectType; |
| 36 | 37 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 37 | 38 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| ... | ... | |
| 380 | 381 |
if( mStickers==null ) |
| 381 | 382 |
{
|
| 382 | 383 |
float[][] STICKERS = new float[][] { { -0.4330127f, -0.25f, 0.4330127f, -0.25f, 0.0f, 0.5f } };
|
| 383 |
final float stroke = 0.08f; |
|
| 384 | 384 |
final float radius = 0.06f; |
| 385 | 385 |
final float[] radii= {radius,radius,radius};
|
| 386 | 386 |
mStickers = new ObjectSticker[STICKERS.length]; |
| 387 |
|
|
| 388 |
float stroke = 0.08f; |
|
| 389 |
|
|
| 390 |
if( ObjectControl.isInIconMode() ) |
|
| 391 |
{
|
|
| 392 |
switch(getNumLayers()) |
|
| 393 |
{
|
|
| 394 |
case 2: stroke*=1.0f; break; |
|
| 395 |
case 3: stroke*=1.4f; break; |
|
| 396 |
case 4: stroke*=1.7f; break; |
|
| 397 |
default:stroke*=1.9f; break; |
|
| 398 |
} |
|
| 399 |
} |
|
| 400 |
|
|
| 387 | 401 |
mStickers[0] = new ObjectSticker(STICKERS[0],null,radii,stroke); |
| 388 | 402 |
} |
| 389 | 403 |
|
| src/main/java/org/distorted/objectlib/objects/TwistyRedi.java | ||
|---|---|---|
| 32 | 32 |
import org.distorted.objectlib.R; |
| 33 | 33 |
import org.distorted.objectlib.main.Movement; |
| 34 | 34 |
import org.distorted.objectlib.main.Movement6; |
| 35 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 35 | 36 |
import org.distorted.objectlib.main.ObjectType; |
| 36 | 37 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 37 | 38 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| ... | ... | |
| 410 | 411 |
final float R0 = 0.09f; |
| 411 | 412 |
final float R1 = 0.06f; |
| 412 | 413 |
final float[][] radii = { {R0,R0,R0,R0},{R1,R1,R1,R1,R1} };
|
| 413 |
final float[] strokes = { 0.09f,0.06f };
|
|
| 414 |
float[] strokes = { 0.09f,0.06f };
|
|
| 415 |
|
|
| 416 |
if( ObjectControl.isInIconMode() ) |
|
| 417 |
{
|
|
| 418 |
float mult = 2.2f; |
|
| 419 |
strokes[0]*=mult; |
|
| 420 |
strokes[1]*=mult; |
|
| 421 |
} |
|
| 414 | 422 |
|
| 415 | 423 |
mStickers = new ObjectSticker[STICKERS.length]; |
| 416 | 424 |
|
| src/main/java/org/distorted/objectlib/objects/TwistyRex.java | ||
|---|---|---|
| 32 | 32 |
import org.distorted.objectlib.R; |
| 33 | 33 |
import org.distorted.objectlib.main.Movement; |
| 34 | 34 |
import org.distorted.objectlib.main.Movement6; |
| 35 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 35 | 36 |
import org.distorted.objectlib.main.ObjectType; |
| 36 | 37 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 37 | 38 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| ... | ... | |
| 445 | 446 |
final float[][] radii = { {R1,R1,R1},{R2,R2,R2,R2},{0,0,R3} };
|
| 446 | 447 |
final float[] strokes = { 0.06f, 0.07f, 0.05f };
|
| 447 | 448 |
|
| 449 |
if( ObjectControl.isInIconMode() ) |
|
| 450 |
{
|
|
| 451 |
float mult = 1.5f; |
|
| 452 |
strokes[0]*=mult; |
|
| 453 |
strokes[1]*=mult; |
|
| 454 |
strokes[2]*=mult; |
|
| 455 |
} |
|
| 456 |
|
|
| 448 | 457 |
mStickers = new ObjectSticker[STICKERS.length]; |
| 449 | 458 |
|
| 450 | 459 |
for(int s=0; s<STICKERS.length; s++) |
| src/main/java/org/distorted/objectlib/objects/TwistySkewb.java | ||
|---|---|---|
| 32 | 32 |
import org.distorted.objectlib.R; |
| 33 | 33 |
import org.distorted.objectlib.main.Movement; |
| 34 | 34 |
import org.distorted.objectlib.main.Movement6; |
| 35 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 35 | 36 |
import org.distorted.objectlib.main.ObjectType; |
| 36 | 37 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 37 | 38 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| ... | ... | |
| 553 | 554 |
final float[][] radii = { { R1,R1,R1 },{ R2,R2,R2 },{ R3,R3,R3,R3 } };
|
| 554 | 555 |
final float[] strokes = { 0.05f, 0.04f, 0.04f };
|
| 555 | 556 |
|
| 557 |
if( ObjectControl.isInIconMode() ) |
|
| 558 |
{
|
|
| 559 |
float mult = getNumLayers()==2 ? 2.0f : 2.7f; |
|
| 560 |
strokes[0]*=mult; |
|
| 561 |
strokes[1]*=mult; |
|
| 562 |
strokes[2]*=mult; |
|
| 563 |
} |
|
| 564 |
|
|
| 556 | 565 |
mStickers = new ObjectSticker[STICKERS.length+1]; |
| 557 | 566 |
|
| 558 | 567 |
for(int s=0; s<STICKERS.length+1; s++) |
| src/main/java/org/distorted/objectlib/objects/TwistySquare1.java | ||
|---|---|---|
| 29 | 29 |
|
| 30 | 30 |
import org.distorted.objectlib.R; |
| 31 | 31 |
import org.distorted.objectlib.main.Movement6; |
| 32 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 32 | 33 |
import org.distorted.objectlib.main.ObjectType; |
| 33 | 34 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 34 | 35 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| ... | ... | |
| 242 | 243 |
final float R5 = 0.11f; |
| 243 | 244 |
final float R6 = 0.08f; |
| 244 | 245 |
final float[][] radii = { {R1,R1,R1,R1},{R2,R2,R2,R2},{R3,R3,R3,R3},{R4,R4,R4},{R5,R5,R5,R5},{R6,R6,R6,R6} };
|
| 245 |
final float[] strokes = { 0.05f,0.04f,0.09f,0.05f,0.08f,0.08f };
|
|
| 246 |
float[] strokes = { 0.05f,0.04f,0.09f,0.05f,0.08f,0.08f };
|
|
| 247 |
|
|
| 248 |
if( ObjectControl.isInIconMode() ) |
|
| 249 |
{
|
|
| 250 |
float mult = 2.0f; |
|
| 251 |
strokes[0]*=mult; |
|
| 252 |
strokes[1]*=mult; |
|
| 253 |
strokes[2]*=mult; |
|
| 254 |
strokes[3]*=mult; |
|
| 255 |
strokes[4]*=mult; |
|
| 256 |
strokes[5]*=mult; |
|
| 257 |
} |
|
| 246 | 258 |
|
| 247 | 259 |
mStickers = new ObjectSticker[NUM_STICKERS]; |
| 248 | 260 |
|
| src/main/java/org/distorted/objectlib/objects/TwistySquare2.java | ||
|---|---|---|
| 28 | 28 |
import org.distorted.library.type.Static4D; |
| 29 | 29 |
|
| 30 | 30 |
import org.distorted.objectlib.R; |
| 31 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 31 | 32 |
import org.distorted.objectlib.main.ObjectType; |
| 32 | 33 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 33 | 34 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| ... | ... | |
| 247 | 248 |
final float R5 = 0.11f; |
| 248 | 249 |
final float R6 = 0.025f; |
| 249 | 250 |
final float[][] radii = { {R1,R1,R1,R1},{R2,R2,R2,R2},{R3,R3,R3,R3},{R4,R4,R4},{R5,R5,R5,R5},{R6,R6,R6} };
|
| 250 |
final float[] strokes = { 0.05f,0.04f,0.09f,0.05f,0.08f,0.06f };
|
|
| 251 |
float[] strokes = { 0.05f,0.04f,0.09f,0.05f,0.08f,0.06f };
|
|
| 252 |
|
|
| 253 |
if( ObjectControl.isInIconMode() ) |
|
| 254 |
{
|
|
| 255 |
float mult = 2.0f; |
|
| 256 |
strokes[0]*=mult; |
|
| 257 |
strokes[1]*=mult; |
|
| 258 |
strokes[2]*=mult; |
|
| 259 |
strokes[3]*=mult; |
|
| 260 |
strokes[4]*=mult; |
|
| 261 |
strokes[5]*=mult; |
|
| 262 |
} |
|
| 251 | 263 |
|
| 252 | 264 |
mStickers = new ObjectSticker[NUM_STICKERS]; |
| 253 | 265 |
|
| src/main/java/org/distorted/objectlib/objects/TwistyUltimate.java | ||
|---|---|---|
| 32 | 32 |
import org.distorted.objectlib.R; |
| 33 | 33 |
import org.distorted.objectlib.main.Movement; |
| 34 | 34 |
import org.distorted.objectlib.main.Movement12; |
| 35 |
import org.distorted.objectlib.main.ObjectControl; |
|
| 35 | 36 |
import org.distorted.objectlib.main.ObjectType; |
| 36 | 37 |
import org.distorted.objectlib.helpers.ObjectShape; |
| 37 | 38 |
import org.distorted.objectlib.helpers.ObjectSticker; |
| ... | ... | |
| 342 | 343 |
final float R2 = 0.13f; |
| 343 | 344 |
final float R3 = 0.11f; |
| 344 | 345 |
final float[][] radii = { {R1,R1,R1,R1,R1},{R2,R2,R2,R2},{R3,R3,R3,R3} };
|
| 345 |
final float[] strokes = { 0.07f, 0.09f, 0.08f };
|
|
| 346 |
float[] strokes = { 0.07f, 0.09f, 0.08f };
|
|
| 347 |
|
|
| 348 |
if( ObjectControl.isInIconMode() ) |
|
| 349 |
{
|
|
| 350 |
float mult = 1.5f; |
|
| 351 |
strokes[0]*=mult; |
|
| 352 |
strokes[1]*=mult; |
|
| 353 |
strokes[2]*=mult; |
|
| 354 |
} |
|
| 346 | 355 |
|
| 347 | 356 |
mStickers = new ObjectSticker[STICKERS.length]; |
| 348 | 357 |
|
Also available in: Unified diff
'IconMode' finished.