Revision efa8aa48
Added by Leszek Koltunski almost 4 years ago
| src/main/java/org/distorted/objects/RubikCube.java | ||
|---|---|---|
| 33 | 33 |
import org.distorted.library.main.DistortedTexture; |
| 34 | 34 |
import org.distorted.library.mesh.MeshBase; |
| 35 | 35 |
import org.distorted.library.mesh.MeshJoined; |
| 36 |
import org.distorted.library.mesh.MeshRectangles;
|
|
| 36 |
import org.distorted.library.mesh.MeshSquare;
|
|
| 37 | 37 |
import org.distorted.library.type.Static1D; |
| 38 | 38 |
import org.distorted.library.type.Static3D; |
| 39 | 39 |
import org.distorted.library.type.Static4D; |
| ... | ... | |
| 114 | 114 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 115 | 115 |
|
| 116 | 116 |
RubikCube(int size, Static4D quat, DistortedTexture texture, |
| 117 |
MeshRectangles mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 117 |
MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 118 | 118 |
{
|
| 119 | 119 |
super(size, 60, quat, texture, mesh, effects, moves, RubikObjectList.CUBE, res, scrWidth); |
| 120 | 120 |
} |
| ... | ... | |
| 223 | 223 |
{
|
| 224 | 224 |
final int MESHES=6; |
| 225 | 225 |
int association = 1; |
| 226 |
MeshBase[] meshes = new MeshRectangles[MESHES];
|
|
| 227 |
meshes[0] = new MeshRectangles(loc,loc);
|
|
| 226 |
MeshBase[] meshes = new MeshSquare[MESHES];
|
|
| 227 |
meshes[0] = new MeshSquare(loc,loc);
|
|
| 228 | 228 |
meshes[0].setEffectAssociation(0,association,0); |
| 229 | 229 |
|
| 230 | 230 |
for(int i=1; i<MESHES; i++) |
| src/main/java/org/distorted/objects/RubikDino.java | ||
|---|---|---|
| 36 | 36 |
import org.distorted.library.main.DistortedTexture; |
| 37 | 37 |
import org.distorted.library.mesh.MeshBase; |
| 38 | 38 |
import org.distorted.library.mesh.MeshJoined; |
| 39 |
import org.distorted.library.mesh.MeshRectangles;
|
|
| 40 |
import org.distorted.library.mesh.MeshTriangles;
|
|
| 39 |
import org.distorted.library.mesh.MeshSquare;
|
|
| 40 |
import org.distorted.library.mesh.MeshTriangle; |
|
| 41 | 41 |
import org.distorted.library.type.Static1D; |
| 42 | 42 |
import org.distorted.library.type.Static3D; |
| 43 | 43 |
import org.distorted.library.type.Static4D; |
| ... | ... | |
| 122 | 122 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 123 | 123 |
|
| 124 | 124 |
RubikDino(int size, Static4D quat, DistortedTexture texture, |
| 125 |
MeshRectangles mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 125 |
MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 126 | 126 |
{
|
| 127 | 127 |
super(size, 60, quat, texture, mesh, effects, moves, RubikObjectList.DINO, res, scrWidth); |
| 128 | 128 |
} |
| ... | ... | |
| 136 | 136 |
final int MESHES=4; |
| 137 | 137 |
|
| 138 | 138 |
int association = 1; |
| 139 |
MeshBase[] meshes = new MeshTriangles[MESHES];
|
|
| 139 |
MeshBase[] meshes = new MeshTriangle[MESHES]; |
|
| 140 | 140 |
|
| 141 |
meshes[0] = new MeshTriangles(11);
|
|
| 141 |
meshes[0] = new MeshTriangle(11); |
|
| 142 | 142 |
meshes[0].setEffectAssociation(0,association,0); |
| 143 | 143 |
|
| 144 | 144 |
for(int i=1; i<MESHES; i++) |
| src/main/java/org/distorted/objects/RubikObject.java | ||
|---|---|---|
| 39 | 39 |
import org.distorted.library.mesh.MeshBase; |
| 40 | 40 |
import org.distorted.library.mesh.MeshFile; |
| 41 | 41 |
import org.distorted.library.mesh.MeshJoined; |
| 42 |
import org.distorted.library.mesh.MeshRectangles;
|
|
| 42 |
import org.distorted.library.mesh.MeshSquare;
|
|
| 43 | 43 |
import org.distorted.library.message.EffectListener; |
| 44 | 44 |
import org.distorted.library.type.Dynamic1D; |
| 45 | 45 |
import org.distorted.library.type.Static1D; |
| ... | ... | |
| 102 | 102 |
|
| 103 | 103 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 104 | 104 |
|
| 105 |
RubikObject(int size, int fov, Static4D quat, DistortedTexture nodeTexture, MeshRectangles nodeMesh,
|
|
| 105 |
RubikObject(int size, int fov, Static4D quat, DistortedTexture nodeTexture, MeshSquare nodeMesh,
|
|
| 106 | 106 |
DistortedEffects nodeEffects, int[][] moves, RubikObjectList list, Resources res, int screenWidth) |
| 107 | 107 |
{
|
| 108 | 108 |
super(nodeTexture,nodeEffects,nodeMesh); |
| src/main/java/org/distorted/objects/RubikObjectList.java | ||
|---|---|---|
| 23 | 23 |
|
| 24 | 24 |
import org.distorted.library.main.DistortedEffects; |
| 25 | 25 |
import org.distorted.library.main.DistortedTexture; |
| 26 |
import org.distorted.library.mesh.MeshRectangles;
|
|
| 26 |
import org.distorted.library.mesh.MeshSquare;
|
|
| 27 | 27 |
import org.distorted.library.type.Static4D; |
| 28 | 28 |
import org.distorted.main.R; |
| 29 | 29 |
import org.distorted.main.RubikActivity; |
| ... | ... | |
| 359 | 359 |
{
|
| 360 | 360 |
DistortedTexture texture = new DistortedTexture(); |
| 361 | 361 |
DistortedEffects effects = new DistortedEffects(); |
| 362 |
MeshRectangles mesh = new MeshRectangles(20,20); // mesh of the node, not of the cubits
|
|
| 362 |
MeshSquare mesh = new MeshSquare(20,20); // mesh of the node, not of the cubits
|
|
| 363 | 363 |
|
| 364 | 364 |
switch(ordinal()) |
| 365 | 365 |
{
|
| src/main/java/org/distorted/objects/RubikPyraminx.java | ||
|---|---|---|
| 32 | 32 |
import org.distorted.library.main.DistortedTexture; |
| 33 | 33 |
import org.distorted.library.mesh.MeshBase; |
| 34 | 34 |
import org.distorted.library.mesh.MeshJoined; |
| 35 |
import org.distorted.library.mesh.MeshRectangles;
|
|
| 36 |
import org.distorted.library.mesh.MeshTriangles;
|
|
| 35 |
import org.distorted.library.mesh.MeshSquare;
|
|
| 36 |
import org.distorted.library.mesh.MeshTriangle; |
|
| 37 | 37 |
import org.distorted.library.type.Static1D; |
| 38 | 38 |
import org.distorted.library.type.Static3D; |
| 39 | 39 |
import org.distorted.library.type.Static4D; |
| ... | ... | |
| 113 | 113 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 114 | 114 |
|
| 115 | 115 |
RubikPyraminx(int size, Static4D quat, DistortedTexture texture, |
| 116 |
MeshRectangles mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 116 |
MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth)
|
|
| 117 | 117 |
{
|
| 118 | 118 |
super(size, 30, quat, texture, mesh, effects, moves, RubikObjectList.PYRA, res, scrWidth); |
| 119 | 119 |
} |
| ... | ... | |
| 254 | 254 |
final int MESHES=4; |
| 255 | 255 |
|
| 256 | 256 |
int association = 1; |
| 257 |
MeshBase[] meshes = new MeshTriangles[MESHES];
|
|
| 257 |
MeshBase[] meshes = new MeshTriangle[MESHES]; |
|
| 258 | 258 |
|
| 259 |
meshes[0] = new MeshTriangles(9);
|
|
| 259 |
meshes[0] = new MeshTriangle(9); |
|
| 260 | 260 |
meshes[0].setEffectAssociation(0,association,0); |
| 261 | 261 |
|
| 262 | 262 |
for(int i=1; i<MESHES; i++) |
Also available in: Unified diff
Rename Meshes.