Revision 57ef6378
Added by Leszek Koltunski over 2 years ago
src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
---|---|---|
230 | 230 |
setObjectRatioNow(scale,720); |
231 | 231 |
|
232 | 232 |
MatrixEffectScale scaleEffect = new MatrixEffectScale(mObjectScale); |
233 |
MatrixEffectQuaternion quatEffect = new MatrixEffectQuaternion(mQuat, CENTER);
|
|
233 |
MatrixEffectQuaternion quatEffect = new MatrixEffectQuaternion(mQuat, CENTER); |
|
234 | 234 |
MatrixEffectMove moveEffect = new MatrixEffectMove(move); |
235 | 235 |
|
236 | 236 |
mNumTexCols = NUM_STICKERS_IN_ROW; |
... | ... | |
1304 | 1304 |
} |
1305 | 1305 |
} |
1306 | 1306 |
|
1307 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
1308 |
|
|
1309 |
public int getCubitQuatIndex(int cubit) |
|
1310 |
{ |
|
1311 |
return CUBITS[cubit].mQuatIndex; |
|
1312 |
} |
|
1313 |
|
|
1307 | 1314 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
1308 | 1315 |
|
1309 | 1316 |
public Bitmap getStickerBitmap() |
... | ... | |
1329 | 1336 |
|
1330 | 1337 |
public TouchControl getMovement() |
1331 | 1338 |
{ |
1332 |
if( mTouchControl ==null )
|
|
1339 |
if( mTouchControl==null ) |
|
1333 | 1340 |
{ |
1334 |
int[] numLayers = getNumLayers(); |
|
1335 |
if( mCuts==null ) getCuts(numLayers); |
|
1336 |
if( mLayerRotatable==null ) mLayerRotatable = getLayerRotatable(numLayers); |
|
1337 |
if( mEnabled==null ) mEnabled = getEnabled(); |
|
1338 |
|
|
1339 |
int movementType = getMovementType(); |
|
1340 |
int movementSplit= getMovementSplit(); |
|
1341 |
|
|
1342 |
switch(movementType) |
|
1341 |
switch(getMovementType()) |
|
1343 | 1342 |
{ |
1344 |
case TC_TETRAHEDRON : mTouchControl = new TouchControlTetrahedron(mAxis,mCuts,mLayerRotatable,mSize,movementSplit,mEnabled);
|
|
1343 |
case TC_TETRAHEDRON : mTouchControl = new TouchControlTetrahedron(this);
|
|
1345 | 1344 |
break; |
1346 |
case TC_HEXAHEDRON : mTouchControl = new TouchControlHexahedron(mAxis,mCuts,mLayerRotatable,mSize,movementSplit,mEnabled);
|
|
1345 |
case TC_HEXAHEDRON : mTouchControl = new TouchControlHexahedron(this);
|
|
1347 | 1346 |
break; |
1348 |
case TC_OCTAHEDRON : mTouchControl = new TouchControlOctahedron(mAxis,mCuts,mLayerRotatable,mSize,movementSplit,mEnabled);
|
|
1347 |
case TC_OCTAHEDRON : mTouchControl = new TouchControlOctahedron(this);
|
|
1349 | 1348 |
break; |
1350 |
case TC_DODECAHEDRON: mTouchControl = new TouchControlDodecahedron(mAxis,mCuts,mLayerRotatable,mSize,movementSplit,mEnabled);
|
|
1349 |
case TC_DODECAHEDRON: mTouchControl = new TouchControlDodecahedron(this);
|
|
1351 | 1350 |
break; |
1352 |
case TC_CUBOID : float[] dist3D = getDist3D(numLayers);
|
|
1353 |
mTouchControl = new TouchControlCuboids(mAxis,mCuts,mLayerRotatable,mSize,movementSplit,mEnabled,dist3D);
|
|
1351 |
case TC_CUBOID : int[] numLayers = getNumLayers();
|
|
1352 |
mTouchControl = new TouchControlCuboids(this,getDist3D(numLayers));
|
|
1354 | 1353 |
break; |
1355 | 1354 |
} |
1356 | 1355 |
} |
Also available in: Unified diff
Float vertices - scratchbook