Revision 1fda81c4
Added by Leszek Koltunski 7 months ago
| src/main/java/org/distorted/objectlib/main/ObjectControl.java | ||
|---|---|---|
| 74 | 74 |
private boolean mIsLocked, mRemLocked; |
| 75 | 75 |
private final int[] mBuffer; |
| 76 | 76 |
private final float[] mAxis; |
| 77 |
private int mMeshState, mIconMode;
|
|
| 77 |
private int mIconMode; |
|
| 78 | 78 |
private boolean mRotateOnCreation; |
| 79 | 79 |
private final Static4D mQuat,mTemp; |
| 80 | 80 |
private int mRotAxisType; |
| ... | ... | |
| 577 | 577 |
mLastT = new long[NUM_SPEED_PROBES]; |
| 578 | 578 |
mFirstIndex= 0; |
| 579 | 579 |
mLastIndex = 0; |
| 580 |
mMeshState =-1; |
|
| 581 | 580 |
mIconMode =-1; |
| 582 | 581 |
|
| 583 | 582 |
mInterface = os.getInterface(); |
| ... | ... | |
| 745 | 744 |
|
| 746 | 745 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 747 | 746 |
|
| 748 |
public void changeObject(int ordinal, int meshState, int iconMode, InitAssets asset)
|
|
| 747 |
public void changeObject(int ordinal, int iconMode, InitAssets asset) |
|
| 749 | 748 |
{
|
| 750 |
mPreRender.changeObject(ordinal, meshState, iconMode, asset);
|
|
| 749 |
mPreRender.changeObject(ordinal, iconMode, asset); |
|
| 751 | 750 |
} |
| 752 | 751 |
|
| 753 | 752 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 754 | 753 |
|
| 755 |
public void changeIfDifferent(int ordinal, String newName, int meshState, int iconMode, InitAssets asset)
|
|
| 754 |
public void changeIfDifferent(int ordinal, String newName, int iconMode, InitAssets asset) |
|
| 756 | 755 |
{
|
| 757 | 756 |
TwistyObject object = mPreRender.getObject(); |
| 758 | 757 |
String oldName = object==null ? "" : object.getShortName(); |
| 759 | 758 |
|
| 760 |
if( !oldName.equals(newName) || mMeshState!=meshState || mIconMode!=iconMode )
|
|
| 759 |
if( !oldName.equals(newName) || mIconMode!=iconMode ) |
|
| 761 | 760 |
{
|
| 762 |
mMeshState = meshState; |
|
| 763 | 761 |
mIconMode = iconMode; |
| 764 |
mPreRender.changeObject(ordinal, meshState, iconMode, asset);
|
|
| 762 |
mPreRender.changeObject(ordinal, iconMode, asset); |
|
| 765 | 763 |
} |
| 766 | 764 |
} |
| 767 | 765 |
|
Also available in: Unified diff
remove 'MESH_NICE'