Revision 1fda81c4
Added by Leszek Koltunski 7 months ago
| src/main/java/org/distorted/objectlib/main/ObjectPreRender.java | ||
|---|---|---|
| 58 | 58 |
private int mCubit, mFace, mNewColor; |
| 59 | 59 |
private int mNearestAngle; |
| 60 | 60 |
private long mScrambleStartTime, mScrambleEndTime; |
| 61 |
private int mMeshState, mIconMode;
|
|
| 61 |
private int mIconMode; |
|
| 62 | 62 |
|
| 63 | 63 |
// debugging only |
| 64 | 64 |
private long mAddRotationTime; |
| ... | ... | |
| 98 | 98 |
|
| 99 | 99 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 100 | 100 |
|
| 101 |
private void createObjectNow(int ordinal, int meshState, int iconMode, InitAssets assets)
|
|
| 101 |
private void createObjectNow(int ordinal, int iconMode, InitAssets assets) |
|
| 102 | 102 |
{
|
| 103 | 103 |
long time1 = System.currentTimeMillis(); |
| 104 | 104 |
Static3D move = new Static3D(mMoveX,mMoveY,0); |
| ... | ... | |
| 108 | 108 |
|
| 109 | 109 |
if( assets==null || assets.noJsonStream() ) |
| 110 | 110 |
{
|
| 111 |
tmp = ObjectType.create( ordinal, meshState, iconMode, quat, move, mScale, assets);
|
|
| 111 |
tmp = ObjectType.create( ordinal, iconMode, quat, move, mScale, assets); |
|
| 112 | 112 |
} |
| 113 | 113 |
else |
| 114 | 114 |
{
|
| 115 |
tmp = new TwistyJson( meshState, iconMode, quat, move, mScale, assets);
|
|
| 115 |
tmp = new TwistyJson( iconMode, quat, move, mScale, assets); |
|
| 116 | 116 |
error = tmp.getError(); |
| 117 | 117 |
} |
| 118 | 118 |
|
| ... | ... | |
| 271 | 271 |
{
|
| 272 | 272 |
mChangeObject = false; |
| 273 | 273 |
blockEverything(BlockController.PLACE_1); |
| 274 |
createObjectNow(mOrdinal,mMeshState,mIconMode,mAsset);
|
|
| 274 |
createObjectNow(mOrdinal,mIconMode,mAsset); |
|
| 275 | 275 |
int duration = BaseEffect.Type.SIZECHANGE.getDuration(); |
| 276 | 276 |
doEffectNow( BaseEffect.Type.SIZECHANGE, duration ); |
| 277 | 277 |
} |
| ... | ... | |
| 527 | 527 |
|
| 528 | 528 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 529 | 529 |
|
| 530 |
public void changeObject(int ordinal, int meshState, int iconMode, InitAssets asset)
|
|
| 530 |
public void changeObject(int ordinal, int iconMode, InitAssets asset) |
|
| 531 | 531 |
{
|
| 532 | 532 |
mChangeObject = true; |
| 533 | 533 |
mOrdinal = ordinal; |
| 534 |
mMeshState = meshState; |
|
| 535 | 534 |
mIconMode = iconMode; |
| 536 | 535 |
mAsset = asset; |
| 537 | 536 |
} |
Also available in: Unified diff
remove 'MESH_NICE'