Revision 7ac0ee88
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/tutorials/TutorialPreRender.java | ||
|---|---|---|
| 43 | 43 |
private boolean mUIBlocked, mTouchBlocked; |
| 44 | 44 |
private boolean mIsSolved; |
| 45 | 45 |
private ObjectList mNextObject; |
| 46 |
private int mNextSize; |
|
| 47 | 46 |
private long mRotationFinishedID; |
| 48 | 47 |
private int mScreenWidth; |
| 49 | 48 |
private TwistyObject mOldObject, mNewObject; |
| ... | ... | |
| 85 | 84 |
|
| 86 | 85 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 87 | 86 |
|
| 88 |
private void createObjectNow(ObjectList object, int size)
|
|
| 87 |
private void createObjectNow(ObjectList object) |
|
| 89 | 88 |
{
|
| 90 | 89 |
if( mOldObject!=null ) mOldObject.releaseResources(); |
| 91 | 90 |
mOldObject = mNewObject; |
| ... | ... | |
| 93 | 92 |
Context con = mView.getContext(); |
| 94 | 93 |
Resources res = con.getResources(); |
| 95 | 94 |
|
| 96 |
mNewObject = object.create(size, mView.getQuat(), null, res, mScreenWidth);
|
|
| 95 |
mNewObject = object.create(mView.getQuat(), null, res, mScreenWidth); |
|
| 97 | 96 |
|
| 98 | 97 |
if( mNewObject!=null ) |
| 99 | 98 |
{
|
| ... | ... | |
| 189 | 188 |
{
|
| 190 | 189 |
mChangeObject = false; |
| 191 | 190 |
|
| 192 |
if ( mNewObject==null || mNewObject.getObjectList()!=mNextObject || mNewObject.getNumLayers()!=mNextSize)
|
|
| 191 |
if ( mNewObject==null || mNewObject.getObjectList()!=mNextObject) |
|
| 193 | 192 |
{
|
| 194 | 193 |
blockEverything(BlockController.TUTORIAL_PLACE_1); |
| 195 |
createObjectNow(mNextObject, mNextSize);
|
|
| 194 |
createObjectNow(mNextObject); |
|
| 196 | 195 |
doEffectNow( BaseEffect.Type.SIZECHANGE ); |
| 197 | 196 |
} |
| 198 | 197 |
} |
| ... | ... | |
| 203 | 202 |
{
|
| 204 | 203 |
mSetupObject = false; |
| 205 | 204 |
|
| 206 |
if ( mNewObject==null || mNewObject.getObjectList()!=mNextObject || mNewObject.getNumLayers()!=mNextSize)
|
|
| 205 |
if ( mNewObject==null || mNewObject.getObjectList()!=mNextObject) |
|
| 207 | 206 |
{
|
| 208 | 207 |
blockEverything(BlockController.TUTORIAL_PLACE_2); |
| 209 |
createObjectNow(mNextObject, mNextSize);
|
|
| 208 |
createObjectNow(mNextObject); |
|
| 210 | 209 |
doEffectNow( BaseEffect.Type.SIZECHANGE ); |
| 211 | 210 |
} |
| 212 | 211 |
else |
| ... | ... | |
| 292 | 291 |
|
| 293 | 292 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 294 | 293 |
|
| 295 |
void changeObject(ObjectList object, int size)
|
|
| 294 |
void changeObject(ObjectList object) |
|
| 296 | 295 |
{
|
| 297 |
if( size>0 ) |
|
| 298 |
{
|
|
| 299 |
mChangeObject = true; |
|
| 300 |
mNextObject = object; |
|
| 301 |
mNextSize = size; |
|
| 302 |
} |
|
| 296 |
mChangeObject = true; |
|
| 297 |
mNextObject = object; |
|
| 303 | 298 |
} |
| 304 | 299 |
|
| 305 | 300 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 437 | 432 |
} |
| 438 | 433 |
} |
| 439 | 434 |
|
| 440 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 441 |
|
|
| 442 |
public void resetAllTextureMaps() |
|
| 443 |
{
|
|
| 444 |
mResetAllTextureMaps = true; |
|
| 445 |
} |
|
| 446 |
|
|
| 447 | 435 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 448 | 436 |
|
| 449 | 437 |
public TwistyObject getObject() |
Also available in: Unified diff
Simplify ObjectList: now there's just one object per size.