Project

General

Profile

« Previous | Next » 

Revision fcd8226a

Added by Leszek Koltunski about 4 years ago

The Redi Cube should be finished now.

View differences:

src/main/java/org/distorted/objects/ObjectList.java
104 104

  
105 105
  REDI (
106 106
         new int[][] {
107
                       {3 , 11, R.raw.heli, R.drawable.ui_small_redi, R.drawable.ui_medium_redi, R.drawable.ui_big_redi, R.drawable.ui_huge_redi} ,
107
                       {3 , 14, R.raw.redi, R.drawable.ui_small_redi, R.drawable.ui_medium_redi, R.drawable.ui_big_redi, R.drawable.ui_huge_redi} ,
108 108
                     },
109 109
         TwistyRedi.class,
110 110
         new MovementRedi(),
src/main/java/org/distorted/objects/TwistyObject.java
69 69
  private static final float MAX_SIZE_CHANGE = 1.35f;
70 70
  private static final float MIN_SIZE_CHANGE = 0.8f;
71 71

  
72
  private static boolean mCreateFromDMesh = false;
72
  private static boolean mCreateFromDMesh = true;
73 73

  
74 74
  private static final Static3D CENTER = new Static3D(0,0,0);
75 75
  private static final int POST_ROTATION_MILLISEC = 500;
src/main/java/org/distorted/objects/TwistyRedi.java
399 399
    {
400 400
    int q = CUBITS[0].mQuatIndex;
401 401

  
402
    if ( CUBITS[1].mQuatIndex == q &&
403
         CUBITS[2].mQuatIndex == q &&
404
         CUBITS[3].mQuatIndex == q &&
405
         CUBITS[4].mQuatIndex == q &&
406
         CUBITS[5].mQuatIndex == q &&
407
         CUBITS[6].mQuatIndex == q &&
408
         CUBITS[7].mQuatIndex == q  )
409
      {
410

  
411
      return true;
412
      }
413

  
414
    return false;
402
    return ( CUBITS[ 1].mQuatIndex == q &&
403
             CUBITS[ 2].mQuatIndex == q &&
404
             CUBITS[ 3].mQuatIndex == q &&
405
             CUBITS[ 4].mQuatIndex == q &&
406
             CUBITS[ 5].mQuatIndex == q &&
407
             CUBITS[ 6].mQuatIndex == q &&
408
             CUBITS[ 7].mQuatIndex == q &&
409
             CUBITS[ 8].mQuatIndex == q &&
410
             CUBITS[ 9].mQuatIndex == q &&
411
             CUBITS[10].mQuatIndex == q &&
412
             CUBITS[11].mQuatIndex == q &&
413
             CUBITS[12].mQuatIndex == q &&
414
             CUBITS[13].mQuatIndex == q &&
415
             CUBITS[14].mQuatIndex == q &&
416
             CUBITS[15].mQuatIndex == q &&
417
             CUBITS[16].mQuatIndex == q &&
418
             CUBITS[17].mQuatIndex == q &&
419
             CUBITS[18].mQuatIndex == q &&
420
             CUBITS[19].mQuatIndex == q  );
415 421
    }
416 422

  
417 423
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff