commit 67b2d57b3133cda906aabdef2ee657155ea03444 Author: Leszek Koltunski Date: Tue Apr 20 12:25:31 2021 +0200 Create new meshes. diff --git a/src/main/java/org/distorted/objects/ObjectList.java b/src/main/java/org/distorted/objects/ObjectList.java index ccd15951..4a4e0d43 100644 --- a/src/main/java/org/distorted/objects/ObjectList.java +++ b/src/main/java/org/distorted/objects/ObjectList.java @@ -61,7 +61,7 @@ public enum ObjectList DIAM ( new int[][] { - {2 , 10, R.raw.diamond, R.drawable.ui_small_diam, R.drawable.ui_medium_diam, R.drawable.ui_big_diam, R.drawable.ui_huge_diam} , + {2 , 10, R.raw.diam2, R.drawable.ui_small_diam, R.drawable.ui_medium_diam, R.drawable.ui_big_diam, R.drawable.ui_huge_diam} , }, TwistyDiamond.class, new MovementDiamond(), @@ -111,8 +111,8 @@ public enum ObjectList SKEW ( new int[][] { - {2 , 11, R.raw.skewb, R.drawable.ui_small_skewb, R.drawable.ui_medium_skewb, R.drawable.ui_big_skewb, R.drawable.ui_huge_skewb} , - {3 , 17, R.raw.skewm, R.drawable.ui_small_skewm, R.drawable.ui_medium_skewm, R.drawable.ui_big_skewm, R.drawable.ui_huge_skewm} , + {2 , 11, R.raw.skew2, R.drawable.ui_small_skewb, R.drawable.ui_medium_skewb, R.drawable.ui_big_skewb, R.drawable.ui_huge_skewb} , + {3 , 17, R.raw.skew3, R.drawable.ui_small_skewm, R.drawable.ui_medium_skewm, R.drawable.ui_big_skewm, R.drawable.ui_huge_skewm} , }, TwistySkewb.class, new MovementSkewb(), diff --git a/src/main/java/org/distorted/objects/TwistyCube.java b/src/main/java/org/distorted/objects/TwistyCube.java index f507bdab..0646a37f 100644 --- a/src/main/java/org/distorted/objects/TwistyCube.java +++ b/src/main/java/org/distorted/objects/TwistyCube.java @@ -145,16 +145,17 @@ class TwistyCube extends TwistyObject if( mMeshes[index]==null ) { int extraI, extraV, num; + float height; switch(numLayers) { - case 2 : num = 6; extraI = 2; extraV = 2; break; - case 3 : num = 5; extraI = 2; extraV = 2; break; - case 4 : num = 5; extraI = 1; extraV = 2; break; - default: num = 5; extraI = 1; extraV = 0; break; + case 2 : num = 6; extraI = 2; extraV = 2; height = 0.045f; break; + case 3 : num = 5; extraI = 2; extraV = 2; height = 0.045f; break; + case 4 : num = 5; extraI = 1; extraV = 1; height = 0.045f; break; + default: num = 5; extraI = 0; extraV = 0; height = 0.045f; break; } - float[][] bands = new float[][] { {0.038f,35,0.5f,0.7f,num,extraI,extraV} }; + float[][] bands = new float[][] { {height,35,0.5f,0.7f,num,extraI,extraV} }; int[] bandIndexes = new int[] { 0,0,0,0,0,0}; float[][] corners = new float[][] { {0.036f,0.12f} }; int[] cornerIndexes = new int[] { 0,0,0,0,0,0,0,0 }; diff --git a/src/main/java/org/distorted/objects/TwistyMinx.java b/src/main/java/org/distorted/objects/TwistyMinx.java index 4d98c6a6..30a9a151 100644 --- a/src/main/java/org/distorted/objects/TwistyMinx.java +++ b/src/main/java/org/distorted/objects/TwistyMinx.java @@ -389,7 +389,8 @@ abstract class TwistyMinx extends TwistyObject float A = (2*SQ3/3)*SIN54; float B = 0.4f; int N = numLayers==3 ? 5 : 3; - int E = numLayers==3 ? 4 : 1; + int E1= numLayers==3 ? 1 : 0; + int E2= numLayers==3 ? 3 : 0; double X = width*COS18*SIN_HALFD; double Y = width*SIN18; @@ -419,8 +420,8 @@ abstract class TwistyMinx extends TwistyObject float[][] bands = new float[][] { - {0.04f,34,0.3f,0.2f, N, 1, 1}, - {0.00f, 0,0.0f,0.0f, 2, 1, E} + {0.04f,34,0.3f,0.2f, N, 1, E1}, + {0.00f, 0,0.0f,0.0f, 2, 1, E2} }; int[] bandIndexes = new int[] { 0,0,0,1,1,1}; float[][] corners = new float[][] { {0.04f,0.10f} }; diff --git a/src/main/java/org/distorted/objects/TwistyObject.java b/src/main/java/org/distorted/objects/TwistyObject.java index 2d365bfb..c214827e 100644 --- a/src/main/java/org/distorted/objects/TwistyObject.java +++ b/src/main/java/org/distorted/objects/TwistyObject.java @@ -81,7 +81,7 @@ public abstract class TwistyObject extends DistortedNode private static final float MAX_SIZE_CHANGE = 1.35f; private static final float MIN_SIZE_CHANGE = 0.75f; - private static final boolean mCreateFromDMesh = false; + private static final boolean mCreateFromDMesh = true; private static final Static3D CENTER = new Static3D(0,0,0); private static final int POST_ROTATION_MILLISEC = 500; diff --git a/src/main/res/raw/cube2.dmesh b/src/main/res/raw/cube2.dmesh index 72de0b9f..fbebccf0 100644 Binary files a/src/main/res/raw/cube2.dmesh and b/src/main/res/raw/cube2.dmesh differ diff --git a/src/main/res/raw/cube3.dmesh b/src/main/res/raw/cube3.dmesh index 44ecfe37..ed588f7f 100644 Binary files a/src/main/res/raw/cube3.dmesh and b/src/main/res/raw/cube3.dmesh differ diff --git a/src/main/res/raw/cube4.dmesh b/src/main/res/raw/cube4.dmesh index 5875c697..935b0f80 100644 Binary files a/src/main/res/raw/cube4.dmesh and b/src/main/res/raw/cube4.dmesh differ diff --git a/src/main/res/raw/cube5.dmesh b/src/main/res/raw/cube5.dmesh index 7e1f9426..e8bb1492 100644 Binary files a/src/main/res/raw/cube5.dmesh and b/src/main/res/raw/cube5.dmesh differ diff --git a/src/main/res/raw/diamond.dmesh b/src/main/res/raw/diamond.dmesh deleted file mode 100644 index 0a2cb526..00000000 Binary files a/src/main/res/raw/diamond.dmesh and /dev/null differ diff --git a/src/main/res/raw/dino.dmesh b/src/main/res/raw/dino.dmesh index 82324eee..baa611be 100644 Binary files a/src/main/res/raw/dino.dmesh and b/src/main/res/raw/dino.dmesh differ diff --git a/src/main/res/raw/heli.dmesh b/src/main/res/raw/heli.dmesh index f3ee5b9b..cdc62102 100644 Binary files a/src/main/res/raw/heli.dmesh and b/src/main/res/raw/heli.dmesh differ diff --git a/src/main/res/raw/kilo3.dmesh b/src/main/res/raw/kilo3.dmesh index a487960a..8f257580 100644 Binary files a/src/main/res/raw/kilo3.dmesh and b/src/main/res/raw/kilo3.dmesh differ diff --git a/src/main/res/raw/kilo5.dmesh b/src/main/res/raw/kilo5.dmesh index 1cc8382a..a51c0fd1 100644 Binary files a/src/main/res/raw/kilo5.dmesh and b/src/main/res/raw/kilo5.dmesh differ diff --git a/src/main/res/raw/mega3.dmesh b/src/main/res/raw/mega3.dmesh index e9afac95..8f9930d7 100644 Binary files a/src/main/res/raw/mega3.dmesh and b/src/main/res/raw/mega3.dmesh differ diff --git a/src/main/res/raw/mega5.dmesh b/src/main/res/raw/mega5.dmesh index 70d5694a..0c4837b9 100644 Binary files a/src/main/res/raw/mega5.dmesh and b/src/main/res/raw/mega5.dmesh differ diff --git a/src/main/res/raw/pyra3.dmesh b/src/main/res/raw/pyra3.dmesh index 22c45a58..e536f7d2 100644 Binary files a/src/main/res/raw/pyra3.dmesh and b/src/main/res/raw/pyra3.dmesh differ diff --git a/src/main/res/raw/pyra4.dmesh b/src/main/res/raw/pyra4.dmesh index 45cac8d0..28066e15 100644 Binary files a/src/main/res/raw/pyra4.dmesh and b/src/main/res/raw/pyra4.dmesh differ diff --git a/src/main/res/raw/pyra5.dmesh b/src/main/res/raw/pyra5.dmesh index 3ffa0600..5ec717bb 100644 Binary files a/src/main/res/raw/pyra5.dmesh and b/src/main/res/raw/pyra5.dmesh differ diff --git a/src/main/res/raw/redi.dmesh b/src/main/res/raw/redi.dmesh index d4e2f9bc..359ffc5f 100644 Binary files a/src/main/res/raw/redi.dmesh and b/src/main/res/raw/redi.dmesh differ diff --git a/src/main/res/raw/skewb.dmesh b/src/main/res/raw/skewb.dmesh deleted file mode 100644 index d2b537c1..00000000 Binary files a/src/main/res/raw/skewb.dmesh and /dev/null differ diff --git a/src/main/res/raw/skewm.dmesh b/src/main/res/raw/skewm.dmesh deleted file mode 100644 index bfd84505..00000000 Binary files a/src/main/res/raw/skewm.dmesh and /dev/null differ