Project

General

Profile

« Previous | Next » 

Revision 11fa413d

Added by Leszek Koltunski over 2 years ago

Make the ShapeChanging the default TouchControl during MODE_REPLACE.

View differences:

src/main/java/org/distorted/objectlib/touchcontrol/TouchControlShapeConstant.java
55 55

  
56 56
  TouchControlShapeConstant(TwistyObject object, float[] distance3D, Static3D[] faceAxis)
57 57
    {
58
    super(object.getObjectRatio());
59

  
58 60
    int[] numLayers       = object.getNumLayers();
59 61
    float[][] cuts        = object.getCuts(numLayers);
60 62
    boolean[][] rotatable = object.getLayerRotatable(numLayers);
......
68 70
    mPoint2D = new float[2];
69 71
    mMove2D  = new float[2];
70 72

  
71
    mSplit      = object.getMovementSplit();
73
    mSplit      = object.getTouchControlSplit();
72 74
    mEnabled    = object.getEnabled();
73 75
    mFaceAxis   = faceAxis;
74 76
    mNumFaceAxis= mFaceAxis.length;
......
481 483

  
482 484
///////////////////////////////////////////////////////////////////////////////////////////////////
483 485

  
484
  public int getTouchedFace()
486
  public int getTouchedCubitFace()
485 487
    {
486
    return mLastTouchedFace;
488
    return 0;
487 489
    }
488 490

  
489 491
///////////////////////////////////////////////////////////////////////////////////////////////////
490 492

  
491
  public float[] getTouchedPoint3D()
493
  public int getTouchedCubit()
492 494
    {
493
    return mTouch;
495
    return 0;
494 496
    }
495 497
  }

Also available in: Unified diff