commit 1e6fb03494e08cf3fd09a468ddace300f76837a7 Author: Leszek Koltunski Date: Fri Jan 29 11:39:08 2021 +0100 Megaminx mesh. diff --git a/src/main/java/org/distorted/objects/ObjectList.java b/src/main/java/org/distorted/objects/ObjectList.java index d97f9d6e..41029cf0 100644 --- a/src/main/java/org/distorted/objects/ObjectList.java +++ b/src/main/java/org/distorted/objects/ObjectList.java @@ -141,8 +141,8 @@ public enum ObjectList MEGA ( new int[][] { - {3 , 21, R.raw.kilo3, R.drawable.ui_small_mega3, R.drawable.ui_medium_mega3, R.drawable.ui_big_mega3, R.drawable.ui_huge_mega3} , - {5 , 25, R.raw.kilo3, R.drawable.ui_small_mega5, R.drawable.ui_medium_mega5, R.drawable.ui_big_mega5, R.drawable.ui_huge_mega5} , + {3 , 21, R.raw.mega3, R.drawable.ui_small_mega3, R.drawable.ui_medium_mega3, R.drawable.ui_big_mega3, R.drawable.ui_huge_mega3} , + // {5 , 25, R.raw.kilo3, R.drawable.ui_small_mega5, R.drawable.ui_medium_mega5, R.drawable.ui_big_mega5, R.drawable.ui_huge_mega5} , }, TwistyMegaminx.class, new MovementMinx(), diff --git a/src/main/java/org/distorted/objects/TwistyObject.java b/src/main/java/org/distorted/objects/TwistyObject.java index a43b2710..5eac8f87 100644 --- a/src/main/java/org/distorted/objects/TwistyObject.java +++ b/src/main/java/org/distorted/objects/TwistyObject.java @@ -79,7 +79,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/mega3.dmesh b/src/main/res/raw/mega3.dmesh new file mode 100644 index 00000000..e9afac95 Binary files /dev/null and b/src/main/res/raw/mega3.dmesh differ