Project

General

Profile

« Previous | Next » 

Revision 967c1d17

Added by Leszek Koltunski over 2 years ago

Do away with the last method in the object Movement classes. Remove the object Movement classes altogether.
From now on the implementation of a TwistyPuzzle is 100% data, no code at all.
Next step: make the implementation a (generated?) (XML?) file.

View differences:

src/main/java/org/distorted/objects/TwistyMirror.java
19 19

  
20 20
package org.distorted.objects;
21 21

  
22
import static org.distorted.objects.Movement.TYPE_NOT_SPLIT;
23

  
22 24
import android.content.res.Resources;
23 25

  
24 26
import org.distorted.helpers.ObjectShape;
......
42 44
           new Static3D(0,0,1)
43 45
         };
44 46

  
47
  private static final int[] NUM_ENABLED = {2,2,2,2,2,2};
48

  
49
  private static final int[][][] ENABLED = new int[][][]
50
      {
51
          {{1,2}},{{1,2}},{{0,2}},{{0,2}},{{0,1}},{{0,1}},
52
      };
53

  
45 54
  private static final int[] FACE_COLORS = new int[] { COLOR_WHITE };
46 55
  private static final float DX = 0.10f;
47 56
  private static final float DY = 0.25f;
......
654 663
      int numLayers = getNumLayers();
655 664
      if( mCuts==null ) getCuts(numLayers);
656 665
      getLayerRotatable(numLayers);
657

  
658
      mMovement = new MovementCube(mCuts,mLayerRotatable,numLayers);
666
      mMovement = new Movement6(ROT_AXIS,mCuts,mLayerRotatable,numLayers,TYPE_NOT_SPLIT,NUM_ENABLED,ENABLED);
659 667
      }
660 668
    return mMovement;
661 669
    }

Also available in: Unified diff