Project

General

Profile

« Previous | Next » 

Revision 40e76ea4

Added by Leszek Koltunski almost 2 years ago

Do not react on end of scramblng in FreePlay!

View differences:

src/main/java/org/distorted/objectlib/main/TwistyObject.java
1139 1139
    if( moves!=null )
1140 1140
      {
1141 1141
      Static4D quat;
1142
      int index, axis, row, rowBitmap, angle;
1142
      int index, axis, row, rowBitmap, basic, angle;
1143 1143

  
1144 1144
      for(int[] move: moves)
1145 1145
        {
1146 1146
        axis     = move[0];
1147 1147
        rowBitmap= computeBitmapFromRow( move[1],axis );
1148 1148
        row      = computeRowFromBitmap( move[1] );
1149
        angle    = move[2]*(360/mBasicAngles[axis][row]);   // this assumes that all layers from
1150
                                                            // the bitmap have the same BasicAngle.
1151
                                                            // at the moment this is always true as
1152
                                                            // there are no bandaged objects with
1153
                                                            // different per-layer BasicAngles.
1149
        basic    = mBasicAngles[axis][row];
1150
        angle    = move[2]*(360/basic);   // this assumes that all layers from
1151
                                          // the bitmap have the same BasicAngle.
1152
                                          // at the moment this is always true as
1153
                                          // there are no bandaged objects with
1154
                                          // different per-layer BasicAngles.
1154 1155
        quat = makeQuaternion(axis,angle);
1155 1156

  
1156 1157
        for(int i=0; i<mNumCubits; i++)

Also available in: Unified diff