/ - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision d464f54f

Added by Leszek Koltunski over 2 years ago

ID d464f54f95274220096c33c0aeaff8e4e8e5faef
Parent aec5cc91
Child 85449b44

Remove statics from the Dino classes.

src/main/java/org/distorted/objects/TwistyCube.java
342	342
343	343	int getFaceColor(int cubit, int cubitface, int numLayers)
344	344	{
345		return CUBITS[cubit].mRotationRow[cubitface/2] == (cubitface%2==0 ? (1<<(numLayers-1)):1) ? cubitface : NUM_FACES;
	345	return CUBITS[cubit].mRotationRow[cubitface/2] == (cubitface%2==0 ? (1<<(numLayers-1)):1) ? cubitface : NUM_TEXTURES;
346	346	}
347	347
348	348	///////////////////////////////////////////////////////////////////////////////////////////////////

                new Static3D(+SQ3/3,-SQ3/3,-SQ3/3)
              };
       private static final int[] BASIC_ANGLE = new int[] { 3,3,3,3 };
       private static final int[] FACE_COLORS = new int[]
+             {
                COLOR_YELLOW, COLOR_WHITE,
-...
                COLOR_RED   , COLOR_ORANGE
              };
       // All legal rotation quats of a RubikDino
       static final Static4D[] QUATS = new Static4D[]
+             {
                new Static4D(  0.0f,  0.0f,  0.0f,  1.0f ),
                new Static4D(  0.5f,  0.5f,  0.5f, -0.5f ),
                new Static4D(  0.0f,  0.0f,  1.0f,  0.0f ),
                new Static4D(  0.5f, -0.5f, -0.5f, -0.5f ),
                new Static4D(  0.5f,  0.5f,  0.5f,  0.5f ),
                new Static4D(  0.5f,  0.5f, -0.5f, -0.5f ),
                new Static4D(  0.5f, -0.5f,  0.5f, -0.5f ),
                new Static4D(  0.5f, -0.5f, -0.5f,  0.5f ),
                new Static4D(  0.0f,  1.0f,  0.0f,  0.0f ),
                new Static4D(  0.5f, -0.5f,  0.5f,  0.5f ),
                new Static4D(  1.0f,  0.0f,  0.0f,  0.0f ),
                new Static4D(  0.5f,  0.5f, -0.5f,  0.5f )
              };
       // centers of the 12 edges. Must be in the same order like QUATs above.
       static final float[][] CENTERS = new float[][]
+             {
                  { 0.0f, 1.5f, 1.5f },
                  { 1.5f, 0.0f, 1.5f },
                  { 0.0f,-1.5f, 1.5f },
                  {-1.5f, 0.0f, 1.5f },
                  { 1.5f, 1.5f, 0.0f },
                  { 1.5f,-1.5f, 0.0f },
                  {-1.5f,-1.5f, 0.0f },
                  {-1.5f, 1.5f, 0.0f },
                  { 0.0f, 1.5f,-1.5f },
                  { 1.5f, 0.0f,-1.5f },
                  { 0.0f,-1.5f,-1.5f },
                  {-1.5f, 0.0f,-1.5f }
              };
       private static final double[][] VERTICES = new double[][]
+              {
                  {-1.5, 0.0, 0.0},
                  { 1.5, 0.0, 0.0},
                  { 0.0,-1.5, 0.0},
                  { 0.0, 0.0,-1.5}
               };
       private static final int[][] VERT_INDEXES = new int[][]
+              {
                  {2,1,0},   // counterclockwise!
                  {3,0,1},
                  {2,3,1},
                  {3,2,0},
               };
       private static final float[][] STICKERS = new float[][]
+              {
                  { 0.0f, -1.0f/3, 0.5f, 1.0f/6, -0.5f, 1.0f/6 }
               };
       private static final ObjectSticker[] mStickers;
       static
+        {
         float radius = 0.025f;
         float stroke = 0.050f;
         float[] radii = new float[] {radius,radius,radius};
         mStickers = new ObjectSticker[STICKERS.length];
         mStickers[0] = new ObjectSticker(STICKERS[0],null,radii,stroke);
+        }
       private int mCurrState;
       private int mIndexExcluded;
       ScrambleState[] mStates;
       private int[][] mScrambleTable;
       private int[] mNumOccurences;
       private int[] mBasicAngle;
       private Static4D[] mQuats;
       private ObjectSticker[] mStickers;
       float[][] mCenters;
       ScrambleState[] mStates;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         super(size, size, quat, texture, mesh, effects, moves, obj, res, scrWidth);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void initializeQuats()
