Project

General

Profile

« Previous | Next » 

Revision e6cf7283

Added by Leszek Koltunski about 3 years ago

Change the Cubit center from a Static3D to a float[].
The point: now we can have more than one center, and bandaged objects need more than one, because in this way they are going to fill up their RotationRow bitmaps.

View differences:

src/main/java/org/distorted/objects/TwistyHelicopter.java
97 97
  private static final float XY_CENTER   = DIST_CORNER/3;
98 98

  
99 99
  // centers of the 8 corners + 6*4 face triangles ( i.e. of the all 32 cubits)
100
  private static final Static3D[] CENTERS = new Static3D[]
100
  private static final float[][] CENTERS = new float[][]
101 101
         {
102
           new Static3D(   DIST_CORNER,   DIST_CORNER,   DIST_CORNER ),
103
           new Static3D(   DIST_CORNER,   DIST_CORNER,  -DIST_CORNER ),
104
           new Static3D(   DIST_CORNER,  -DIST_CORNER,   DIST_CORNER ),
105
           new Static3D(   DIST_CORNER,  -DIST_CORNER,  -DIST_CORNER ),
106
           new Static3D(  -DIST_CORNER,   DIST_CORNER,   DIST_CORNER ),
107
           new Static3D(  -DIST_CORNER,   DIST_CORNER,  -DIST_CORNER ),
108
           new Static3D(  -DIST_CORNER,  -DIST_CORNER,   DIST_CORNER ),
109
           new Static3D(  -DIST_CORNER,  -DIST_CORNER,  -DIST_CORNER ),
110

  
111
           new Static3D(   DIST_CENTER,     XY_CENTER,     XY_CENTER ),
112
           new Static3D(   DIST_CENTER,     XY_CENTER,    -XY_CENTER ),
113
           new Static3D(   DIST_CENTER,    -XY_CENTER,     XY_CENTER ),
114
           new Static3D(   DIST_CENTER,    -XY_CENTER,    -XY_CENTER ),
115

  
116
           new Static3D(  -DIST_CENTER,     XY_CENTER,     XY_CENTER ),
117
           new Static3D(  -DIST_CENTER,     XY_CENTER,    -XY_CENTER ),
118
           new Static3D(  -DIST_CENTER,    -XY_CENTER,     XY_CENTER ),
119
           new Static3D(  -DIST_CENTER,    -XY_CENTER,    -XY_CENTER ),
120

  
121
           new Static3D(   XY_CENTER  ,   DIST_CENTER,     XY_CENTER ),
122
           new Static3D(   XY_CENTER  ,   DIST_CENTER,    -XY_CENTER ),
123
           new Static3D(  -XY_CENTER  ,   DIST_CENTER,     XY_CENTER ),
124
           new Static3D(  -XY_CENTER  ,   DIST_CENTER,    -XY_CENTER ),
125

  
126
           new Static3D(   XY_CENTER  ,  -DIST_CENTER,     XY_CENTER ),
127
           new Static3D(   XY_CENTER  ,  -DIST_CENTER,    -XY_CENTER ),
128
           new Static3D(  -XY_CENTER  ,  -DIST_CENTER,     XY_CENTER ),
129
           new Static3D(  -XY_CENTER  ,  -DIST_CENTER,    -XY_CENTER ),
130

  
131
           new Static3D(   XY_CENTER  ,     XY_CENTER,   DIST_CENTER ),
132
           new Static3D(   XY_CENTER  ,    -XY_CENTER,   DIST_CENTER ),
133
           new Static3D(  -XY_CENTER  ,     XY_CENTER,   DIST_CENTER ),
134
           new Static3D(  -XY_CENTER  ,    -XY_CENTER,   DIST_CENTER ),
135

  
136
           new Static3D(   XY_CENTER  ,     XY_CENTER,  -DIST_CENTER ),
137
           new Static3D(   XY_CENTER  ,    -XY_CENTER,  -DIST_CENTER ),
138
           new Static3D(  -XY_CENTER  ,     XY_CENTER,  -DIST_CENTER ),
139
           new Static3D(  -XY_CENTER  ,    -XY_CENTER,  -DIST_CENTER ),
102
             {   DIST_CORNER,   DIST_CORNER,   DIST_CORNER },
103
             {   DIST_CORNER,   DIST_CORNER,  -DIST_CORNER },
104
             {   DIST_CORNER,  -DIST_CORNER,   DIST_CORNER },
105
             {   DIST_CORNER,  -DIST_CORNER,  -DIST_CORNER },
106
             {  -DIST_CORNER,   DIST_CORNER,   DIST_CORNER },
107
             {  -DIST_CORNER,   DIST_CORNER,  -DIST_CORNER },
108
             {  -DIST_CORNER,  -DIST_CORNER,   DIST_CORNER },
109
             {  -DIST_CORNER,  -DIST_CORNER,  -DIST_CORNER },
110

  
111
             {   DIST_CENTER,     XY_CENTER,     XY_CENTER },
112
             {   DIST_CENTER,     XY_CENTER,    -XY_CENTER },
113
             {   DIST_CENTER,    -XY_CENTER,     XY_CENTER },
114
             {   DIST_CENTER,    -XY_CENTER,    -XY_CENTER },
115

  
116
             {  -DIST_CENTER,     XY_CENTER,     XY_CENTER },
117
             {  -DIST_CENTER,     XY_CENTER,    -XY_CENTER },
118
             {  -DIST_CENTER,    -XY_CENTER,     XY_CENTER },
119
             {  -DIST_CENTER,    -XY_CENTER,    -XY_CENTER },
120

  
121
             {   XY_CENTER  ,   DIST_CENTER,     XY_CENTER },
122
             {   XY_CENTER  ,   DIST_CENTER,    -XY_CENTER },
123
             {  -XY_CENTER  ,   DIST_CENTER,     XY_CENTER },
124
             {  -XY_CENTER  ,   DIST_CENTER,    -XY_CENTER },
125

  
126
             {   XY_CENTER  ,  -DIST_CENTER,     XY_CENTER },
127
             {   XY_CENTER  ,  -DIST_CENTER,    -XY_CENTER },
128
             {  -XY_CENTER  ,  -DIST_CENTER,     XY_CENTER },
129
             {  -XY_CENTER  ,  -DIST_CENTER,    -XY_CENTER },
130

  
131
             {   XY_CENTER  ,     XY_CENTER,   DIST_CENTER },
132
             {   XY_CENTER  ,    -XY_CENTER,   DIST_CENTER },
133
             {  -XY_CENTER  ,     XY_CENTER,   DIST_CENTER },
134
             {  -XY_CENTER  ,    -XY_CENTER,   DIST_CENTER },
135

  
136
             {   XY_CENTER  ,     XY_CENTER,  -DIST_CENTER },
137
             {   XY_CENTER  ,    -XY_CENTER,  -DIST_CENTER },
138
             {  -XY_CENTER  ,     XY_CENTER,  -DIST_CENTER },
139
             {  -XY_CENTER  ,    -XY_CENTER,  -DIST_CENTER },
140 140
         };
141 141

  
142 142
  // Colors of the faces of cubits. Each cubit has 6 faces
......
251 251

  
252 252
///////////////////////////////////////////////////////////////////////////////////////////////////
253 253

  
254
  Static3D[] getCubitPositions(int size)
254
  float[][] getCubitPositions(int size)
255 255
    {
256 256
    return CENTERS;
257 257
    }

Also available in: Unified diff