Project

General

Profile

« Previous | Next » 

Revision 7e8b9852

Added by Leszek Koltunski almost 4 years ago

Correct RubikCube for the new library.

View differences:

src/main/java/org/distorted/objects/RubikCube.java
150 150
      int association = 1;
151 151
      MeshBase[] meshes = new MeshRectangles[MESHES];
152 152
      meshes[0] = new MeshRectangles(14,14);
153
      meshes[0].setEffectAssociation(0,association);
153
      meshes[0].setEffectAssociation(0,association,0);
154 154

  
155 155
      for(int i=1; i<MESHES; i++)
156 156
        {
157 157
        association <<=1;
158 158
        meshes[i] = meshes[0].copy(true);
159
        meshes[i].setEffectAssociation(0,association);
159
        meshes[i].setEffectAssociation(0,association,0);
160 160
        }
161 161

  
162 162
      mMesh = new MeshJoined(meshes);
......
194 194
      Static1D dRad  = new Static1D(1);
195 195

  
196 196
      VertexEffectMove   effect0 = new VertexEffectMove(new Static3D(0,0,+0.5f));
197
      effect0.setMeshAssociation(-1,63);  // all 6 sides
197
      effect0.setMeshAssociation(63,-1);  // all 6 sides
198 198
      VertexEffectRotate effect1 = new VertexEffectRotate( angle180, axisX, center );
199
      effect1.setMeshAssociation(-1,32);  // back
199
      effect1.setMeshAssociation(32,-1);  // back
200 200
      VertexEffectRotate effect2 = new VertexEffectRotate( angle90 , axisX, center );
201
      effect2.setMeshAssociation(-1, 8);  // bottom
201
      effect2.setMeshAssociation( 8,-1);  // bottom
202 202
      VertexEffectRotate effect3 = new VertexEffectRotate( angle270, axisX, center );
203
      effect3.setMeshAssociation(-1, 4);  // top
203
      effect3.setMeshAssociation( 4,-1);  // top
204 204
      VertexEffectRotate effect4 = new VertexEffectRotate( angle270, axisY, center );
205
      effect4.setMeshAssociation(-1, 2);  // left
205
      effect4.setMeshAssociation( 2,-1);  // left
206 206
      VertexEffectRotate effect5 = new VertexEffectRotate( angle90 , axisY, center );
207
      effect5.setMeshAssociation(-1, 1);  // right
207
      effect5.setMeshAssociation( 1,-1);  // right
208 208

  
209 209
      VertexEffectDeform effect6 = new VertexEffectDeform(dVec0, dRad, dCen0, dReg);
210 210
      VertexEffectDeform effect7 = new VertexEffectDeform(dVec1, dRad, dCen1, dReg);

Also available in: Unified diff