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/TwistyBandaged2Bar.java
35 35

  
36 36
public class TwistyBandaged2Bar extends TwistyBandagedAbstract
37 37
{
38
  public TwistyBandaged2Bar(int size, Static4D quat, Static3D move, DistortedTexture texture,
38
  public TwistyBandaged2Bar(int[] numL, Static4D quat, Static3D move, DistortedTexture texture,
39 39
                            MeshSquare mesh, DistortedEffects effects, Resources res, int scrWidth)
40 40
    {
41
    super(size, quat, move, texture, mesh, effects, res, scrWidth);
41
    super(numL, quat, move, texture, mesh, effects, res, scrWidth);
42 42
    }
43 43

  
44 44
///////////////////////////////////////////////////////////////////////////////////////////////////
......
60 60

  
61 61
///////////////////////////////////////////////////////////////////////////////////////////////////
62 62

  
63
  protected int getResource(int numLayers)
63
  protected int getResource(int[] numLayers)
64 64
    {
65 65
    return R.raw.ban2;
66 66
    }
......
116 116
///////////////////////////////////////////////////////////////////////////////////////////////////
117 117
// PUBLIC API
118 118

  
119
  public ObjectType intGetObjectType(int numLayers)
119
  public ObjectType intGetObjectType(int[] numLayers)
120 120
    {
121 121
    return ObjectType.BAN2_3;
122 122
    }
123 123

  
124 124
///////////////////////////////////////////////////////////////////////////////////////////////////
125 125

  
126
  public int getObjectName(int numLayers)
126
  public int getObjectName(int[] numLayers)
127 127
    {
128 128
    return R.string.bandaged_2bar;
129 129
    }
130 130

  
131 131
///////////////////////////////////////////////////////////////////////////////////////////////////
132 132

  
133
  public int getInventor(int numLayers)
133
  public int getInventor(int[] numLayers)
134 134
    {
135 135
    return R.string.bandaged_2bar_inventor;
136 136
    }
137 137

  
138 138
///////////////////////////////////////////////////////////////////////////////////////////////////
139 139

  
140
  public int getComplexity(int numLayers)
140
  public int getComplexity(int[] numLayers)
141 141
    {
142 142
    return 8;
143 143
    }

Also available in: Unified diff