Project

General

Profile

« Previous | Next » 

Revision c4175d85

Added by Leszek Koltunski over 2 years ago

Simplify TwistyObject's API.

View differences:

src/main/java/org/distorted/tutorials/TutorialPreRender.java
39 39 
  private final TutorialSurfaceView mView;
40 40 
  private boolean mFinishRotation, mRemoveRotation, mAddRotation,
41 41 
                  mSetQuat, mChangeObject, mSetupObject, mSolveObject, mScrambleObject,
42 
                  mInitializeObject, mResetAllTextureMaps, mRemovePatternRotation, mSolve;
42 
                  mInitializeObject, mRemovePatternRotation, mSolve;
43 43 
  private boolean mUIBlocked, mTouchBlocked;
44 44 
  private boolean mIsSolved;
45 45 
  private ObjectType mNextObject;
......
187 187 
    {
188 188 
    mChangeObject = false;
189 189 

  		




  190
  
  
    
    if ( mNewObject==null || mNewObject.getObjectList()!=mNextObject)


  		




  
  190
  
    
    if ( mNewObject==null || mNewObject.getObjectType()!=mNextObject)


  		




  191
  191
  
    
      {


  		




  192
  192
  
    
      blockEverything(BlockController.TUTORIAL_PLACE_1);


  		




  193
  193
  
    
      createObjectNow(mNextObject);


  		




  ......




  201
  201
  
    
    {


  		




  202
  202
  
    
    mSetupObject = false;


  		




  203
  203
  
    

  		




  204
  
  
    
    if ( mNewObject==null || mNewObject.getObjectList()!=mNextObject)


  		




  
  204
  
    
    if ( mNewObject==null || mNewObject.getObjectType()!=mNextObject)


  		




  205
  205
  
    
      {


  		




  206
  206
  
    
      blockEverything(BlockController.TUTORIAL_PLACE_2);


  		




  207
  207
  
    
      createObjectNow(mNextObject);


  		




  ......




  248
  248
  
    
    mNewObject.initializeObject(null);


  		




  249
  249
  
    
    }


  		




  250
  250
  
    

  		




  251
  
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  252
  
  
    

  		




  253
  
  
    
  private void resetAllTextureMapsNow()


  		




  254
  
  
    
    {


  		




  255
  
  
    
    mResetAllTextureMaps = false;


  		




  256
  
  
    

  		




  257
  
  
    
    if( mNewObject!=null ) mNewObject.resetAllTextureMaps();


  		




  258
  
  
    
    }


  		




  259
  
  
    

  		




  260
  251
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  261
  252
  
    

  		




  262
  253
  
    
  private void setQuatNow()


  		




  ......




  312
  303
  
    
    if( mScrambleObject        ) scrambleObjectNow();


  		




  313
  304
  
    
    if( mAddRotation           ) addRotationNow();


  		




  314
  305
  
    
    if( mInitializeObject      ) initializeObjectNow();


  		




  315
  
  
    
    if( mResetAllTextureMaps   ) resetAllTextureMapsNow();


  		




  316
  306
  
    
    if( mRemovePatternRotation ) removePatternRotationNow();


  		




  317
  307
  
    
    }


  		




  318
  308
  
    

  		












Also available in:  Unified diff