Revision 8005e762
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/main/TwistyObject.java | ||
|---|---|---|
| 1111 | 1111 |
mRotationAngleStatic.set0(0.0f); |
| 1112 | 1112 |
mRotationAxis.set( mAxis[axis] ); |
| 1113 | 1113 |
mRotationAngle.add(mRotationAngleStatic); |
| 1114 |
mRotateEffect.setMeshAssociation( mRotRowBitmap<<(axis* ObjectList.MAX_OBJECT_SIZE) , -1);
|
|
| 1114 |
mRotateEffect.setMeshAssociation( mRotRowBitmap<<(axis* ObjectType.MAX_OBJECT_SIZE) , -1);
|
|
| 1115 | 1115 |
} |
| 1116 | 1116 |
|
| 1117 | 1117 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 1129 | 1129 |
mRotationAngle.resetToBeginning(); |
| 1130 | 1130 |
mRotationAngle.add(new Static1D(0)); |
| 1131 | 1131 |
mRotationAngle.add(new Static1D(angle)); |
| 1132 |
mRotateEffect.setMeshAssociation( mRotRowBitmap<<(axis*ObjectList.MAX_OBJECT_SIZE) , -1);
|
|
| 1132 |
mRotateEffect.setMeshAssociation( mRotRowBitmap<<(axis* ObjectType.MAX_OBJECT_SIZE) , -1);
|
|
| 1133 | 1133 |
mRotateEffect.notifyWhenFinished(listener); |
| 1134 | 1134 |
|
| 1135 | 1135 |
return mRotateEffect.getID(); |
| ... | ... | |
| 1270 | 1270 |
|
| 1271 | 1271 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 1272 | 1272 |
|
| 1273 |
public ObjectList getObjectList()
|
|
| 1273 |
public ObjectType getObjectList()
|
|
| 1274 | 1274 |
{
|
| 1275 | 1275 |
return intGetObjectList(mNumLayers); |
| 1276 | 1276 |
} |
| ... | ... | |
| 1304 | 1304 |
protected abstract ObjectSticker retSticker(int face); |
| 1305 | 1305 |
protected abstract int getFaceColor(int cubit, int cubitface, int numLayers); |
| 1306 | 1306 |
protected abstract int getResource(int mNumLayers); |
| 1307 |
protected abstract ObjectList intGetObjectList(int numLayers);
|
|
| 1307 |
protected abstract ObjectType intGetObjectList(int numLayers);
|
|
| 1308 | 1308 |
|
| 1309 | 1309 |
public abstract Movement getMovement(); |
| 1310 | 1310 |
public abstract Static3D[] getRotationAxis(); |
Also available in: Unified diff
Reename ObjectList to a more logical ObjectType.