Project

General

Profile

« Previous | Next » 

Revision a57e6870

Added by Leszek Koltunski over 2 years ago

make numLayers into an int[] (preparation for Cuboids)
Caution: because of previous changes to cubit order in cube, the Solver is broken!

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyDino6.java
39 39

  
40 40
///////////////////////////////////////////////////////////////////////////////////////////////////
41 41

  
42
  public TwistyDino6(int size, Static4D quat, Static3D move, DistortedTexture texture,
42
  public TwistyDino6(int[] numL, Static4D quat, Static3D move, DistortedTexture texture,
43 43
                     MeshSquare mesh, DistortedEffects effects, Resources res, int scrWidth)
44 44
    {
45
    super(size, quat, move, texture, mesh, effects, res, scrWidth);
45
    super(numL, quat, move, texture, mesh, effects, res, scrWidth);
46 46
    }
47 47

  
48 48
///////////////////////////////////////////////////////////////////////////////////////////////////
......
70 70

  
71 71
///////////////////////////////////////////////////////////////////////////////////////////////////
72 72

  
73
  protected int[] getSolvedQuats(int cubit, int numLayers)
73
  protected int[] getSolvedQuats(int cubit, int[] numLayers)
74 74
    {
75 75
    return null;
76 76
    }
77 77

  
78 78
///////////////////////////////////////////////////////////////////////////////////////////////////
79 79

  
80
  protected int getFaceColor(int cubit, int cubitface, int size)
80
  protected int getFaceColor(int cubit, int cubitface, int[] numLayers)
81 81
    {
82 82
    if( mFaceMap==null )
83 83
      {
......
101 101

  
102 102
///////////////////////////////////////////////////////////////////////////////////////////////////
103 103

  
104
  public ObjectType intGetObjectType(int numLayers)
104
  public ObjectType intGetObjectType(int[] numLayers)
105 105
    {
106 106
    return ObjectType.DINO_3;
107 107
    }
108 108

  
109 109
///////////////////////////////////////////////////////////////////////////////////////////////////
110 110

  
111
  public int getObjectName(int numLayers)
111
  public int getObjectName(int[] numLayers)
112 112
    {
113 113
    return R.string.dino3;
114 114
    }
115 115

  
116 116
///////////////////////////////////////////////////////////////////////////////////////////////////
117 117

  
118
  public int getInventor(int numLayers)
118
  public int getInventor(int[] numLayers)
119 119
    {
120 120
    return R.string.dino3_inventor;
121 121
    }

Also available in: Unified diff