commit 7d8cc0295c9ea64d8006540b2a5407ee614bff32 Author: Leszek Koltunski Date: Sun Apr 18 22:20:25 2021 +0200 Simplify. diff --git a/src/main/java/org/distorted/objects/TwistyBandaged2Bar.java b/src/main/java/org/distorted/objects/TwistyBandaged2Bar.java index f3f7072f..2e87a4a5 100644 --- a/src/main/java/org/distorted/objects/TwistyBandaged2Bar.java +++ b/src/main/java/org/distorted/objects/TwistyBandaged2Bar.java @@ -59,33 +59,6 @@ class TwistyBandaged2Bar extends TwistyBandagedAbstract { 0.0f, -1.0f, -1.0f} }; - private final double[][] VERTICES_SMALL = new double[][] - { - { 0.5, 0.5, 0.5 }, - { 0.5, 0.5,-0.5 }, - { 0.5,-0.5, 0.5 }, - { 0.5,-0.5,-0.5 }, - {-0.5, 0.5, 0.5 }, - {-0.5, 0.5,-0.5 }, - {-0.5,-0.5, 0.5 }, - {-0.5,-0.5,-0.5 }, - }; - - private final double[][] VERTICES_BIG = new double[][] - { - // TODO - }; - - private final int[][] VERT_INDEXES = new int[][] - { - {2,3,1,0}, // counterclockwise! - {7,6,4,5}, - {4,0,1,5}, - {7,3,2,6}, - {6,2,0,4}, - {3,7,5,1} - }; - private static final int[] QUAT_INDICES = new int[] { 2 }; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -96,29 +69,6 @@ class TwistyBandaged2Bar extends TwistyBandagedAbstract super(size, quat, texture, mesh, effects, moves, ObjectList.BAN2, res, scrWidth); } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - double[][] getVertices(int cubitType) - { - if( cubitType==0 ) // Small cubit - { - return VERTICES_SMALL; - } - if( cubitType==1 ) // Big cubit - { - return VERTICES_BIG; - } - - return null; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - int[][] getVertIndexes(int cubitType) - { - return VERT_INDEXES; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// int getNumCubitTypes(int numLayers) diff --git a/src/main/java/org/distorted/objects/TwistyBandaged3Plate.java b/src/main/java/org/distorted/objects/TwistyBandaged3Plate.java index bfbca51b..86935225 100644 --- a/src/main/java/org/distorted/objects/TwistyBandaged3Plate.java +++ b/src/main/java/org/distorted/objects/TwistyBandaged3Plate.java @@ -95,33 +95,6 @@ class TwistyBandaged3Plate extends TwistyBandagedAbstract { 0.0f, 0.0f, -1.0f} }; - private final double[][] VERTICES_SMALL = new double[][] - { - { 0.5, 0.5, 0.5 }, - { 0.5, 0.5,-0.5 }, - { 0.5,-0.5, 0.5 }, - { 0.5,-0.5,-0.5 }, - {-0.5, 0.5, 0.5 }, - {-0.5, 0.5,-0.5 }, - {-0.5,-0.5, 0.5 }, - {-0.5,-0.5,-0.5 }, - }; - - private final double[][] VERTICES_BIG = new double[][] - { - // TODO - }; - - private final int[][] VERT_INDEXES = new int[][] - { - {2,3,1,0}, // counterclockwise! - {7,6,4,5}, - {4,0,1,5}, - {7,3,2,6}, - {6,2,0,4}, - {3,7,5,1} - }; - private static final int[] QUAT_INDICES = new int[] { 1, 3 }; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -132,36 +105,6 @@ class TwistyBandaged3Plate extends TwistyBandagedAbstract super(size, quat, texture, mesh, effects, moves, ObjectList.BAN3, res, scrWidth); } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - double[][] getVertices(int cubitType) - { - if( cubitType==0 ) // Small cubit - { - return VERTICES_SMALL; - } - if( cubitType==1 ) // Big cubit - { - return VERTICES_BIG; - } - - return null; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - int[][] getVertIndexes(int cubitType) - { - return VERT_INDEXES; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - int getNumCubitTypes(int numLayers) - { - return 2; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// float[][] getPositions() diff --git a/src/main/java/org/distorted/objects/TwistyBandagedEvil.java b/src/main/java/org/distorted/objects/TwistyBandagedEvil.java index 6baa6697..15297e3e 100644 --- a/src/main/java/org/distorted/objects/TwistyBandagedEvil.java +++ b/src/main/java/org/distorted/objects/TwistyBandagedEvil.java @@ -209,38 +209,6 @@ class TwistyBandagedEvil extends TwistyBandagedAbstract { 1.0f, -1.0f, -1.0f, 1.0f, 0.0f, -1.0f} }; - private final double[][] VERTICES_SMALL = new double[][] - { - { 0.5, 0.5, 0.5 }, - { 0.5, 0.5,-0.5 }, - { 0.5,-0.5, 0.5 }, - { 0.5,-0.5,-0.5 }, - {-0.5, 0.5, 0.5 }, - {-0.5, 0.5,-0.5 }, - {-0.5,-0.5, 0.5 }, - {-0.5,-0.5,-0.5 }, - }; - - private final double[][] VERTICES_MEDIUM = new double[][] - { - // TODO - }; - - private final double[][] VERTICES_BIG = new double[][] - { - // TODO - }; - - private final int[][] VERT_INDEXES = new int[][] - { - {2,3,1,0}, // counterclockwise! - {7,6,4,5}, - {4,0,1,5}, - {7,3,2,6}, - {6,2,0,4}, - {3,7,5,1} - }; - private static final int[] QUAT_INDICES = new int[] { 0, 1, 0, 0, 0, 2, 2, 2, 3, 3, 3, 3, 3 }; @@ -252,40 +220,6 @@ class TwistyBandagedEvil extends TwistyBandagedAbstract super(size, quat, texture, mesh, effects, moves, ObjectList.BAN4, res, scrWidth); } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - double[][] getVertices(int cubitType) - { - if( cubitType==0 ) // Small cubit - { - return VERTICES_SMALL; - } - if( cubitType==1 ) // Medium cubit - { - return VERTICES_MEDIUM; - } - if( cubitType==2 ) // Big cubit - { - return VERTICES_BIG; - } - - return null; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - int[][] getVertIndexes(int cubitType) - { - return VERT_INDEXES; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - int getNumCubitTypes(int numLayers) - { - return 3; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// float[][] getPositions() diff --git a/src/main/java/org/distorted/objects/TwistyBandagedFused.java b/src/main/java/org/distorted/objects/TwistyBandagedFused.java index cb9c0ebd..e034662e 100644 --- a/src/main/java/org/distorted/objects/TwistyBandagedFused.java +++ b/src/main/java/org/distorted/objects/TwistyBandagedFused.java @@ -64,33 +64,6 @@ class TwistyBandagedFused extends TwistyBandagedAbstract { 0.0f, 0.0f, -1.0f} }; - private final double[][] VERTICES_SMALL = new double[][] - { - { 0.5, 0.5, 0.5 }, - { 0.5, 0.5,-0.5 }, - { 0.5,-0.5, 0.5 }, - { 0.5,-0.5,-0.5 }, - {-0.5, 0.5, 0.5 }, - {-0.5, 0.5,-0.5 }, - {-0.5,-0.5, 0.5 }, - {-0.5,-0.5,-0.5 }, - }; - - private final double[][] VERTICES_BIG = new double[][] - { - // TODO - }; - - private final int[][] VERT_INDEXES = new int[][] - { - {2,3,1,0}, // counterclockwise! - {7,6,4,5}, - {4,0,1,5}, - {7,3,2,6}, - {6,2,0,4}, - {3,7,5,1} - }; - private static final int[] QUAT_INDICES = new int[] { 0 }; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -101,36 +74,6 @@ class TwistyBandagedFused extends TwistyBandagedAbstract super(size, quat, texture, mesh, effects, moves, ObjectList.BAN1, res, scrWidth); } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - double[][] getVertices(int cubitType) - { - if( cubitType==0 ) // Small cubit - { - return VERTICES_SMALL; - } - if( cubitType==1 ) // Big cubit - { - return VERTICES_BIG; - } - - return null; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - int[][] getVertIndexes(int cubitType) - { - return VERT_INDEXES; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - int getNumCubitTypes(int numLayers) - { - return 2; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// float[][] getPositions() diff --git a/src/main/java/org/distorted/objects/TwistyCube.java b/src/main/java/org/distorted/objects/TwistyCube.java index a9e3e564..f507bdab 100644 --- a/src/main/java/org/distorted/objects/TwistyCube.java +++ b/src/main/java/org/distorted/objects/TwistyCube.java @@ -128,28 +128,6 @@ class TwistyCube extends TwistyObject super(size, size, quat, texture, mesh, effects, moves, ObjectList.CUBE, res, scrWidth); } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - double[][] getVertices(int cubitType) - { - return VERTICES; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - int[][] getVertIndexes(int cubitType) - { - return VERT_INDEXES; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// in the sense of shape, there's always only 1 cubit type. - - int getNumCubitTypes(int numLayers) - { - return 1; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// MeshBase createCubitMesh(int cubit, int numLayers) diff --git a/src/main/java/org/distorted/objects/TwistyDiamond.java b/src/main/java/org/distorted/objects/TwistyDiamond.java index 4ec4cb21..f29b1997 100644 --- a/src/main/java/org/distorted/objects/TwistyDiamond.java +++ b/src/main/java/org/distorted/objects/TwistyDiamond.java @@ -146,31 +146,6 @@ public class TwistyDiamond extends TwistyObject super(size, size, quat, texture, mesh, effects, moves, ObjectList.DIAM, res, scrWidth); } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - double[][] getVertices(int cubitType) - { - if( cubitType==0 ) return VERTICES_OCTA; - if( cubitType==1 ) return VERTICES_TETRA; - return null; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - int[][] getVertIndexes(int cubitType) - { - if( cubitType==0 ) return VERT_INDEXES_OCTA; - if( cubitType==1 ) return VERT_INDEXES_TETRA; - return null; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - int getNumCubitTypes(int numLayers) - { - return 2; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// float getScreenRatio() diff --git a/src/main/java/org/distorted/objects/TwistyDino.java b/src/main/java/org/distorted/objects/TwistyDino.java index 98808bf6..5a4c2eb9 100644 --- a/src/main/java/org/distorted/objects/TwistyDino.java +++ b/src/main/java/org/distorted/objects/TwistyDino.java @@ -118,27 +118,6 @@ public abstract class TwistyDino extends TwistyObject super(size, size, quat, texture, mesh, effects, moves, obj, res, scrWidth); } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - double[][] getVertices(int cubitType) - { - return VERTICES; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - int[][] getVertIndexes(int cubitType) - { - return VERT_INDEXES; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - int getNumCubitTypes(int numLayers) - { - return 1; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// float getScreenRatio() diff --git a/src/main/java/org/distorted/objects/TwistyHelicopter.java b/src/main/java/org/distorted/objects/TwistyHelicopter.java index 9b0e3b6b..eb5baf69 100644 --- a/src/main/java/org/distorted/objects/TwistyHelicopter.java +++ b/src/main/java/org/distorted/objects/TwistyHelicopter.java @@ -234,33 +234,6 @@ public class TwistyHelicopter extends TwistyObject MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth) { super(size, size, quat, texture, mesh, effects, moves, ObjectList.HELI, res, scrWidth); - - createFaceDataStructures(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - double[][] getVertices(int cubitType) - { - if( cubitType==0 ) return VERTICES_CORNER; - if( cubitType==1 ) return VERTICES_FACE; - return null; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - int[][] getVertIndexes(int cubitType) - { - if( cubitType==0 ) return VERT_INDEXES_CORNER; - if( cubitType==1 ) return VERT_INDEXES_FACE; - return null; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - int getNumCubitTypes(int numLayers) - { - return 2; } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyIvy.java b/src/main/java/org/distorted/objects/TwistyIvy.java index 4cff4ca1..11269b32 100644 --- a/src/main/java/org/distorted/objects/TwistyIvy.java +++ b/src/main/java/org/distorted/objects/TwistyIvy.java @@ -101,29 +101,6 @@ public class TwistyIvy extends TwistyObject super(size, size, quat, texture, mesh, effects, moves, ObjectList.IVY, res, scrWidth); } -/////////////////////////////////////////////////////////////////////////////////////////////////// -// don't use this - - double[][] getVertices(int cubitType) - { - return null; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// don't use this - - int[][] getVertIndexes(int cubitType) - { - return null; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - int getNumCubitTypes(int numLayers) - { - return 2; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// float getScreenRatio() diff --git a/src/main/java/org/distorted/objects/TwistyKilominx.java b/src/main/java/org/distorted/objects/TwistyKilominx.java index 10ac8363..34befa71 100644 --- a/src/main/java/org/distorted/objects/TwistyKilominx.java +++ b/src/main/java/org/distorted/objects/TwistyKilominx.java @@ -80,30 +80,6 @@ public class TwistyKilominx extends TwistyMinx super(size, size, quat, texture, mesh, effects, moves, ObjectList.KILO, res, scrWidth); } -/////////////////////////////////////////////////////////////////////////////////////////////////// -// TODO - - double[][] getVertices(int cubitType) - { - return null; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// TODO - - int[][] getVertIndexes(int cubitType) - { - return null; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// 3 --> 1, 5 --> 4, 7 --> 5, 9 --> 6 - - int getNumCubitTypes(int numLayers) - { - return numLayers==3 ? 1 : 2 + numLayers/2; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// private int numCubitsPerCorner(int numLayers) diff --git a/src/main/java/org/distorted/objects/TwistyMegaminx.java b/src/main/java/org/distorted/objects/TwistyMegaminx.java index e741082a..66372391 100644 --- a/src/main/java/org/distorted/objects/TwistyMegaminx.java +++ b/src/main/java/org/distorted/objects/TwistyMegaminx.java @@ -62,30 +62,6 @@ public class TwistyMegaminx extends TwistyMinx super(size, size, quat, texture, mesh, effects, moves, ObjectList.MEGA, res, scrWidth); } -/////////////////////////////////////////////////////////////////////////////////////////////////// -// TODO - - double[][] getVertices(int cubitType) - { - return null; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// TODO - - int[][] getVertIndexes(int cubitType) - { - return null; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// 3 --> 3, 5 --> 4, 7 --> 5, 9 --> 6 - - int getNumCubitTypes(int numLayers) - { - return 2 + numLayers/2; - } - /////////////////////////////////////////////////////////////////////////////////////////////////// private int numCubitsPerCorner(int numLayers) diff --git a/src/main/java/org/distorted/objects/TwistyObject.java b/src/main/java/org/distorted/objects/TwistyObject.java index 7a469099..2d365bfb 100644 --- a/src/main/java/org/distorted/objects/TwistyObject.java +++ b/src/main/java/org/distorted/objects/TwistyObject.java @@ -549,16 +549,16 @@ public abstract class TwistyObject extends DistortedNode /////////////////////////////////////////////////////////////////////////////////////////////////// // create StickerCoord and FaceTransform data structures - void createFaceDataStructures() + void createFaceDataStructures(double[][][] verts, int[][][] indices) { - int numCubitTypes = getNumCubitTypes(mNumLayers); + int numCubitTypes = verts.length; FactoryCubit factory = FactoryCubit.getInstance(); factory.clear(); for(int cubit=0; cubit