commit db8757215b2a489d966739917b69a9011bae9503 Author: Leszek Koltunski Date: Sun Mar 7 00:17:29 2021 +0100 Add Gigaminx dmesh. diff --git a/src/main/java/org/distorted/objects/ObjectList.java b/src/main/java/org/distorted/objects/ObjectList.java index 4053664c..c03edbc3 100644 --- a/src/main/java/org/distorted/objects/ObjectList.java +++ b/src/main/java/org/distorted/objects/ObjectList.java @@ -43,7 +43,8 @@ public enum ObjectList }, TwistyCube.class, new MovementCube(), - 0 + 0, + 60 ), PYRA ( @@ -54,7 +55,8 @@ public enum ObjectList }, TwistyPyraminx.class, new MovementPyraminx(), - 1 + 1, + 30 ), DIAM ( @@ -63,7 +65,8 @@ public enum ObjectList }, TwistyDiamond.class, new MovementDiamond(), - 1 + 1, + 60 ), DINO ( @@ -72,7 +75,8 @@ public enum ObjectList }, TwistyDino6.class, new MovementDino(), - 2 + 2, + 60 ), DIN4 ( @@ -81,7 +85,8 @@ public enum ObjectList }, TwistyDino4.class, new MovementDino(), - 2 + 2, + 60 ), REDI ( @@ -90,7 +95,8 @@ public enum ObjectList }, TwistyRedi.class, new MovementRedi(), - 2 + 2, + 60 ), HELI ( @@ -99,7 +105,8 @@ public enum ObjectList }, TwistyHelicopter.class, new MovementHelicopter(), - 2 + 2, + 60 ), SKEW ( @@ -109,7 +116,8 @@ public enum ObjectList }, TwistySkewb.class, new MovementSkewb(), - 3 + 3, + 60 ), IVY ( @@ -118,7 +126,8 @@ public enum ObjectList }, TwistyIvy.class, new MovementIvy(), - 3 + 3, + 60 ), REX ( @@ -127,7 +136,8 @@ public enum ObjectList }, TwistyRex.class, new MovementRex(), - 3 + 3, + 60 ), KILO ( @@ -136,7 +146,8 @@ public enum ObjectList }, TwistyKilominx.class, new MovementMinx(), - 4 + 4, + 30 ), MEGA ( @@ -146,7 +157,8 @@ public enum ObjectList }, TwistyMegaminx.class, new MovementMinx(), - 4 + 4, + 30 ), ; @@ -159,6 +171,7 @@ public enum ObjectList private final Class mObjectClass; private final Movement mObjectMovementClass; private final int mColumn, mNumSizes; + private final int mFOV; private static final ObjectList[] objects; private static int mNumAll; @@ -439,7 +452,7 @@ public enum ObjectList /////////////////////////////////////////////////////////////////////////////////////////////////// - ObjectList(int[][] info, Class object , Movement movement, int column) + ObjectList(int[][] info, Class object , Movement movement, int column, int fov) { mNumSizes = info.length; @@ -465,6 +478,7 @@ public enum ObjectList mObjectClass = object; mObjectMovementClass = movement; mColumn = column; + mFOV = fov; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -481,6 +495,13 @@ public enum ObjectList return mMaxLevels; } +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public int getFOV() + { + return mFOV; + } + /////////////////////////////////////////////////////////////////////////////////////////////////// public int[] getIconIDs() diff --git a/src/main/java/org/distorted/objects/TwistyCube.java b/src/main/java/org/distorted/objects/TwistyCube.java index 838556dd..b9deef7e 100644 --- a/src/main/java/org/distorted/objects/TwistyCube.java +++ b/src/main/java/org/distorted/objects/TwistyCube.java @@ -99,7 +99,7 @@ class TwistyCube extends TwistyObject TwistyCube(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth) { - super(size, size, 60, quat, texture, mesh, effects, moves, ObjectList.CUBE, res, scrWidth); + super(size, size, quat, texture, mesh, effects, moves, ObjectList.CUBE, res, scrWidth); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyDiamond.java b/src/main/java/org/distorted/objects/TwistyDiamond.java index 02cb7c66..faf29b0f 100644 --- a/src/main/java/org/distorted/objects/TwistyDiamond.java +++ b/src/main/java/org/distorted/objects/TwistyDiamond.java @@ -127,7 +127,7 @@ public class TwistyDiamond extends TwistyObject TwistyDiamond(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth) { - super(size, size, 60, quat, texture, mesh, effects, moves, ObjectList.DIAM, res, scrWidth); + super(size, size, quat, texture, mesh, effects, moves, ObjectList.DIAM, res, scrWidth); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyDino.java b/src/main/java/org/distorted/objects/TwistyDino.java index fc1edf59..f91f957c 100644 --- a/src/main/java/org/distorted/objects/TwistyDino.java +++ b/src/main/java/org/distorted/objects/TwistyDino.java @@ -97,7 +97,7 @@ public abstract class TwistyDino extends TwistyObject TwistyDino(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, DistortedEffects effects, int[][] moves, ObjectList obj, Resources res, int scrWidth) { - super(size, size, 60, quat, texture, mesh, effects, moves, obj, res, scrWidth); + super(size, size, quat, texture, mesh, effects, moves, obj, res, scrWidth); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyHelicopter.java b/src/main/java/org/distorted/objects/TwistyHelicopter.java index e873816f..5e449e4c 100644 --- a/src/main/java/org/distorted/objects/TwistyHelicopter.java +++ b/src/main/java/org/distorted/objects/TwistyHelicopter.java @@ -192,7 +192,7 @@ public class TwistyHelicopter extends TwistyObject TwistyHelicopter(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth) { - super(size, size, 60, quat, texture, mesh, effects, moves, ObjectList.HELI, res, scrWidth); + super(size, size, quat, texture, mesh, effects, moves, ObjectList.HELI, res, scrWidth); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyIvy.java b/src/main/java/org/distorted/objects/TwistyIvy.java index b341dc42..48767382 100644 --- a/src/main/java/org/distorted/objects/TwistyIvy.java +++ b/src/main/java/org/distorted/objects/TwistyIvy.java @@ -99,7 +99,7 @@ public class TwistyIvy extends TwistyObject TwistyIvy(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth) { - super(size, size, 60, quat, texture, mesh, effects, moves, ObjectList.IVY, res, scrWidth); + super(size, size, quat, texture, mesh, effects, moves, ObjectList.IVY, res, scrWidth); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyMinx.java b/src/main/java/org/distorted/objects/TwistyMinx.java index 6166e0fd..cd1a7c7c 100644 --- a/src/main/java/org/distorted/objects/TwistyMinx.java +++ b/src/main/java/org/distorted/objects/TwistyMinx.java @@ -213,7 +213,7 @@ abstract class TwistyMinx extends TwistyObject TwistyMinx(int numLayers, int realSize, Static4D quat, DistortedTexture texture, MeshSquare mesh, DistortedEffects effects, int[][] moves, ObjectList obj, Resources res, int scrWidth) { - super(numLayers, realSize, 30, quat, texture, mesh, effects, moves, obj, res, scrWidth); + super(numLayers, realSize, quat, texture, mesh, effects, moves, obj, res, scrWidth); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyObject.java b/src/main/java/org/distorted/objects/TwistyObject.java index 0003d33d..44e6d491 100644 --- a/src/main/java/org/distorted/objects/TwistyObject.java +++ b/src/main/java/org/distorted/objects/TwistyObject.java @@ -123,7 +123,7 @@ public abstract class TwistyObject extends DistortedNode /////////////////////////////////////////////////////////////////////////////////////////////////// - TwistyObject(int numLayers, int realSize, int fov, Static4D quat, DistortedTexture nodeTexture, MeshSquare nodeMesh, + TwistyObject(int numLayers, int realSize, Static4D quat, DistortedTexture nodeTexture, MeshSquare nodeMesh, DistortedEffects nodeEffects, int[][] moves, ObjectList list, Resources res, int screenWidth) { super(nodeTexture,nodeEffects,nodeMesh); @@ -205,7 +205,7 @@ public abstract class TwistyObject extends DistortedNode setupPosition(moves); - setProjection(fov, 0.1f); + setProjection( list.getFOV(), 0.1f); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyPyraminx.java b/src/main/java/org/distorted/objects/TwistyPyraminx.java index fb95a70f..818a463a 100644 --- a/src/main/java/org/distorted/objects/TwistyPyraminx.java +++ b/src/main/java/org/distorted/objects/TwistyPyraminx.java @@ -78,7 +78,7 @@ public class TwistyPyraminx extends TwistyObject TwistyPyraminx(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth) { - super(size, size, 30, quat, texture, mesh, effects, moves, ObjectList.PYRA, res, scrWidth); + super(size, size, quat, texture, mesh, effects, moves, ObjectList.PYRA, res, scrWidth); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyRedi.java b/src/main/java/org/distorted/objects/TwistyRedi.java index adf45e58..25a2a1a9 100644 --- a/src/main/java/org/distorted/objects/TwistyRedi.java +++ b/src/main/java/org/distorted/objects/TwistyRedi.java @@ -140,7 +140,7 @@ public class TwistyRedi extends TwistyObject TwistyRedi(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth) { - super(size, size, 60, quat, texture, mesh, effects, moves, ObjectList.REDI, res, scrWidth); + super(size, size, quat, texture, mesh, effects, moves, ObjectList.REDI, res, scrWidth); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistyRex.java b/src/main/java/org/distorted/objects/TwistyRex.java index 3f2c8392..1f61ade9 100644 --- a/src/main/java/org/distorted/objects/TwistyRex.java +++ b/src/main/java/org/distorted/objects/TwistyRex.java @@ -133,7 +133,7 @@ public class TwistyRex extends TwistyObject TwistyRex(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth) { - super(size, size, 60, quat, texture, mesh, effects, moves, ObjectList.REX, res, scrWidth); + super(size, size, quat, texture, mesh, effects, moves, ObjectList.REX, res, scrWidth); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/objects/TwistySkewb.java b/src/main/java/org/distorted/objects/TwistySkewb.java index 90bd6952..faf4472c 100644 --- a/src/main/java/org/distorted/objects/TwistySkewb.java +++ b/src/main/java/org/distorted/objects/TwistySkewb.java @@ -124,7 +124,7 @@ public class TwistySkewb extends TwistyObject TwistySkewb(int size, Static4D quat, DistortedTexture texture, MeshSquare mesh, DistortedEffects effects, int[][] moves, Resources res, int scrWidth) { - super(size, 2*size-2, 60, quat, texture, mesh, effects, moves, ObjectList.SKEW, res, scrWidth); + super(size, 2*size-2, quat, texture, mesh, effects, moves, ObjectList.SKEW, res, scrWidth); } ///////////////////////////////////////////////////////////////////////////////////////////////////