/src/main/java/org/distorted/patterns/RubikPattern.java - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision b498f3f6

Added by Leszek Koltunski about 4 years ago

ID b498f3f6682c10d4c1ee57b389e3de57d728424e
Parent 48145a5b
Child ba29975c

Introduce RubikPatternsList. Now, if one wants to contribute patterns for a new object, all one has to be is give the list of strings describing the patterns and add them to the List.

     package org.distorted.patterns;
     import org.distorted.magic.RubikPostRender;
     import org.distorted.object.RubikObject;
     import java.util.ArrayList;
     import java.util.List;
     import static org.distorted.patterns.RubikPatternList.NUM_OBJECTS;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     public class RubikPattern
+    {
       private static final int DURATION_MILLIS = 800;
       public static final int MIN_CUBE  = 2;
       public static final int MAX_CUBE  = 5;
       public static final int NUM_CUBES = MAX_CUBE-MIN_CUBE+1;
       private int[] numCategories   = new int[NUM_CUBES];
       private int[] currentCategory = new int[NUM_CUBES];
       private int[] currentScrollPos= new int[NUM_CUBES];
       private int[] numCategories   = new int[NUM_OBJECTS];
       private int[] currentCategory = new int[NUM_OBJECTS];
       private int[] currentScrollPos= new int[NUM_OBJECTS];
       private List<List<Category>> mCategories;
       private static RubikPattern mThis;
-...
         Category(String[] lines)
+          {
           mLines=lines;
           numPatterns=lines.length-1;
           mPatterns = new ArrayList<>();
           mLines       = lines;
           numPatterns  = lines.length-1;
           mInitialized = false;
+          }
-...
           String moves, name;
           Pattern pattern;
           mPatterns = new ArrayList<>();
           for(int i=0; i<numPatterns; i++)
+            {
             colon = mLines[i+1].indexOf(":");
-...
       /////////////////////////////////////////////////////////////
         Pattern(String n, String m)
         Pattern(String name, String moves)
+          {
           nameStr = n;
           moveStr = m;
           nameStr      = name;
           moveStr      = moves;
           mCanRotate   = true;
           mInitialized = false;
+          }
-...
           if( !mInitialized ) initialize();
           curMove++;
           RubikObject object = post.getObject();
           if( mCanRotate )
+            {
-...
+              }
             else
+              {
               int axis     =moves[curMove-1][0];
     		      int rowBitmap=moves[curMove-1][1];
     		      int bareAngle=moves[curMove-1][2];
               int angle    = bareAngle*(360/object.getBasicAngle());
               int axis     = moves[curMove-1][0];
     		      int rowBitmap= moves[curMove-1][1];
     		      int bareAngle= moves[curMove-1][2];
               int angle    = bareAngle*(360/post.getObject().getBasicAngle());
               int numRot   = Math.abs(bareAngle);
               if( angle!=0 )
-...
           if( !mInitialized ) initialize();
           curMove--;
           RubikObject object = post.getObject();
           if( mCanRotate )
+            {
-...
+              }
             else
+              {
               int axis     =moves[curMove][0];
     		      int rowBitmap=moves[curMove][1];
     		      int bareAngle=moves[curMove][2];
               int angle    = bareAngle*(360/object.getBasicAngle());
               int axis     = moves[curMove][0];
     		      int rowBitmap= moves[curMove][1];
     		      int bareAngle= moves[curMove][2];
               int angle    = bareAngle*(360/post.getObject().getBasicAngle());
               int numRot   = Math.abs(bareAngle);
               if( angle!=0 )
-...
+        {
         mCategories = new ArrayList<>();
         initializeCategories(0, RubikPatternCube2.patterns);
         initializeCategories(1, RubikPatternCube3.patterns);
         initializeCategories(2, RubikPatternCube4.patterns);
         initializeCategories(3, RubikPatternCube5.patterns);
         for(int i=0; i<NUM_OBJECTS; i++)
+          {
           List<Category> list = new ArrayList<>();
           String[][] patStrings = RubikPatternList.getPatterns(i);
           for(String[] lines: patStrings) list.add(new Category(lines));
           mCategories.add(list);
           numCategories[i]=patStrings.length;
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void initializeCategories(int num, String[][] pat)
       private Category getCategory(int tab, int cat)
+        {
         List<Category> list = new ArrayList<>();
         Category cat;
         for(String[] lines: pat)
         if( tab>=0 && tab<NUM_OBJECTS && cat>=0 && cat<numCategories[tab] )
+          {
           cat = new Category(lines);
           list.add(cat);
           return mCategories.get(tab).get(cat);
+          }
         mCategories.add(num,list);
         numCategories[num]=pat.length;
         return null;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
       public int getNumCategories(int tab)
+        {
         return tab>=0 && tab<NUM_CUBES ? numCategories[tab] : 0;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public String getCategoryName(int tab, int cat)
+        {
         if( tab>=0 && tab<NUM_CUBES && cat>=0 && cat< numCategories[tab] )
+          {
           Category c = mCategories.get(tab).get(cat);
           return c!=null ? c.getName() : null;
+          }
         return null;
         return tab>=0 && tab<NUM_OBJECTS ? numCategories[tab] : 0;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void rememberState(int tab, int cat, int scrollPos)
+        {
         if( tab>=0 && tab<NUM_CUBES )
         if( tab>=0 && tab<NUM_OBJECTS )
+          {
           currentCategory[tab] = cat;
           currentScrollPos[tab]= scrollPos;
-...
       public int recallCategory(int tab)
+        {
         return tab>=0 && tab<NUM_CUBES ? currentCategory[tab] : 0;
         return tab>=0 && tab<NUM_OBJECTS ? currentCategory[tab] : 0;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public int recallScrollPos(int tab)
+        {
         return tab>=0 && tab<NUM_CUBES ? currentScrollPos[tab] : 0;
         return tab>=0 && tab<NUM_OBJECTS ? currentScrollPos[tab] : 0;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public String getPatternName(int tab, int cat, int pat)
       public String getCategoryName(int tab, int cat)
+        {
         if( tab>=0 && tab<NUM_CUBES && cat>=0 && cat< numCategories[tab] )
+          {
           Category c = mCategories.get(tab).get(cat);
           return c!=null ? c.getPatternName(pat) : null;
+          }
         Category c = getCategory(tab,cat);
         return c!=null ? c.getName() : null;
+        }
         return null;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public String getPatternName(int tab, int cat, int pat)
+        {
         Category c = getCategory(tab,cat);
         return c!=null ? c.getPatternName(pat) : null;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public int getNumPatterns(int tab, int cat)
+        {
         if( tab>=0 && tab<NUM_CUBES && cat>=0 && cat< numCategories[tab] )
+          {
           Category c = mCategories.get(tab).get(cat);
           return c!=null ? c.getNumPatterns() : 0;
+          }
         return 0;
         Category c = getCategory(tab,cat);
         return c!=null ? c.getNumPatterns() : 0;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public int getCurMove(int tab, int cat, int pat)
+        {
         if( tab>=0 && tab<NUM_CUBES && cat>=0 && cat< numCategories[tab] )
+          {
           Category c = mCategories.get(tab).get(cat);
           return c!=null ? c.getPatternCurMove(pat):0;
+          }
         return 0;
         Category c = getCategory(tab,cat);
         return c!=null ? c.getPatternCurMove(pat) : 0;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public int getNumMoves(int tab, int cat, int pat)
+        {
         if( tab>=0 && tab<NUM_CUBES && cat>=0 && cat< numCategories[tab] )
+          {
           Category c = mCategories.get(tab).get(cat);
           return c!=null ? c.getPatternNumMove(pat):0;
+          }
         return 0;
         Category c = getCategory(tab,cat);
         return c!=null ? c.getPatternNumMove(pat) : 0;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void makeMove(RubikPostRender post, int tab, int cat, int pat)
+        {
         if( tab>=0 && tab<NUM_CUBES && cat>=0 && cat< numCategories[tab] )
+          {
           Category c = mCategories.get(tab).get(cat);
           if( c!=null ) c.makeMove(post,pat);
+          }
         Category c = getCategory(tab,cat);
         if( c!=null ) c.makeMove(post,pat);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void backMove(RubikPostRender post, int tab, int cat, int pat)
+        {
         if( tab>=0 && tab<NUM_CUBES && cat>=0 && cat< numCategories[tab] )
+          {
           Category c = mCategories.get(tab).get(cat);
           if( c!=null ) c.backMove(post,pat);
+          }
         Category c = getCategory(tab,cat);
         if( c!=null ) c.backMove(post,pat);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public int[][] reInitialize(int tab, int cat, int pat)
+        {
         if( tab>=0 && tab<NUM_CUBES && cat>=0 && cat< numCategories[tab] )
+          {
           Category c = mCategories.get(tab).get(cat);
           if( c!=null ) return c.reInitialize(pat);
+          }
         return null;
         Category c = getCategory(tab,cat);
         return c!=null ? c.reInitialize(pat) : null;
+        }
+    }

Also available in: Unified diff

Project

General

Profile

Magic Cube

Revision b498f3f6

Added by Leszek Koltunski about 4 years ago