Project

General

Profile

« Previous | Next » 

Revision ba9ae2c8

Added by Leszek Koltunski about 4 years ago

Fixes for the merge.

View differences:

src/main/java/org/distorted/examples/rubik/RubikRenderer.java
41 41 

  		




  42
  42
  
    
    private RubikSurfaceView mView;


  		




  43
  43
  
    
    private DistortedScreen mScreen;


  		




  44
  
  
    
    private Static3D mMove, mScale;


  		




  
  44
  
    
    private Static3D mScale;


  		




  45
  45
  
    
    private int mNextCubeSize;


  		




  46
  46
  
    
    private boolean mChangeCubeSizeNow;


  		




  47
  47
  
    
    private int mNumCube;


  		




  ......




  59
  59
  
    

  		




  60
  60
  
    
      mScreenWidth = mScreenHeight = 0;


  		




  61
  61
  
    

  		




  62
  
  
    
      mMove  = new Static3D(0,0,0);


  		




  63
  62
  
    
      mScale = new Static3D(1,1,1);


  		




  64
  63
  
    

  		




  65
  64
  
    
      mNextCubeSize= MIN_CUBE_SIZE;


  		




  ......




  130
  129
  
    
   private void createNextCube()


  		




  131
  130
  
    
     {


  		




  132
  131
  
    
     if( mCube!=null ) mCube.releaseResources();


  		




  133
  
  
    
     mCube = new RubikCube(mNextCubeSize, mMove, mScale);


  		




  
  132
  
    
     mCube = new RubikCube(mNextCubeSize, mScale);


  		




  134
  133
  
    
     mCube.createTexture();


  		




  135
  134
  
    

  		




  136
  135
  
    
     if( mScreenWidth!=0 ) recomputeScaleFactor(mScreenWidth,mScreenHeight);


  		




  ......




  158
  157
  
    
     float texSize = mCube.getStretchSize();


  		




  159
  158
  
    
     float scaleFactor = cubeSizeInScreenSpace/(texSize*mCube.getSize());


  		




  160
  159
  
    

  		




  161
  
  
    
     mMove.set( (screenWidth-scaleFactor*texSize)/2 , (screenHeight-scaleFactor*texSize)/2 , -scaleFactor*texSize/2 );


  		




  162
  160
  
    
     mScale.set(scaleFactor,scaleFactor,scaleFactor);


  		




  163
  161
  
    
     }


  		




  164
  162
  
    
}


  		












Also available in:  Unified diff