+        {
         mQuats = new Static4D[]
+             {
              new Static4D(  0.0f,  0.0f,  0.0f,  1.0f ),
              new Static4D(  0.5f,  0.5f,  0.5f, -0.5f ),
              new Static4D(  0.0f,  0.0f,  1.0f,  0.0f ),
              new Static4D(  0.5f, -0.5f, -0.5f, -0.5f ),
              new Static4D(  0.5f,  0.5f,  0.5f,  0.5f ),
              new Static4D(  0.5f,  0.5f, -0.5f, -0.5f ),
              new Static4D(  0.5f, -0.5f,  0.5f, -0.5f ),
              new Static4D(  0.5f, -0.5f, -0.5f,  0.5f ),
              new Static4D(  0.0f,  1.0f,  0.0f,  0.0f ),
              new Static4D(  0.5f, -0.5f,  0.5f,  0.5f ),
              new Static4D(  1.0f,  0.0f,  0.0f,  0.0f ),
              new Static4D(  0.5f,  0.5f, -0.5f,  0.5f )
              };
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       float getScreenRatio()
-...
       Static4D[] getQuats()
+        {
         return QUATS;
         if( mQuats==null ) initializeQuats();
         return mQuats;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
       int getNumStickerTypes(int numLayers)
+        {
         return STICKERS.length;
         return 1;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
       float[][] getCubitPositions(int size)
+        {
         return CENTERS;
         if( mCenters ==null )
+          {
           mCenters = new float[][]
+             {
                  { 0.0f, 1.5f, 1.5f },
                  { 1.5f, 0.0f, 1.5f },
                  { 0.0f,-1.5f, 1.5f },
                  {-1.5f, 0.0f, 1.5f },
                  { 1.5f, 1.5f, 0.0f },
                  { 1.5f,-1.5f, 0.0f },
                  {-1.5f,-1.5f, 0.0f },
                  {-1.5f, 1.5f, 0.0f },
                  { 0.0f, 1.5f,-1.5f },
                  { 1.5f, 0.0f,-1.5f },
                  { 0.0f,-1.5f,-1.5f },
                  {-1.5f, 0.0f,-1.5f }
              };
+          }
         return mCenters;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       ObjectShape getObjectShape(int cubit, int numLayers)
+        {
         double[][] vertices = new double[][] { {-1.5, 0.0, 0.0},{ 1.5, 0.0, 0.0},{ 0.0,-1.5, 0.0},{ 0.0, 0.0,-1.5} };
         int[][] vert_indices= new int[][] { {2,1,0},{3,0,1},{2,3,1},{3,2,0} };
         float[][] bands     = new float[][] { {0.035f,30,0.16f,0.8f,6,2,2}, {0.010f,30,0.16f,0.2f,6,2,2} };
         int[] bandIndices   = new int[] { 0,0,1,1 };
         float[][] corners   = new float[][] { {0.07f,0.40f}, {0.05f,0.30f} };
         int[] cornerIndices = new int[] { 0,0,1,1 };
         float[][] centers   = new float[][] { {0.0f, -0.75f, -0.75f} };
         int[] centerIndices = new int[] { 0,0,0,0 };
         return new ObjectShape(VERTICES,VERT_INDEXES,bands,bandIndices,corners,cornerIndices,centers,centerIndices,getNumCubitFaces(), null);
         return new ObjectShape(vertices,vert_indices,bands,bandIndices,corners,cornerIndices,centers,centerIndices,getNumCubitFaces(), null);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       Static4D getQuat(int cubit, int numLayers)
+        {
         return QUATS[cubit];
         if( mQuats==null ) initializeQuats();
         return mQuats[cubit];
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
       ObjectSticker retSticker(int face)
+        {
         if( mStickers==null )
+          {
           float[][] STICKERS = new float[][] { { 0.0f, -1.0f/3, 0.5f, 1.0f/6, -0.5f, 1.0f/6 } };
           float radius = 0.025f;
           float stroke = 0.050f;
           float[] radii = new float[] {radius,radius,radius};
           mStickers     = new ObjectSticker[STICKERS.length];
           mStickers[0]  = new ObjectSticker(STICKERS[0],null,radii,stroke);
+          }
         return mStickers[face/NUM_FACES];
+        }
-...
       public int[] getBasicAngle()
+        {
         return BASIC_ANGLE;
         if( mBasicAngle==null ) mBasicAngle = new int[] { 3,3,3,3 };
         return mBasicAngle;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

src/main/java/org/distorted/objects/TwistyDino4.java
32	32
33	33	public class TwistyDino4 extends TwistyDino
34	34	{
35		private static final int[] mFaceMap = { 4, 2, 2, 4, 0, 2, 1, 4, 0, 0, 1, 1 };
	35	private int[] mFaceMap;
36	36
37	37	///////////////////////////////////////////////////////////////////////////////////////////////////
38	38
...	...
66	66
67	67	int getFaceColor(int cubit, int cubitface, int size)
68	68	{
	69	if( mFaceMap==null ) mFaceMap = new int[] { 4, 2, 2, 4, 0, 2, 1, 4, 0, 0, 1, 1 };
69	70	return (cubitface==0 \|\| cubitface==1) ? mFaceMap[cubit] : NUM_TEXTURES;
70	71	}
71	72

src/main/java/org/distorted/objects/TwistyDino6.java
32	32
33	33	public class TwistyDino6 extends TwistyDino
34	34	{
35		private static final int[] mFaceMap = {4,2, 0,4, 4,3, 1,4,
36		2,0, 3,0, 3,1, 2,1,
37		5,2, 0,5, 5,3, 1,5 };
	35	private int[] mFaceMap;
38	36
39	37	///////////////////////////////////////////////////////////////////////////////////////////////////
40	38
...	...
68	66
69	67	int getFaceColor(int cubit, int cubitface, int size)
70	68	{
	69	if( mFaceMap==null )
	70	{
	71	mFaceMap = new int[] { 4,2, 0,4, 4,3, 1,4, 2,0, 3,0, 3,1, 2,1, 5,2, 0,5, 5,3, 1,5 };
	72	}
	73
71	74	switch(cubitface)
72	75	{
73	76	case 0 : return mFaceMap[2*cubit];
74	77	case 1 : return mFaceMap[2*cubit+1];
75		default: return NUM_FACES;
	78	default: return NUM_TEXTURES;
76	79	}
77	80	}
78	81

Also available in: Unified diff

Project

General

Profile

Magic Cube

Revision d464f54f

Added by Leszek Koltunski over 2 years ago