Revision c187cb69
Added by Leszek Koltunski over 2 years ago
src/main/java/org/distorted/objectlib/objects/TwistyTrajber.java | ||
---|---|---|
112 | 112 |
{ |
113 | 113 |
mQuats = new Static4D[] |
114 | 114 |
{ |
115 |
new Static4D( 0.0f, 0.0f, 0.0f, 1.0f), // 0 nothing // OK
|
|
116 |
new Static4D( SQ2/2, 0.0f, SQ2/2, 0.0f), // 1 ( 1, 0,-1) 180 // OK
|
|
117 |
new Static4D( 0.0f, 1.0f, 0.0f, 0.0f), // 2 ( 0, 1, 0) 180 // OK
|
|
118 |
new Static4D( SQ2/2, 0.0f, -SQ2/2, 0.0f), // 3 ( 1, 0, 1) 180 // OK
|
|
115 |
new Static4D( 0.0f, 0.0f, 0.0f, 1.0f), // 0 nothing |
|
116 |
new Static4D( SQ2/2, 0.0f, SQ2/2, 0.0f), // 1 ( 1, 0,-1) 180 |
|
117 |
new Static4D( 0.0f, 1.0f, 0.0f, 0.0f), // 2 ( 0, 1, 0) 180 |
|
118 |
new Static4D( SQ2/2, 0.0f, -SQ2/2, 0.0f), // 3 ( 1, 0, 1) 180 |
|
119 | 119 |
|
120 | 120 |
new Static4D( 0.5f, SQ2/2, -0.5f, 0.0f), // 4 (0.5,SQ2/2,0.5) 180 |
121 | 121 |
new Static4D( 0.5f, -SQ2/2, -0.5f, 0.0f), // 5 (0.5,-SQ2/2,-0.5) 180 |
122 | 122 |
new Static4D( 1.0f, 0.0f, 0.0f, 0.0f), // 6 (1,0,0) 180 |
123 | 123 |
new Static4D( 0.0f, 0.0f, 1.0f, 0.0f), // 7 (0,0,1) 180 |
124 |
new Static4D( 0.5f, 0.0f, 0.5f, SQ2/2), // 8 ( 1, 0, 1) +-90 // OK
|
|
125 |
new Static4D( 0.5f, 0.0f, 0.5f, -SQ2/2), // 9 ( 1, 0, 1) -+90 // OK
|
|
124 |
new Static4D( 0.5f, 0.0f, 0.5f, SQ2/2), // 8 ( 1, 0, 1) +-90 |
|
125 |
new Static4D( 0.5f, 0.0f, 0.5f, -SQ2/2), // 9 ( 1, 0, 1) -+90 |
|
126 | 126 |
new Static4D( 0.5f, SQ2/2, 0.5f, 0.0f), // 10 (-0.5,-SQ2/2,-0.5) 180 |
127 | 127 |
new Static4D( 0.5f, -SQ2/2, 0.5f, 0.0f), // 11 (0.5,-SQ2/2,0.5) 180 |
128 |
new Static4D( 0.0f, SQ2/2, 0.0f, SQ2/2), // 12 ( 0, 1, 0) +-90 // OK
|
|
129 |
new Static4D( 0.0f, SQ2/2, 0.0f, -SQ2/2), // 13 ( 0, 1, 0) -+90 // OK
|
|
130 |
new Static4D( 0.5f, 0.0f, -0.5f, -SQ2/2), // 15 ( 1, 0,-1) -+90 // OK
|
|
131 |
new Static4D( 0.5f, 0.0f, -0.5f, SQ2/2), // 14 ( 1, 0,-1) +-90 // OK
|
|
128 |
new Static4D( 0.0f, SQ2/2, 0.0f, SQ2/2), // 12 ( 0, 1, 0) +-90 |
|
129 |
new Static4D( 0.0f, SQ2/2, 0.0f, -SQ2/2), // 13 ( 0, 1, 0) -+90 |
|
130 |
new Static4D( 0.5f, 0.0f, -0.5f, -SQ2/2), // 15 ( 1, 0,-1) -+90 |
|
131 |
new Static4D( 0.5f, 0.0f, -0.5f, SQ2/2), // 14 ( 1, 0,-1) +-90 |
|
132 | 132 |
|
133 | 133 |
new Static4D( SQ2/2, 0.5f, 0.0f, 0.5f), // 16 (+,+,0) + |
134 | 134 |
new Static4D( 0.0f, -0.5f, SQ2/2, -0.5f), // 17 (0,-,+) - |
... | ... | |
328 | 328 |
int[] cornerIndices = new int[] { 0,-1,-1,-1,-1,0,0,0,0,-1,-1,-1,-1 }; |
329 | 329 |
float[][] centers = new float[][] { { LEN/2, 0.0f, -LEN/2} }; |
330 | 330 |
int[] centerIndices = new int[] { 0,-1,-1,-1,-1,0,0,0,0,-1,-1,-1,-1 }; |
331 |
return new ObjectShape(vertices,vert_indices,bands,bandIndices,corners,cornerIndices,centers,centerIndices,getNumCubitFaces(), null); |
|
331 |
return new ObjectShape(vertices,vert_indices,bands,bandIndices,corners,cornerIndices,centers,centerIndices,getNumCubitFaces(), null,4);
|
|
332 | 332 |
} |
333 | 333 |
if( variant==1 ) |
334 | 334 |
{ |
... | ... | |
364 | 364 |
int[] cornerIndices = new int[] { 0,0,0,0,0,0,-1,-1 }; |
365 | 365 |
float[][] centers = new float[][] { { 0, 0, -B} }; |
366 | 366 |
int[] centerIndices = new int[] { 0,0,0,0,0,0,-1,-1 }; |
367 |
return new ObjectShape(vertices,vert_indices,bands,bandIndices,corners,cornerIndices,centers,centerIndices,getNumCubitFaces(), null); |
|
367 |
return new ObjectShape(vertices,vert_indices,bands,bandIndices,corners,cornerIndices,centers,centerIndices,getNumCubitFaces(), null,2);
|
|
368 | 368 |
} |
369 | 369 |
else |
370 | 370 |
{ |
... | ... | |
392 | 392 |
int[] cornerIndices = new int[] { 0,0,0,-1 }; |
393 | 393 |
float[][] centers = new float[][] { {0, -(SQ2/3)*L,-2*L/3} }; |
394 | 394 |
int[] centerIndices = new int[] { 0,0,0,-1 }; |
395 |
return new ObjectShape(vertices,vert_indices,bands,bandIndices,corners,cornerIndices,centers,centerIndices,getNumCubitFaces(), null); |
|
395 |
return new ObjectShape(vertices,vert_indices,bands,bandIndices,corners,cornerIndices,centers,centerIndices,getNumCubitFaces(), null,1);
|
|
396 | 396 |
} |
397 | 397 |
} |
398 | 398 |
|
... | ... | |
438 | 438 |
|
439 | 439 |
if( mEdgeColorMap==null) |
440 | 440 |
{ |
441 |
mEdgeColorMap = new int[][] { {3,0},{1,2},{4,7},{6,5}, {0,4},{5,1},{7,3},{2,6}, {1,0},{4,5},{3,2},{6,7} };
|
|
441 |
mEdgeColorMap = new int[][] { {3,0},{1,2},{4,7},{6,5}, {0,4},{5,1},{7,3},{2,6}, {1,0},{4,5},{3,2},{6,7} }; |
|
442 | 442 |
} |
443 | 443 |
|
444 | 444 |
if( mCornerColorMap==null) |
Also available in: Unified diff
Initial commit