/ - Diff - Distorted Android

     import org.distorted.library.effect.MatrixEffectScale;
     import org.distorted.library.effect.VertexEffectSink;
     import org.distorted.library.main.DistortedEffects;
     import org.distorted.library.main.DistortedNode;
     import org.distorted.library.main.DistortedScreen;
     import org.distorted.library.main.DistortedTexture;
     import org.distorted.library.mesh.MeshCubes;
-...
         private static final Static3D VectY = new Static3D(0,1,0);
         private static final Static3D VectZ = new Static3D(0,0,1);
         private DistortedNode[][][] mNodes;
         private MeshCubes[][][] mCubes;
         private DistortedEffects[][][] mEffects;
         private Static4D[][][] mQuatScramble;
-...
           mRotAxis= RubikSurfaceView.VECTX;
           mTexture = new DistortedTexture(TEXTURE_SIZE,TEXTURE_SIZE);
           mNodes          = new DistortedNode[mSize][mSize][mSize];
           mCubes          = new MeshCubes[mSize][mSize][mSize];
           mEffects        = new DistortedEffects[mSize][mSize][mSize];
           mQuatScramble   = new Static4D[mSize][mSize][mSize];
-...
+                {
                 if( x==0 || x==mSize-1 || y==0 || y==mSize-1 || z==0 || z==mSize-1 )
+                  {
                   screen.attach(mTexture,mEffects[x][y][z],mCubes[x][y][z]);
                   mNodes[x][y][z] = new DistortedNode(mTexture,mEffects[x][y][z],mCubes[x][y][z]);
                   screen.attach(mNodes[x][y][z]);
+                  }
+                }
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // all DistortedTextures, DistortedNodes, DistortedFramebuffers, DistortedScreens and all types of
     // Meshes HAVE TO be markedForDeletion when they are no longer needed- otherwise we have a major
     // memory leak.
         void releaseResources()
+          {
           mTexture.markForDeletion();
           for(int x=0; x<mSize; x++)
             for(int y=0; y<mSize; y++)
               for(int z=0; z<mSize; z++)
+                {
                 if( x==0 || x==mSize-1 || y==0 || y==mSize-1 || z==0 || z==mSize-1 )
+                  {
                   mCubes[x][y][z].markForDeletion();
                   mNodes[x][y][z].markForDeletion();
+                  }
+                }
+          }
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         void finishRotationCalledOnNextRender(EffectListener listener)
         void finishRotationNow(EffectListener listener)
+          {
           boolean first = true;
           float startingAngle = mRotationAngleStatic.get1();
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         void removeRotationCalledOnNextRender(EffectListener listener)
         void removeRotationNow(EffectListener listener)
+          {
           mEffectsListeningForNow.deregisterForMessages(listener);

         private Static4D mQuatCurrent, mQuatAccumulated;
         private Static4D mTempCurrent, mTempAccumulated;
         private float mCubeSizeInScreenSpace;
         private int mNextCubeSize;
         private boolean mFinishRotation, mRemoveRotation, mFinishDragCurrent, mFinishDragAccumulated;
         private boolean mCanRotate;
         private RubikCube mCube;
-...
           mFinishDragCurrent     = false;
           mFinishDragAccumulated = false;
           mNextCubeSize= 0;
           mCanRotate = true;
+          }
-...
+            {
             mCanRotate = false;
             mFinishRotation=false;
             mCube.finishRotationCalledOnNextRender(this);
             mCube.finishRotationNow(this);
+            }
           if( mRemoveRotation )
+            {
             mRemoveRotation=false;
             mCube.removeRotationCalledOnNextRender(this);
             mCube.removeRotationNow(this);
             mCanRotate = true;
+            }
           if( mNextCubeSize!=0 )
+            {
             createCubeNow(mNextCubeSize);
             mScreen.detachAll();
             mCube.attachToScreen(mScreen);
             mNextCubeSize = 0;
+            }
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        void createCube(int newSize)
+         {
          mNextCubeSize = newSize;
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        void createCubeNow(int newSize)
+         {
          int oldSize = mCube==null ? 0 : mCube.getSize();
          if( oldSize!=newSize )
+           {
            if( mCube!=null ) mCube.releaseResources();
            mCube = new RubikCube(newSize, mMove, mScale, mQuatCurrent, mQuatAccumulated);
            mCube.createTexture();
-...
+             {
              recomputeScaleFactor(mScreenWidth,mScreenHeight);
+             }
            mScreen.detachAll();
            mCube.attachToScreen(mScreen);
+           }
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        void recomputeScaleFactor(int screenWidth, int screenHeight)
        private void recomputeScaleFactor(int screenWidth, int screenHeight)
+         {
          mCubeSizeInScreenSpace = CUBE_SCREEN_RATIO*(screenWidth>screenHeight ? screenHeight:screenWidth);
          float texSize = mCube.getTextureSize();

             mScreenWidth = mScreenHeight = mScreenMin = 0;
             mRenderer = new RubikRenderer(this);
             mRenderer.createCube(RubikActivity.DEFAULT_SIZE);
             mRenderer.createCubeNow(RubikActivity.DEFAULT_SIZE);
             mQuatCurrent     = new Static4D(0,0,0,1);
             mQuatAccumulated = mRenderer.initializeQuat();

Project

General

Profile

Distorted Android

Revision e3a72781

Added by Leszek Koltunski over 5 years ago