Project

General

Profile

« Previous | Next » 

Revision abf36986

Added by Leszek Koltunski over 2 years ago

Add Mirror Cube 2x2 and 3x3.

View differences:

src/main/java/org/distorted/objects/TwistyObject.java
91 91
  MeshBase[] mMeshes;
92 92
  final Static4D[] OBJECT_QUATS;
93 93
  final Cubit[] CUBITS;
94
  final int NUM_FACES;
94
  final int NUM_FACE_COLORS;
95 95
  final int NUM_TEXTURES;
96 96
  final int NUM_CUBITS;
97 97
  final int NUM_AXIS;
......
163 163

  
164 164
    OBJECT_QUATS = getQuats();
165 165
    NUM_CUBITS  = mOrigPos.length;
166
    NUM_FACES = getNumFaces();
167
    NUM_TEXTURES = getNumStickerTypes(mNumLayers)*NUM_FACES;
166
    NUM_FACE_COLORS = getNumFaceColors();
167
    NUM_TEXTURES = getNumStickerTypes(mNumLayers)*NUM_FACE_COLORS;
168 168
    NUM_AXIS = mAxis.length;
169 169
    NUM_QUATS = OBJECT_QUATS.length;
170 170

  
......
378 378
      if( color<NUM_TEXTURES )
379 379
        {
380 380
        numNonBlack++;
381
        nonBlackIndex = color%NUM_FACES;
381
        nonBlackIndex = color%NUM_FACE_COLORS;
382 382
        }
383 383
      }
384 384

  
......
872 872

  
873 873
  public int getCubitFaceColorIndex(int cubit, int face)
874 874
    {
875
    Static4D texMap = mMesh.getTextureMap(NUM_FACES*cubit + face);
875
    Static4D texMap = mMesh.getTextureMap(NUM_FACE_COLORS*cubit + face);
876 876

  
877 877
    int x = (int)(texMap.get0()/texMap.get2());
878 878
    int y = (int)(texMap.get1()/texMap.get3());
......
906 906
        {
907 907
        if( face>=NUM_TEXTURES ) break;
908 908
        ObjectSticker sticker = retSticker(face);
909
        factory.drawRoundedPolygon(canvas, paint, col*TEXTURE_HEIGHT, row*TEXTURE_HEIGHT, getColor(face%NUM_FACES), sticker);
909
        factory.drawRoundedPolygon(canvas, paint, col*TEXTURE_HEIGHT, row*TEXTURE_HEIGHT, getColor(face%NUM_FACE_COLORS), sticker);
910 910
        face++;
911 911
        }
912 912

  
......
1285 1285
  abstract float getScreenRatio();
1286 1286
  abstract float[][] getCubitPositions(int numLayers);
1287 1287
  abstract Static4D[] getQuats();
1288
  abstract int getNumFaces();
1288
  abstract int getNumFaceColors();
1289 1289
  abstract int getNumStickerTypes(int numLayers);
1290 1290
  abstract int getNumCubitFaces();
1291 1291
  abstract ObjectSticker retSticker(int face);

Also available in: Unified diff