Revision db875721
Added by Leszek Koltunski over 3 years ago
| src/main/java/org/distorted/objects/ObjectList.java | ||
|---|---|---|
| 43 | 43 |
}, |
| 44 | 44 |
TwistyCube.class, |
| 45 | 45 |
new MovementCube(), |
| 46 |
0 |
|
| 46 |
0, |
|
| 47 |
60 |
|
| 47 | 48 |
), |
| 48 | 49 |
|
| 49 | 50 |
PYRA ( |
| ... | ... | |
| 54 | 55 |
}, |
| 55 | 56 |
TwistyPyraminx.class, |
| 56 | 57 |
new MovementPyraminx(), |
| 57 |
1 |
|
| 58 |
1, |
|
| 59 |
30 |
|
| 58 | 60 |
), |
| 59 | 61 |
|
| 60 | 62 |
DIAM ( |
| ... | ... | |
| 63 | 65 |
}, |
| 64 | 66 |
TwistyDiamond.class, |
| 65 | 67 |
new MovementDiamond(), |
| 66 |
1 |
|
| 68 |
1, |
|
| 69 |
60 |
|
| 67 | 70 |
), |
| 68 | 71 |
|
| 69 | 72 |
DINO ( |
| ... | ... | |
| 72 | 75 |
}, |
| 73 | 76 |
TwistyDino6.class, |
| 74 | 77 |
new MovementDino(), |
| 75 |
2 |
|
| 78 |
2, |
|
| 79 |
60 |
|
| 76 | 80 |
), |
| 77 | 81 |
|
| 78 | 82 |
DIN4 ( |
| ... | ... | |
| 81 | 85 |
}, |
| 82 | 86 |
TwistyDino4.class, |
| 83 | 87 |
new MovementDino(), |
| 84 |
2 |
|
| 88 |
2, |
|
| 89 |
60 |
|
| 85 | 90 |
), |
| 86 | 91 |
|
| 87 | 92 |
REDI ( |
| ... | ... | |
| 90 | 95 |
}, |
| 91 | 96 |
TwistyRedi.class, |
| 92 | 97 |
new MovementRedi(), |
| 93 |
2 |
|
| 98 |
2, |
|
| 99 |
60 |
|
| 94 | 100 |
), |
| 95 | 101 |
|
| 96 | 102 |
HELI ( |
| ... | ... | |
| 99 | 105 |
}, |
| 100 | 106 |
TwistyHelicopter.class, |
| 101 | 107 |
new MovementHelicopter(), |
| 102 |
2 |
|
| 108 |
2, |
|
| 109 |
60 |
|
| 103 | 110 |
), |
| 104 | 111 |
|
| 105 | 112 |
SKEW ( |
| ... | ... | |
| 109 | 116 |
}, |
| 110 | 117 |
TwistySkewb.class, |
| 111 | 118 |
new MovementSkewb(), |
| 112 |
3 |
|
| 119 |
3, |
|
| 120 |
60 |
|
| 113 | 121 |
), |
| 114 | 122 |
|
| 115 | 123 |
IVY ( |
| ... | ... | |
| 118 | 126 |
}, |
| 119 | 127 |
TwistyIvy.class, |
| 120 | 128 |
new MovementIvy(), |
| 121 |
3 |
|
| 129 |
3, |
|
| 130 |
60 |
|
| 122 | 131 |
), |
| 123 | 132 |
|
| 124 | 133 |
REX ( |
| ... | ... | |
| 127 | 136 |
}, |
| 128 | 137 |
TwistyRex.class, |
| 129 | 138 |
new MovementRex(), |
| 130 |
3 |
|
| 139 |
3, |
|
| 140 |
60 |
|
| 131 | 141 |
), |
| 132 | 142 |
|
| 133 | 143 |
KILO ( |
| ... | ... | |
| 136 | 146 |
}, |
| 137 | 147 |
TwistyKilominx.class, |
| 138 | 148 |
new MovementMinx(), |
| 139 |
4 |
|
| 149 |
4, |
|
| 150 |
30 |
|
| 140 | 151 |
), |
| 141 | 152 |
|
| 142 | 153 |
MEGA ( |
| ... | ... | |
| 146 | 157 |
}, |
| 147 | 158 |
TwistyMegaminx.class, |
| 148 | 159 |
new MovementMinx(), |
| 149 |
4 |
|
| 160 |
4, |
|
| 161 |
30 |
|
| 150 | 162 |
), |
| 151 | 163 |
; |
| 152 | 164 |
|
| ... | ... | |
| 159 | 171 |
private final Class<? extends TwistyObject> mObjectClass; |
| 160 | 172 |
private final Movement mObjectMovementClass; |
| 161 | 173 |
private final int mColumn, mNumSizes; |
| 174 |
private final int mFOV; |
|
| 162 | 175 |
|
| 163 | 176 |
private static final ObjectList[] objects; |
| 164 | 177 |
private static int mNumAll; |
| ... | ... | |
| 439 | 452 |
|
| 440 | 453 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 441 | 454 |
|
| 442 |
ObjectList(int[][] info, Class<? extends TwistyObject> object , Movement movement, int column) |
|
| 455 |
ObjectList(int[][] info, Class<? extends TwistyObject> object , Movement movement, int column, int fov)
|
|
| 443 | 456 |
{
|
| 444 | 457 |
mNumSizes = info.length; |
| 445 | 458 |
|
| ... | ... | |
| 465 | 478 |
mObjectClass = object; |
| 466 | 479 |
mObjectMovementClass = movement; |
| 467 | 480 |
mColumn = column; |
| 481 |
mFOV = fov; |
|
| 468 | 482 |
} |
| 469 | 483 |
|
| 470 | 484 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 481 | 495 |
return mMaxLevels; |
| 482 | 496 |
} |
| 483 | 497 |
|
| 498 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 499 |
|
|
| 500 |
public int getFOV() |
|
| 501 |
{
|
|
| 502 |
return mFOV; |
|
| 503 |
} |
|
| 504 |
|
|
| 484 | 505 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 485 | 506 |
|
| 486 | 507 |
public int[] getIconIDs() |
| src/main/java/org/distorted/objects/TwistyCube.java | ||
|---|---|---|
| 99 | 99 |
TwistyCube(int size, Static4D quat, DistortedTexture texture, |
| 100 | 100 |
MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
| 101 | 101 |
{
|
| 102 |
super(size, size, 60, quat, texture, mesh, effects, moves, ObjectList.CUBE, res, scrWidth);
|
|
| 102 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.CUBE, res, scrWidth); |
|
| 103 | 103 |
} |
| 104 | 104 |
|
| 105 | 105 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objects/TwistyDiamond.java | ||
|---|---|---|
| 127 | 127 |
TwistyDiamond(int size, Static4D quat, DistortedTexture texture, |
| 128 | 128 |
MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
| 129 | 129 |
{
|
| 130 |
super(size, size, 60, quat, texture, mesh, effects, moves, ObjectList.DIAM, res, scrWidth);
|
|
| 130 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.DIAM, res, scrWidth); |
|
| 131 | 131 |
} |
| 132 | 132 |
|
| 133 | 133 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objects/TwistyDino.java | ||
|---|---|---|
| 97 | 97 |
TwistyDino(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 98 | 98 |
DistortedEffects effects, int[][] moves, ObjectList obj, Resources res, int scrWidth) |
| 99 | 99 |
{
|
| 100 |
super(size, size, 60, quat, texture, mesh, effects, moves, obj, res, scrWidth);
|
|
| 100 |
super(size, size, quat, texture, mesh, effects, moves, obj, res, scrWidth); |
|
| 101 | 101 |
} |
| 102 | 102 |
|
| 103 | 103 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objects/TwistyHelicopter.java | ||
|---|---|---|
| 192 | 192 |
TwistyHelicopter(int size, Static4D quat, DistortedTexture texture, |
| 193 | 193 |
MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
| 194 | 194 |
{
|
| 195 |
super(size, size, 60, quat, texture, mesh, effects, moves, ObjectList.HELI, res, scrWidth);
|
|
| 195 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.HELI, res, scrWidth); |
|
| 196 | 196 |
} |
| 197 | 197 |
|
| 198 | 198 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objects/TwistyIvy.java | ||
|---|---|---|
| 99 | 99 |
TwistyIvy(int size, Static4D quat, DistortedTexture texture, |
| 100 | 100 |
MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
| 101 | 101 |
{
|
| 102 |
super(size, size, 60, quat, texture, mesh, effects, moves, ObjectList.IVY, res, scrWidth);
|
|
| 102 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.IVY, res, scrWidth); |
|
| 103 | 103 |
} |
| 104 | 104 |
|
| 105 | 105 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objects/TwistyMinx.java | ||
|---|---|---|
| 213 | 213 |
TwistyMinx(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 214 | 214 |
DistortedEffects effects, int[][] moves, ObjectList obj, Resources res, int scrWidth) |
| 215 | 215 |
{
|
| 216 |
super(numLayers, realSize, 30, quat, texture, mesh, effects, moves, obj, res, scrWidth);
|
|
| 216 |
super(numLayers, realSize, quat, texture, mesh, effects, moves, obj, res, scrWidth); |
|
| 217 | 217 |
} |
| 218 | 218 |
|
| 219 | 219 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objects/TwistyObject.java | ||
|---|---|---|
| 123 | 123 |
|
| 124 | 124 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 125 | 125 |
|
| 126 |
TwistyObject(int numLayers, int realSize, int fov, Static4D quat, DistortedTexture nodeTexture, MeshSquare nodeMesh,
|
|
| 126 |
TwistyObject(int numLayers, int realSize, Static4D quat, DistortedTexture nodeTexture, MeshSquare nodeMesh, |
|
| 127 | 127 |
DistortedEffects nodeEffects, int[][] moves, ObjectList list, Resources res, int screenWidth) |
| 128 | 128 |
{
|
| 129 | 129 |
super(nodeTexture,nodeEffects,nodeMesh); |
| ... | ... | |
| 205 | 205 |
|
| 206 | 206 |
setupPosition(moves); |
| 207 | 207 |
|
| 208 |
setProjection(fov, 0.1f);
|
|
| 208 |
setProjection( list.getFOV(), 0.1f);
|
|
| 209 | 209 |
} |
| 210 | 210 |
|
| 211 | 211 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objects/TwistyPyraminx.java | ||
|---|---|---|
| 78 | 78 |
TwistyPyraminx(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 79 | 79 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
| 80 | 80 |
{
|
| 81 |
super(size, size, 30, quat, texture, mesh, effects, moves, ObjectList.PYRA, res, scrWidth);
|
|
| 81 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.PYRA, res, scrWidth); |
|
| 82 | 82 |
} |
| 83 | 83 |
|
| 84 | 84 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objects/TwistyRedi.java | ||
|---|---|---|
| 140 | 140 |
TwistyRedi(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 141 | 141 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
| 142 | 142 |
{
|
| 143 |
super(size, size, 60, quat, texture, mesh, effects, moves, ObjectList.REDI, res, scrWidth);
|
|
| 143 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.REDI, res, scrWidth); |
|
| 144 | 144 |
} |
| 145 | 145 |
|
| 146 | 146 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objects/TwistyRex.java | ||
|---|---|---|
| 133 | 133 |
TwistyRex(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, |
| 134 | 134 |
DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
| 135 | 135 |
{
|
| 136 |
super(size, size, 60, quat, texture, mesh, effects, moves, ObjectList.REX, res, scrWidth);
|
|
| 136 |
super(size, size, quat, texture, mesh, effects, moves, ObjectList.REX, res, scrWidth); |
|
| 137 | 137 |
} |
| 138 | 138 |
|
| 139 | 139 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| src/main/java/org/distorted/objects/TwistySkewb.java | ||
|---|---|---|
| 124 | 124 |
TwistySkewb(int size, Static4D quat, DistortedTexture texture, |
| 125 | 125 |
MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth) |
| 126 | 126 |
{
|
| 127 |
super(size, 2*size-2, 60, quat, texture, mesh, effects, moves, ObjectList.SKEW, res, scrWidth);
|
|
| 127 |
super(size, 2*size-2, quat, texture, mesh, effects, moves, ObjectList.SKEW, res, scrWidth); |
|
| 128 | 128 |
} |
| 129 | 129 |
|
| 130 | 130 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Add Gigaminx dmesh.