Project

General

Profile

« Previous | Next » 

Revision 88411172

Added by Leszek Koltunski 6 months ago

Beginnings of support for flat shapeshifting cuboids and for not-rotatable rows in TouchControlChanging [this last thing still does not work correctly]

View differences:

src/main/java/org/distorted/objectlib/touchcontrol/TouchControl.java
42 42
  public static final int TC_CHANGING_SHAPEMOD = 102;
43 43

  
44 44
  float mObjectRatio;
45
  int mGhostAxisEnabled;
45 46

  
46 47
  private final float[][] mRotationFactor;
47 48

  
......
141 142
    return mRotationFactor==null ? 1.0f : mRotationFactor[axis][row];
142 143
    }
143 144

  
145
///////////////////////////////////////////////////////////////////////////////////////////////////
146

  
147
  public void enableGhostAxis(int axNum, boolean enable)
148
    {
149
    mGhostAxisEnabled = enable ? -1 : axNum;
150
    }
151

  
144 152
///////////////////////////////////////////////////////////////////////////////////////////////////
145 153

  
146 154
  public abstract boolean objectTouched(Static4D rotatedTouchPoint, Static4D rotatedCamera);
......
150 158
  public abstract int getTouchedCubitFace();
151 159
  public abstract int getTouchedCubit();
152 160
  public abstract float[] getTouchedPuzzleCenter();
153
  public abstract void enableGhostAxis(int axNum, boolean enable);
154 161
  }

Also available in: Unified diff