Project

General

Profile

« Previous | Next » 

Revision 1bb09f88

Added by Leszek Koltunski over 2 years ago

Progress with serializing object to JSON: stickers, quats.

View differences:

src/main/java/org/distorted/objectlib/main/TwistyObject.java
1134 1134
      for(int col=0; col<mNumTexCols; col++)
1135 1135
        {
1136 1136
        if( face>=NUM_TEXTURES ) break;
1137
        ObjectSticker sticker = retSticker(face);
1137
        int sIndex = getStickerIndex(face);
1138
        ObjectSticker sticker = retSticker(sIndex);
1138 1139
        factory.drawRoundedPolygon(canvas, paint, col*TEXTURE_HEIGHT, row*TEXTURE_HEIGHT, getColor(face%NUM_FACE_COLORS), sticker);
1139 1140
        face++;
1140 1141
        }
......
1381 1382
  protected abstract int getNumFaceColors();
1382 1383
  protected abstract int getColor(int face);
1383 1384
  protected abstract int getNumCubitFaces();
1384
  protected abstract Static4D[] getQuats();
1385 1385
  protected abstract float[][] getCubitPositions(int[] numLayers);
1386 1386
  protected abstract int getCubitVariant(int cubit, int[] numLayers);
1387 1387
  protected abstract int getNumCubitVariants(int[] numLayers);
1388 1388
  protected abstract Static4D getQuat(int cubit, int[] numLayers);
1389 1389
  protected abstract ObjectShape getObjectShape(int cubit, int[] numLayers);
1390 1390
  protected abstract int[] getSolvedQuats(int cubit, int[] numLayers);
1391
  protected abstract int getNumStickerTypes(int[] numLayers);
1392
  protected abstract ObjectSticker retSticker(int face);
1393 1391
  protected abstract int getFaceColor(int cubit, int cubitface, int[] numLayers);
1394 1392
  protected abstract int getResource(int[] numLayers);
1395 1393
  protected abstract ObjectType intGetObjectType(int[] numLayers);
1394
  protected abstract int getStickerIndex(int face);
1396 1395

  
1397 1396
  // for JSON only
1398 1397
  public abstract int getSolvedFunctionIndex();
......
1403 1402
  public abstract float[] getDist3D(int[] numLayers);
1404 1403
  public abstract ScrambleState[] getScrambleStates();
1405 1404
  public abstract float[][] getCuts(int[] numLayers);
1405
  public abstract Static4D[] getQuats();
1406
  public abstract int getNumStickerTypes(int[] numLayers);
1407
  public abstract ObjectSticker retSticker(int sticker);
1406 1408

  
1407 1409
  public abstract Static3D[] getRotationAxis();
1408 1410
  public abstract int[] getBasicAngle();

Also available in: Unified diff