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/RubikCube.java
69 69 

  		




  70
  70
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  71
  71
  
    

  		




  72
  
  
    
    RubikCube(int size, Static3D move, Static3D scale)


  		




  
  72
  
    
    RubikCube(int size, Static3D scale)


  		




  73
  73
  
    
      {


  		




  74
  74
  
    
      mSize = size;


  		




  75
  75
  
    

  		




  ......




  84
  84
  
    

  		




  85
  85
  
    
      Static3D[][][] cubeVectors = new Static3D[mSize][mSize][mSize];


  		




  86
  86
  
    

  		




  87
  
  
    
      Static3D center = new Static3D(STRETCH_SIZE*0.5f, STRETCH_SIZE*0.5f, STRETCH_SIZE*0.5f);


  		




  
  87
  
    
      Static3D center = new Static3D(0,0,0);


  		




  88
  88
  
    
      Static4D region = new Static4D(0,0,0, STRETCH_SIZE*0.72f);


  		




  89
  89
  
    

  		




  90
  90
  
    
      VertexEffectSink        sinkEffect = new VertexEffectSink( new Static1D(getSinkStrength()), center, region );


  		




  91
  
  
    
      MatrixEffectMove        moveEffect = new MatrixEffectMove(move);


  		




  92
  91
  
    
      MatrixEffectScale      scaleEffect = new MatrixEffectScale(scale);


  		




  93
  92
  
    
      MatrixEffectQuaternion  quatEffect = new MatrixEffectQuaternion( initializeQuat(), center);


  		




  94
  93
  
    

  		




  ......




  145
  144
  
    
              mEffects[x][y][z].apply( mRotate[x][y][z] );


  		




  146
  145
  
    
              mEffects[x][y][z].apply(quatEffect);


  		




  147
  146
  
    
              mEffects[x][y][z].apply(scaleEffect);


  		




  148
  
  
    
              mEffects[x][y][z].apply(moveEffect);


  		




  149
  147
  
    
              mEffects[x][y][z].apply(sinkEffect);


  		




  150
  148
  
    
              }


  		




  151
  149
  
    
            }


  		












Also available in:  Unified diff