Project

General

Profile

« Previous | Next » 

Revision 025e4165

Added by Leszek Koltunski 6 months ago

bugfix

View differences:

src/main/java/org/distorted/objectlib/scrambling/ScrambleEdgeGenerator.java
26 26 

  		




  27
  27
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  28
  28
  
    

  		




  29
  
  
    
  private static int[] createEdge(int sizeX, int sizeY, int sizeZ, int stateX, int stateY, int stateZ)


  		




  
  29
  
    
  private static int[] createEdgeCuboid(int sizeX, int sizeY, int sizeZ, int stateX, int stateY, int stateZ)


  		




  30
  30
  
    
    {


  		




  31
  31
  
    
    int num = 0;


  		




  32
  
  
    
    int consX = ((sizeY!=sizeZ) ? 2:6)*sizeX;


  		




  33
  
  
    
    int consY = ((sizeX!=sizeZ) ? 2:6)*sizeY;


  		




  34
  
  
    
    int consZ = ((sizeX!=sizeY) ? 2:6)*sizeZ;


  		




  
  32
  
    
    int consX = ( ((sizeY-sizeZ)%2)!=0 ? 2:6 ) * sizeX;


  		




  
  33
  
    
    int consY = ( ((sizeX-sizeZ)%2)!=0 ? 2:6 ) * sizeY;


  		




  
  34
  
    
    int consZ = ( ((sizeX-sizeY)%2)!=0 ? 2:6 ) * sizeZ;


  		




  35
  35
  
    
    if( stateX>=0 ) num += consX;


  		




  36
  36
  
    
    if( stateY>=0 ) num += consY;


  		




  37
  37
  
    
    if( stateZ>=0 ) num += consZ;


  		




  ......




  54
  54
  
    
    {


  		




  55
  55
  
    
    return new int[][]


  		




  56
  56
  
    
      {


  		




  57
  
  
    
      createEdge(X,Y,Z, 1, 2, 3), // 0 0


  		




  58
  
  
    
      createEdge(X,Y,Z,-1, 4, 5), // 1 x


  		




  59
  
  
    
      createEdge(X,Y,Z, 6,-1, 7), // 2 y


  		




  60
  
  
    
      createEdge(X,Y,Z, 8, 9,-1), // 3 z


  		




  61
  
  
    
      createEdge(X,Y,Z,10,-1, 7), // 4 xy


  		




  62
  
  
    
      createEdge(X,Y,Z,11, 9,-1), // 5 xz


  		




  63
  
  
    
      createEdge(X,Y,Z,-1,12, 5), // 6 yx


  		




  64
  
  
    
      createEdge(X,Y,Z, 8,13,-1), // 7 yz


  		




  65
  
  
    
      createEdge(X,Y,Z,-1, 4,14), // 8 zx


  		




  66
  
  
    
      createEdge(X,Y,Z, 6,-1,15), // 9 zy


  		




  67
  
  
    
      createEdge(X,Y,Z,-1,-1, 5), // 10 xyx


  		




  68
  
  
    
      createEdge(X,Y,Z,-1, 4,-1), // 11 xzx


  		




  69
  
  
    
      createEdge(X,Y,Z,-1,-1, 7), // 12 yxy


  		




  70
  
  
    
      createEdge(X,Y,Z, 6,-1,-1), // 13 yzy


  		




  71
  
  
    
      createEdge(X,Y,Z,-1, 9,-1), // 14 zxz


  		




  72
  
  
    
      createEdge(X,Y,Z, 8,-1,-1), // 15 zyz


  		




  
  57
  
    
      createEdgeCuboid(X,Y,Z, 1, 2, 3), // 0 0


  		




  
  58
  
    
      createEdgeCuboid(X,Y,Z,-1, 4, 5), // 1 x


  		




  
  59
  
    
      createEdgeCuboid(X,Y,Z, 6,-1, 7), // 2 y


  		




  
  60
  
    
      createEdgeCuboid(X,Y,Z, 8, 9,-1), // 3 z


  		




  
  61
  
    
      createEdgeCuboid(X,Y,Z,10,-1, 7), // 4 xy


  		




  
  62
  
    
      createEdgeCuboid(X,Y,Z,11, 9,-1), // 5 xz


  		




  
  63
  
    
      createEdgeCuboid(X,Y,Z,-1,12, 5), // 6 yx


  		




  
  64
  
    
      createEdgeCuboid(X,Y,Z, 8,13,-1), // 7 yz


  		




  
  65
  
    
      createEdgeCuboid(X,Y,Z,-1, 4,14), // 8 zx


  		




  
  66
  
    
      createEdgeCuboid(X,Y,Z, 6,-1,15), // 9 zy


  		




  
  67
  
    
      createEdgeCuboid(X,Y,Z,-1,-1, 5), // 10 xyx


  		




  
  68
  
    
      createEdgeCuboid(X,Y,Z,-1, 4,-1), // 11 xzx


  		




  
  69
  
    
      createEdgeCuboid(X,Y,Z,-1,-1, 7), // 12 yxy


  		




  
  70
  
    
      createEdgeCuboid(X,Y,Z, 6,-1,-1), // 13 yzy


  		




  
  71
  
    
      createEdgeCuboid(X,Y,Z,-1, 9,-1), // 14 zxz


  		




  
  72
  
    
      createEdgeCuboid(X,Y,Z, 8,-1,-1), // 15 zyz


  		




  73
  73
  
    
      };


  		




  74
  74
  
    
    }


  		




  75
  75
  
    

  		












Also available in:  Unified diff