Project

General

Profile

« Previous | Next » 

Revision ccd8a6f2

Added by Leszek Koltunski about 1 year ago

Disconnect the rotation axis in the Tablebases from the axis in the objects.

View differences:

src/main/java/org/distorted/objectlib/objects/TwistyCuboid.java
33 33 

  		




  34
  34
  
    
public class TwistyCuboid extends ShapeHexahedron


  		




  35
  35
  
    
{


  		




  36
  
  
    
  public static final Static3D[] ROT_AXIS = new Static3D[]


  		




  
  36
  
    
  static final Static3D[] ROT_AXIS = new Static3D[]


  		




  37
  37
  
    
         {


  		




  38
  38
  
    
           new Static3D(1,0,0),


  		




  39
  39
  
    
           new Static3D(0,1,0),


  		












  

    
      src/main/java/org/distorted/objectlib/objects/TwistyIvy.java
    
  





  33
  33
  
    

  		




  34
  34
  
    
public class TwistyIvy extends ShapeHexahedron


  		




  35
  35
  
    
{


  		




  36
  
  
    
  public static final Static3D[] ROT_AXIS = new Static3D[]


  		




  
  36
  
    
  static final Static3D[] ROT_AXIS = new Static3D[]


  		




  37
  37
  
    
         {


  		




  38
  38
  
    
           new Static3D( SQ3/3, SQ3/3, SQ3/3),


  		




  39
  39
  
    
           new Static3D( SQ3/3, SQ3/3,-SQ3/3),


  		












  

    
      src/main/java/org/distorted/objectlib/objects/TwistyPyraminx.java
    
  





  32
  32
  
    

  		




  33
  33
  
    
public class TwistyPyraminx extends ShapeTetrahedron


  		




  34
  34
  
    
{


  		




  35
  
  
    
  public static final Static3D[] ROT_AXIS = new Static3D[]


  		




  
  35
  
    
  static final Static3D[] ROT_AXIS = new Static3D[]


  		




  36
  36
  
    
         {


  		




  37
  37
  
    
           new Static3D(     0,-SQ3/3,-SQ6/3),


  		




  38
  38
  
    
           new Static3D(     0,-SQ3/3, SQ6/3),


  		












  

    
      src/main/java/org/distorted/objectlib/objects/TwistyPyraminxDuo.java
    
  





  31
  31
  
    

  		




  32
  32
  
    
public class TwistyPyraminxDuo extends ShapeTetrahedron


  		




  33
  33
  
    
{


  		




  34
  
  
    
  public static final Static3D[] ROT_AXIS = new Static3D[]


  		




  
  34
  
    
  static final Static3D[] ROT_AXIS = new Static3D[]


  		




  35
  35
  
    
         {


  		




  36
  36
  
    
           new Static3D(     0,-SQ3/3,-SQ6/3),


  		




  37
  37
  
    
           new Static3D(     0,-SQ3/3, SQ6/3),


  		












  

    
      src/main/java/org/distorted/objectlib/tablebases/TablebasesCuboid232.java
    
  





  12
  12
  
    
import android.content.res.Resources;


  		




  13
  13
  
    

  		




  14
  14
  
    
import org.distorted.library.type.Static3D;


  		




  15
  
  
    
import org.distorted.objectlib.objects.TwistyCuboid;


  		




  16
  15
  
    

  		




  17
  16
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  18
  17
  
    

  		




  ......




  57
  56
  
    

  		




  58
  57
  
    
  Static3D[] getRotationAxis()


  		




  59
  58
  
    
    {


  		




  60
  
  
    
    return TwistyCuboid.ROT_AXIS;


  		




  
  59
  
    
    return new Static3D[]


  		




  
  60
  
    
         {


  		




  
  61
  
    
           new Static3D(1,0,0),


  		




  
  62
  
    
           new Static3D(0,1,0),


  		




  
  63
  
    
           new Static3D(0,0,1)


  		




  
  64
  
    
         };


  		




  61
  65
  
    
    }


  		




  62
  66
  
    

  		




  63
  67
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		












  

    
      src/main/java/org/distorted/objectlib/tablebases/TablebasesIvyCube.java
    
  





  12
  12
  
    
import android.content.res.Resources;


  		




  13
  13
  
    

  		




  14
  14
  
    
import org.distorted.library.type.Static3D;


  		




  15
  
  
    
import org.distorted.objectlib.objects.TwistyIvy;


  		




  
  15
  
    
import static org.distorted.objectlib.main.TwistyObject.SQ3;


  		




  16
  16
  
    

  		




  17
  17
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  18
  18
  
    

  		




  ......




  53
  53
  
    

  		




  54
  54
  
    
  Static3D[] getRotationAxis()


  		




  55
  55
  
    
    {


  		




  56
  
  
    
    return TwistyIvy.ROT_AXIS;


  		




  
  56
  
    
    return new Static3D[]


  		




  
  57
  
    
         {


  		




  
  58
  
    
           new Static3D( SQ3/3, SQ3/3, SQ3/3),


  		




  
  59
  
    
           new Static3D( SQ3/3, SQ3/3,-SQ3/3),


  		




  
  60
  
    
           new Static3D( SQ3/3,-SQ3/3, SQ3/3),


  		




  
  61
  
    
           new Static3D( SQ3/3,-SQ3/3,-SQ3/3)


  		




  
  62
  
    
         };


  		




  57
  63
  
    
    }


  		




  58
  64
  
    

  		




  59
  65
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		












  

    
      src/main/java/org/distorted/objectlib/tablebases/TablebasesPyraminx.java
    
  





  10
  10
  
    
package org.distorted.objectlib.tablebases;


  		




  11
  11
  
    

  		




  12
  12
  
    
import static org.distorted.objectlib.main.TwistyObject.SQ2;


  		




  
  13
  
    
import static org.distorted.objectlib.main.TwistyObject.SQ3;


  		




  13
  14
  
    
import static org.distorted.objectlib.main.TwistyObject.SQ6;


  		




  14
  15
  
    

  		




  15
  16
  
    
import android.content.res.Resources;


  		




  16
  17
  
    

  		




  17
  18
  
    
import org.distorted.library.type.Static3D;


  		




  18
  19
  
    
import org.distorted.objectlib.R;


  		




  19
  
  
    
import org.distorted.objectlib.objects.TwistyPyraminx;


  		




  20
  20
  
    

  		




  21
  21
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  22
  22
  
    

  		




  ......




  58
  58
  
    

  		




  59
  59
  
    
  Static3D[] getRotationAxis()


  		




  60
  60
  
    
    {


  		




  61
  
  
    
    return TwistyPyraminx.ROT_AXIS;


  		




  
  61
  
    
    return new Static3D[]


  		




  
  62
  
    
         {


  		




  
  63
  
    
           new Static3D(     0,-SQ3/3,-SQ6/3),


  		




  
  64
  
    
           new Static3D(     0,-SQ3/3, SQ6/3),


  		




  
  65
  
    
           new Static3D( SQ6/3, SQ3/3,     0),


  		




  
  66
  
    
           new Static3D(-SQ6/3, SQ3/3,     0),


  		




  
  67
  
    
         };


  		




  62
  68
  
    
    }


  		




  63
  69
  
    

  		




  64
  70
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		












  

    
      src/main/java/org/distorted/objectlib/tablebases/TablebasesPyraminxDuo.java
    
  





  10
  10
  
    
package org.distorted.objectlib.tablebases;


  		




  11
  11
  
    

  		




  12
  12
  
    
import static org.distorted.objectlib.main.TwistyObject.SQ2;


  		




  
  13
  
    
import static org.distorted.objectlib.main.TwistyObject.SQ3;


  		




  
  14
  
    
import static org.distorted.objectlib.main.TwistyObject.SQ6;


  		




  13
  15
  
    

  		




  14
  16
  
    
import android.content.res.Resources;


  		




  15
  17
  
    

  		




  16
  18
  
    
import org.distorted.library.type.Static3D;


  		




  17
  
  
    
import org.distorted.objectlib.objects.TwistyPyraminxDuo;


  		




  18
  19
  
    

  		




  19
  20
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  20
  21
  
    

  		




  ......




  46
  47
  
    

  		




  47
  48
  
    
  Static3D[] getRotationAxis()


  		




  48
  49
  
    
    {


  		




  49
  
  
    
    return TwistyPyraminxDuo.ROT_AXIS;


  		




  
  50
  
    
    return new Static3D[]


  		




  
  51
  
    
         {


  		




  
  52
  
    
           new Static3D(     0,-SQ3/3,-SQ6/3),


  		




  
  53
  
    
           new Static3D(     0,-SQ3/3, SQ6/3),


  		




  
  54
  
    
           new Static3D( SQ6/3, SQ3/3,     0),


  		




  
  55
  
    
           new Static3D(-SQ6/3, SQ3/3,     0),


  		




  
  56
  
    
         };


  		




  50
  57
  
    
    }


  		




  51
  58
  
    

  		




  52
  59
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		












Also available in:  Unified diff