/src/main/java/org/distorted/objectlib/main/TwistyObject.java - Diff - TwistyPuzzleLib - Distorted Android

« Previous | Next »

Revision 7ba38dd4

Added by Leszek Koltunski over 2 years ago

ID 7ba38dd4ac74f41e05ac0ed7524187c819bde644
Parent b146015e
Child e32d318a

Major change: separate the notion of a TwistyObject and its Node. Now,

1) the Node stays when we change objects (this makes transitions faster)
2) it's possible to just create an Object without adding it to the Screen (now app needs to explicitly create the Node and add it to its Screen itself)

     import org.distorted.library.mesh.MeshBase;
     import org.distorted.library.mesh.MeshFile;
     import org.distorted.library.mesh.MeshJoined;
     import org.distorted.library.mesh.MeshSquare;
     import org.distorted.library.message.EffectListener;
     import org.distorted.library.type.Dynamic1D;
     import org.distorted.library.type.Static1D;
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     public abstract class TwistyObject extends DistortedNode
     public abstract class TwistyObject
+      {
       public static final int COLOR_YELLOW = 0xffffff00;
       public static final int COLOR_WHITE  = 0xffffffff;
-...
       private final Static3D[] mAxis;
       private final float[][] mCuts;
       private final int[] mNumCuts;
       private final int mNodeW, mNodeH;
       private final float[][] mOrigPos;
       private final Static3D mNodeScale;
       private final Static4D mQuat;
       private final int[] mNumLayers;
       private final float mSize;
-...
       private final Static3D mRotationAxis;
       private final Static3D mObjectScale;
       private final int[] mQuatDebug;
       private final float mCameraDist;
       private final Static1D mRotationAngleStatic, mRotationAngleMiddle, mRotationAngleFinal;
       private final DistortedTexture mTexture;
       private final float mInitScreenRatio;
-...
       private Movement mMovement;
       private boolean[][] mLayerRotatable;
       private int[][][] mEnabled;
       private DistortedNode mNode;
       //////////////////// SOLVED1 ////////////////////////
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       TwistyObject(int[] numLayers, float size, Static4D quat, Static3D move, DistortedTexture nodeTexture,
                    MeshSquare nodeMesh, DistortedEffects nodeEffects, Resources res, int surfaceW, int surfaceH)
       TwistyObject(int[] numLayers, float size, Static4D quat, Static3D move, Resources res)
+        {
         super(nodeTexture,nodeEffects,nodeMesh);
         mNodeW = surfaceW;
         mNodeH = surfaceH;
         resizeFBO(mNodeW,mNodeH);
         mNumLayers = numLayers;
         mSize = size;
         mOrigPos = getCubitPositions(mNumLayers);
-...
+          }
         mIsBandaged = bandaged;
         mQuatDebug = new int[NUM_CUBITS];
         mNodeScale= new Static3D(surfaceW,surfaceH,surfaceW);
         mQuat = quat;
         mRotationAngle= new Dynamic1D();
-...
         mRotationAngleFinal  = new Static1D(0);
         mObjectScale = new Static3D(1,1,1);
         setObjectRatioNow(1.0f);
         setObjectRatioNow(1.0f,720);
         MatrixEffectScale scaleEffect = new MatrixEffectScale(mObjectScale);
         MatrixEffectQuaternion quatEffect  = new MatrixEffectQuaternion(quat, CENTER);
         MatrixEffectMove moveEffect = new MatrixEffectMove(move);
         MatrixEffectScale nodeScaleEffect = new MatrixEffectScale(mNodeScale);
         nodeEffects.apply(nodeScaleEffect);
         mNumTexCols = NUM_STICKERS_IN_ROW;
         mNumTexRows = (NUM_TEXTURES+1)/NUM_STICKERS_IN_ROW;
-...
         mEffects.apply(scaleEffect);
         mEffects.apply(moveEffect);
         // Now postprocessed effects (the glow when you solve an object) require component centers. In
         // order for the effect to be in front of the object, we need to set the center to be behind it.
         getMesh().setComponentCenter(0,0,0,-0.1f);
         attach( new DistortedNode(mTexture,mEffects,mMesh) );
         float fov = getFOV();
         double halfFOV = fov * (Math.PI/360);
         mCameraDist = (0.5f*mNodeH) / ((float)Math.tan(halfFOV)*mNodeW);
         setProjection( fov, 0.1f);
         mNode = new DistortedNode(mTexture,mEffects,mMesh);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         for(int i=0; i<NUM_CUBITS; i++) CUBITS[i].savePreferences(editor);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void recomputeScaleFactor(int surfaceW, int surfaceH)
+        {
         mNodeScale.set(surfaceW,surfaceH,surfaceW);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // the getFaceColors + final black in a grid (so that we do not exceed the maximum texture size)
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void setObjectRatioNow(float sc)
       void setObjectRatioNow(float sc, int nodeMinSize)
+        {
         mObjectScreenRatio = sc;
         int nodeMinSize = Math.min(mNodeW,mNodeH);
         float scale = mObjectScreenRatio*mInitScreenRatio*nodeMinSize/mSize;
         mObjectScale.set(scale,scale,scale);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void setObjectRatio(float sizeChange)
       void setObjectRatio(float sizeChange, int nodeMinSize)
+        {
         mObjectScreenRatio *= (1.0f+sizeChange)/2;
         if( mObjectScreenRatio>MAX_SIZE_CHANGE) mObjectScreenRatio = MAX_SIZE_CHANGE;
         if( mObjectScreenRatio<MIN_SIZE_CHANGE) mObjectScreenRatio = MIN_SIZE_CHANGE;
         setObjectRatioNow(mObjectScreenRatio);
         setObjectRatioNow(mObjectScreenRatio, nodeMinSize);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         return speed> 1.2f ? nearestAngle*(angle>0 ? 1:-1) : 0;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       float getCameraDist()
+        {
         return mCameraDist;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // INTERNAL API - those are called from 'effects' package
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         mScrambler.randomizeNewScramble(scramble,rnd,curr,total);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public int getNodeWidth()
+        {
         return mNodeW;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public Static4D getRotationQuat()
-...
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public DistortedNode getNode()
+        {
         return mNode;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public ObjectType getObjectType()
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       protected abstract int getFOV();
       protected abstract float getScreenRatio();
       protected abstract int getColor(int face);
       protected abstract int getResource(int[] numLayers);
-...
       public abstract int getInventor(int[] numLayers);
       public abstract int getYearOfInvention(int[] numLayers);
       public abstract int getComplexity(int[] numLayers);
       public abstract int getFOV();
+      }

Also available in: Unified diff

Project

General

Profile

TwistyPuzzleLib

Revision 7ba38dd4

Added by Leszek Koltunski over 2 years ago