/ - Diff - Distorted Android

« Previous | Next »

Revision 39cbf9dc

Added by Leszek Koltunski over 9 years ago

ID 39cbf9dcdc5a871607853bb0376697cf60d9576e
Parent 8aac2acc
Child 341c803d

Minor: deal with IntelliJ warnings

      * A singleton class used to control various global settings.
      */
     public class Distorted
+    {
+      {
       /**
        * When creating an instance of a DistortedObject from another instance, do not clone anything.
        * Used in the copy constructor.
-...
+        {
         return EffectQueue.setMax(EffectTypes.FRAGMENT.ordinal(),max);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     //end of file
+    }
+      }

src/main/java/org/distorted/library/DistortedBitmapGrid.java
111	111
112	112	//for(int g=0; g<dataLength; g++) android.util.Log.e("BACKGROUND", "pos["+g+"]=("+bufferData[3g]+","+bufferData[3g+1]+")");
113	113	}
114		};
115
116		///////////////////////////////////////////////////////////////////////////////////////////////////
	114	}

            row = r;
            col = c;
+           }
          };
+         }
        private int frontVert, sideVert;
        private int mCols, mRows;
        private short[][] mCubes;
        private ArrayList<Edge> mEdges = new ArrayList<Edge>();
        private ArrayList<Edge> mEdges = new ArrayList<>();
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
             while( curr.col!=startX || curr.row!=startY || curr.side!=startS );
+            }
           frontVert = 2*( frontWalls + 2*frontSegments - 1);
           sideVert  = 2*( sideWalls + sideBends + edges -1);
           int frontVert = 2*( frontWalls + 2*frontSegments - 1);
           int sideVert  = 2*( sideWalls + sideBends + edges -1);
           int dataL = frontOnly ? frontVert : (frontVert+1) + (1+sideVert+1) + (1+frontVert);
-...
              for(int i=reallen; i<len; i++) desc += "0";
+             }
            if( desc.indexOf("1")>=0 )
            if( desc.contains("1") )
+             {
              mCols = cols;
              mRows = len/cols;
-...
                  if( front ) // NW corner
+                   {
                    position[3*vertex+0] = (centerX-0.5f)/mCols;
                    position[3*vertex  ] = (centerX-0.5f)/mCols;
                    position[3*vertex+1] = (centerY+0.5f)/mRows;
                    position[3*vertex+2] = FRONTZ;
                    normal[3*vertex+0]   = mNormalX[0];
                    normal[3*vertex  ]   = mNormalX[0];
                    normal[3*vertex+1]   = mNormalY[0];
                    normal[3*vertex+2]   = 1.0f;
                    texture[2*vertex+0]  = (float)j/mCols;
                    texture[2*vertex  ]  = (float)j/mCols;
                    texture[2*vertex+1]  = (float)i/mRows;
                    vertex++;
+                   }
                  else  // SW corner
+                   {
                    position[3*vertex+0] = (centerX-0.5f)/mCols;
                    position[3*vertex  ] = (centerX-0.5f)/mCols;
                    position[3*vertex+1] = (centerY-0.5f)/mRows;
                    position[3*vertex+2] = BACKZ;
                    normal[3*vertex+0]   = mNormalX[1];
                    normal[3*vertex  ]   = mNormalX[1];
                    normal[3*vertex+1]   = mNormalY[1];
                    normal[3*vertex+2]   =-1.0f;
                    texture[2*vertex+0]  = (float)j/mCols;
                    texture[2*vertex  ]  = (float)j/mCols;
                    texture[2*vertex+1]  = (float)(i+1)/mRows;
                    vertex++;
-...
                  if( front ) // SW corner
+                   {
                    position[3*vertex+0] = (centerX-0.5f)/mCols;
                    position[3*vertex  ] = (centerX-0.5f)/mCols;
                    position[3*vertex+1] = (centerY-0.5f)/mRows;
                    position[3*vertex+2] = FRONTZ;
                    normal[3*vertex+0]   = mNormalX[1];
                    normal[3*vertex  ]   = mNormalX[1];
                    normal[3*vertex+1]   = mNormalY[1];
                    normal[3*vertex+2]   = 1.0f;
                    texture[2*vertex+0]  = (float)j/mCols;
                    texture[2*vertex  ]  = (float)j/mCols;
                    texture[2*vertex+1]  = (float)(i+1)/mRows;
                    vertex++;
+                   }
                  else  // NW corner
+                   {
                    position[3*vertex+0] = (centerX-0.5f)/mCols;
                    position[3*vertex  ] = (centerX-0.5f)/mCols;
                    position[3*vertex+1] = (centerY+0.5f)/mRows;
                    position[3*vertex+2] = BACKZ;
                    normal[3*vertex+0]   = mNormalX[0];
                    normal[3*vertex  ]   = mNormalX[0];
                    normal[3*vertex+1]   = mNormalY[0];
                    normal[3*vertex+2]   =-1.0f;
                    texture[2*vertex+0]  = (float)j/mCols;
                    texture[2*vertex  ]  = (float)j/mCols;
                    texture[2*vertex+1]  = (float)i/mRows;
                    vertex++;
+                   }
-...
                if( front )  // NE corner
+                 {
                  position[3*vertex+0] = (centerX+0.5f)/mCols;
                  position[3*vertex  ] = (centerX+0.5f)/mCols;
                  position[3*vertex+1] = (centerY+0.5f)/mRows;
                  position[3*vertex+2] = FRONTZ;
                  normal[3*vertex+0]   = mNormalX[2];
                  normal[3*vertex  ]   = mNormalX[2];
                  normal[3*vertex+1]   = mNormalY[2];
                  normal[3*vertex+2]   = 1.0f;
                  texture[2*vertex+0]  = (float)(j+1)/mCols;
                  texture[2*vertex  ]  = (float)(j+1)/mCols;
                  texture[2*vertex+1]  = (float)i/mRows;
                  vertex++;
+                 }
                else // SE corner
+                 {
                  position[3*vertex+0] = (centerX+0.5f)/mCols;
                  position[3*vertex  ] = (centerX+0.5f)/mCols;
                  position[3*vertex+1] = (centerY-0.5f)/mRows;
                  position[3*vertex+2] = BACKZ;
                  normal[3*vertex+0]   = mNormalX[3];
                  normal[3*vertex  ]   = mNormalX[3];
                  normal[3*vertex+1]   = mNormalY[3];
                  normal[3*vertex+2]   =-1.0f;
                  texture[2*vertex+0]  = (float)(j+1)/mCols;
                  texture[2*vertex  ]  = (float)(j+1)/mCols;
                  texture[2*vertex+1]  = (float)(i+1)/mRows;
                  vertex++;
+                 }
                if( front )  // SE corner
+                 {
                  position[3*vertex+0] = (centerX+0.5f)/mCols;
                  position[3*vertex  ] = (centerX+0.5f)/mCols;
                  position[3*vertex+1] = (centerY-0.5f)/mRows;
                  position[3*vertex+2] = FRONTZ;
                  normal[3*vertex+0]   = mNormalX[3];
                  normal[3*vertex  ]   = mNormalX[3];
                  normal[3*vertex+1]   = mNormalY[3];
                  normal[3*vertex+2]   = 1.0f;
                  texture[2*vertex+0]  = (float)(j+1)/mCols;
                  texture[2*vertex  ]  = (float)(j+1)/mCols;
                  texture[2*vertex+1]  = (float)(i+1)/mRows;
                  vertex++;
+                 }
                else // NE corner
+                 {
                  position[3*vertex+0] = (centerX+0.5f)/mCols;
                  position[3*vertex  ] = (centerX+0.5f)/mCols;
                  position[3*vertex+1] = (centerY+0.5f)/mRows;
                  position[3*vertex+2] = BACKZ;
                  normal[3*vertex+0]   = mNormalX[2];
                  normal[3*vertex  ]   = mNormalX[2];
                  normal[3*vertex+1]   = mNormalY[2];
                  normal[3*vertex+2]   =-1.0f;
                  texture[2*vertex+0]  = (float)(j+1)/mCols;
                  texture[2*vertex  ]  = (float)(j+1)/mCols;
                  texture[2*vertex+1]  = (float)i/mRows;
                  vertex++;
+                 }
-...
+         {
          if( vertex>0 )
+           {
            position[3*vertex+0] = position[3*vertex-3];
            position[3*vertex  ] = position[3*vertex-3];
            position[3*vertex+1] = position[3*vertex-2];
            position[3*vertex+2] = position[3*vertex-1];
            normal[3*vertex+0]   = normal[3*vertex-3];
            normal[3*vertex  ]   = normal[3*vertex-3];
            normal[3*vertex+1]   = normal[3*vertex-2];
            normal[3*vertex+2]   = normal[3*vertex-1];
            texture[2*vertex+0]  = texture[2*vertex-2];
            texture[2*vertex  ]  = texture[2*vertex-2];
            texture[2*vertex+1]  = texture[2*vertex-1];
            vertex++;
-...
          switch(curr.side)
+           {
            case NORTH: position[3*vertex+0] = (back ? (centerX-0.5f) : (centerX+0.5f))/mCols;
            case NORTH: position[3*vertex  ] = (back ? (centerX-0.5f) : (centerX+0.5f))/mCols;
                        position[3*vertex+1] = (centerY+0.5f)/mRows;
                        position[3*vertex+2] = lower ? BACKZ : FRONTZ;
                        normal[3*vertex+0]   = side==NORTH ? 0.0f : (side==WEST?-R:R);
                        normal[3*vertex  ]   = side==NORTH ? 0.0f : (side==WEST?-R:R);
                        normal[3*vertex+1]   = 1.0f;
                        normal[3*vertex+2]   = lower ? -R:R;
                        texture[2*vertex+0]  = (float)(back ? (curr.col  ):(curr.col+1))/mCols;
                        texture[2*vertex  ]  = (float)(back ? (curr.col  ):(curr.col+1))/mCols;
                        texture[2*vertex+1]  = (float)(lower? (curr.row-1):(curr.row  ))/mRows;
                        break;
            case SOUTH: position[3*vertex+0] = (back ? (centerX+0.5f) : (centerX-0.5f))/mCols;
            case SOUTH: position[3*vertex  ] = (back ? (centerX+0.5f) : (centerX-0.5f))/mCols;
                        position[3*vertex+1] = (centerY-0.5f)/mRows;
                        position[3*vertex+2] = lower ? BACKZ : FRONTZ;
                        normal[3*vertex+0]   = side==SOUTH ? 0.0f: (side==EAST?-R:R);
                        normal[3*vertex  ]   = side==SOUTH ? 0.0f: (side==EAST?-R:R);
                        normal[3*vertex+1]   =-1.0f;
                        normal[3*vertex+2]   = lower ? -R:R;
                        texture[2*vertex+0]  = (float)(back ? (curr.col+1):(curr.col  ))/mCols;
                        texture[2*vertex  ]  = (float)(back ? (curr.col+1):(curr.col  ))/mCols;
                        texture[2*vertex+1]  = (float)(lower? (curr.row+2):(curr.row+1))/mRows;
                        break;
            case WEST : position[3*vertex+0] = (centerX-0.5f)/mCols;
            case WEST : position[3*vertex  ] = (centerX-0.5f)/mCols;
                        position[3*vertex+1] = (back ? (centerY-0.5f):(centerY+0.5f))/mRows;
                        position[3*vertex+2] = lower ? BACKZ : FRONTZ;
                        normal[3*vertex+0]   =-1.0f;
                        normal[3*vertex  ]   =-1.0f;
                        normal[3*vertex+1]   = side==WEST ? 0.0f : (side==NORTH?-R:R);
                        normal[3*vertex+2]   = lower ? -R:R;
                        texture[2*vertex+0]  = (float)(lower ? (curr.col-1):(curr.col  ))/mCols;
                        texture[2*vertex  ]  = (float)(lower ? (curr.col-1):(curr.col  ))/mCols;
                        texture[2*vertex+1]  = (float)(back  ? (curr.row+1):(curr.row  ))/mRows;
                        break;
            case EAST : position[3*vertex+0] = (centerX+0.5f)/mCols;
            case EAST : position[3*vertex  ] = (centerX+0.5f)/mCols;
                        position[3*vertex+1] = (back ? (centerY+0.5f):(centerY-0.5f))/mRows;
                        position[3*vertex+2] = lower ? BACKZ : FRONTZ;
                        normal[3*vertex+0]   = 1.0f;
                        normal[3*vertex  ]   = 1.0f;
                        normal[3*vertex+1]   = side==EAST ? 0.0f : (side==SOUTH?-R:R);
                        normal[3*vertex+2]   = lower ? -R:R;
                        texture[2*vertex+0]  = (float)(lower ? (curr.col+2):(curr.col+1))/mCols;
                        texture[2*vertex  ]  = (float)(lower ? (curr.col+2):(curr.col+1))/mCols;
                        texture[2*vertex+1]  = (float)(back  ? (curr.row  ):(curr.row+1))/mRows;
                        break;
+           }
          if(texture[2*vertex+0]>1.0f) texture[2*vertex+0] =2.0f-texture[2*vertex+0];
          if(texture[2*vertex+0]<0.0f) texture[2*vertex+0] =    -texture[2*vertex+0];
          if(texture[2*vertex  ]>1.0f) texture[2*vertex  ] =2.0f-texture[2*vertex  ];
          if(texture[2*vertex  ]<0.0f) texture[2*vertex  ] =    -texture[2*vertex  ];
          if(texture[2*vertex+1]>1.0f) texture[2*vertex+1] =2.0f-texture[2*vertex+1];
          if(texture[2*vertex+1]<0.0f) texture[2*vertex+1] =    -texture[2*vertex+1];
+         }
-...
     /**
      * Creates the underlying grid of vertices, normals, texture coords and colors.
+     *
      * @param rows See {@link DistortedCubes#DistortedCubes(String)}
      * @param desc See {@link DistortedCubes#DistortedCubes(String)}
      * @param cols      See {@link DistortedCubes#DistortedCubes(int,String,int,boolean)}
      * @param desc      See {@link DistortedCubes#DistortedCubes(int,String,int,boolean)}
      * @param frontOnly See {@link DistortedCubes#DistortedCubes(int,String,int,boolean)}
      */
        public DistortedCubesGrid(int cols, String desc, boolean frontOnly)
+          {
-...
           for(int i=0; i<dataLength; i++)
+            {
             colorData[COLOR_DATA_SIZE*i+0] = 1.0f; // r
             colorData[COLOR_DATA_SIZE*i  ] = 1.0f; // r
             colorData[COLOR_DATA_SIZE*i+1] = 1.0f; // g
             colorData[COLOR_DATA_SIZE*i+2] = 1.0f; // b
             colorData[COLOR_DATA_SIZE*i+3] = 1.0f; // a

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision 39cbf9dc

Added by Leszek Koltunski over 9 years ago