Project

General

Profile

« Previous | Next » 

Revision 7ca7a08f

Added by Leszek Koltunski 5 months ago

Support for shape-shifting cuboids. (except for the flat ones like the Super Floppy)

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyBandagedAbstract.java
243 243
    return ROT_AXIS;
244 244
    }
245 245

  
246
///////////////////////////////////////////////////////////////////////////////////////////////////
247
// d1>1 && d2>1  ---> we do not support shape-shifting 'flat' cuboids (Super Floppy!)
248

  
249
  private int basicAngle(int d1, int d2)
250
    {
251
    return (((d1-d2)%2)==0 && d1>1 && d2>1) || (d1==1 && d2==1) ? 4 : 2;
252
    }
253

  
246 254
///////////////////////////////////////////////////////////////////////////////////////////////////
247 255

  
248 256
  public int[][] getBasicAngles()
......
254 262
      int numY = num[1];
255 263
      int numZ = num[2];
256 264

  
257
      int x = numY==numZ ? 4 : 2;
258
      int y = numX==numZ ? 4 : 2;
259
      int z = numX==numY ? 4 : 2;
265
      int x = basicAngle(numY,numZ);
266
      int y = basicAngle(numX,numZ);
267
      int z = basicAngle(numX,numY);
260 268

  
261 269
      int[] tmpX = new int[numX];
262 270
      for(int i=0; i<numX; i++) tmpX[i] = x;

Also available in: Unified diff