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/main/RubikPreRender.java
246 246 
    {
247 247 
    mChangeObject = false;
248 248 

  		




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


  		




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


  		




  250
  250
  
    
      {


  		




  251
  251
  
    
      blockEverything(BlockController.RUBIK_PLACE_1);


  		




  252
  252
  
    
      createObjectNow(mNextObject, null);


  		




  ......




  260
  260
  
    
    {


  		




  261
  261
  
    
    mSetupObject = false;


  		




  262
  262
  
    

  		




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


  		




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


  		




  264
  264
  
    
      {


  		




  265
  265
  
    
      blockEverything(BlockController.RUBIK_PLACE_2);


  		




  266
  266
  
    
      createObjectNow(mNextObject, mNextMoves);


  		




  ......




  322
  322
  
    
  private void resetAllTextureMapsNow()


  		




  323
  323
  
    
    {


  		




  324
  324
  
    
    mResetAllTextureMaps = false;


  		




  325
  
  
    

  		




  326
  325
  
    
    if( mNewObject!=null ) mNewObject.resetAllTextureMaps();


  		




  327
  326
  
    
    }


  		




  328
  327
  
    

  		












Also available in:  Unified diff