Revision 4888e97c
Added by Leszek Koltunski about 4 years ago
| src/main/java/org/distorted/magic/RubikRenderer.java | ||
|---|---|---|
| 44 | 44 |
private RubikSurfaceView mView; |
| 45 | 45 |
private DistortedScreen mScreen; |
| 46 | 46 |
private RubikObjectList mNextObject; |
| 47 |
private int mNextSize; |
|
| 47 | 48 |
private int mScrambleObjectNum; |
| 48 | 49 |
private long mRotationFinishedID; |
| 49 | 50 |
private long[] mEffectID; |
| ... | ... | |
| 85 | 86 |
|
| 86 | 87 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 87 | 88 |
|
| 88 |
private void createObjectNow(RubikObjectList object) |
|
| 89 |
private void createObjectNow(RubikObjectList object, int size)
|
|
| 89 | 90 |
{
|
| 90 | 91 |
boolean firstTime = (mNewObject==null); |
| 91 | 92 |
|
| 92 | 93 |
if( mOldObject!=null ) mOldObject.releaseResources(); |
| 93 | 94 |
mOldObject = mNewObject; |
| 94 | 95 |
|
| 95 |
mNewObject = object.create(mView.getQuatCurrent(), mView.getQuatAccumulated()); |
|
| 96 |
mNewObject = object.create(size, mView.getQuatCurrent(), mView.getQuatAccumulated());
|
|
| 96 | 97 |
mNewObject.createTexture(); |
| 97 | 98 |
mView.setMovement(object.getObjectMovementClass()); |
| 98 | 99 |
|
| ... | ... | |
| 154 | 155 |
|
| 155 | 156 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 156 | 157 |
|
| 157 |
boolean createObject(RubikObjectList object) |
|
| 158 |
boolean createObject(RubikObjectList object, int size)
|
|
| 158 | 159 |
{
|
| 159 |
if( mCanDrag && mCanRotate && object!=mNextObject )
|
|
| 160 |
if( mCanDrag && mCanRotate && (object!=mNextObject || mNextSize!=size) && size>0 )
|
|
| 160 | 161 |
{
|
| 161 | 162 |
mChangeObject = true; |
| 162 | 163 |
mNextObject = object; |
| 164 |
mNextSize = size; |
|
| 163 | 165 |
return true; |
| 164 | 166 |
} |
| 165 | 167 |
|
| ... | ... | |
| 286 | 288 |
mCanDrag = false; |
| 287 | 289 |
mCanRotate = false; |
| 288 | 290 |
mCanUI = false; |
| 289 |
createObjectNow(mNextObject); |
|
| 291 |
createObjectNow(mNextObject, mNextSize);
|
|
| 290 | 292 |
doEffectNow( BaseEffect.Type.SIZECHANGE ); |
| 291 | 293 |
} |
| 292 | 294 |
|
Also available in: Unified diff
Major restructuring around making it possible to include different kinds of RubikObjects in the UI.