commit 584f7954c08fb87d096ea5c03d5f8752e4153c53 Author: Leszek Koltunski Date: Fri May 17 00:34:25 2019 +0100 - adjust SizeChangeEffects - implement first two UnscrambleEffects diff --git a/src/main/java/org/distorted/effect/AppearEffect.java b/src/main/java/org/distorted/effect/AppearEffect.java deleted file mode 100644 index a095306b..00000000 --- a/src/main/java/org/distorted/effect/AppearEffect.java +++ /dev/null @@ -1,210 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2019 Leszek Koltunski // -// // -// This file is part of Distorted. // -// // -// Distorted is free software: you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation, either version 2 of the License, or // -// (at your option) any later version. // -// // -// Distorted is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // -/////////////////////////////////////////////////////////////////////////////////////////////////// - -package org.distorted.effect; - -import org.distorted.library.effect.Effect; -import org.distorted.library.main.DistortedEffects; -import org.distorted.library.main.DistortedScreen; -import org.distorted.library.message.EffectListener; -import org.distorted.magic.RubikCube; - -import java.lang.reflect.Method; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public abstract class AppearEffect implements EffectListener - { - public enum Type - { - NONE (AppearEffectNone.class ), - TRANSPARENCY (AppearEffectTransparency.class), - MOVE (AppearEffectMove.class ), - ROUND (AppearEffectRound.class ), - SCALE (AppearEffectScale.class ), - ; - - private final Class effectClass; - - Type(Class effectClass) - { - this.effectClass = effectClass; - } - } - - public static final int NUM_EFFECTS = Type.values().length; - private static final Type[] types; - - static - { - int i=0; - - types = new Type[NUM_EFFECTS]; - - for(Type type: Type.values()) - { - types[i] = type; - i++; - } - } - - private final int FAKE_EFFECT_ID = -1; - - private EffectListener mListener; - private RubikCube mCube; - private int mCubeEffectNumber, mNodeEffectNumber, mEffectFinished, mEffectReturned; - - DistortedScreen mScreen; - Effect[] mCubeEffects; - int[] mCubeEffectPosition; - Effect[] mNodeEffects; - int[] mNodeEffectPosition; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - AppearEffect() - { - mEffectReturned = 0; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - abstract int createEffects(int duration); - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static Type getType(int ordinal) - { - return types[ordinal]; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void effectFinished(final long effectID) - { - for(int i=0; i cls = type.effectClass; - - try - { - method = cls.getMethod("enable"); - } - catch(NoSuchMethodException ex) - { - android.util.Log.e("AppearEffect", "exception getting method: "+ex.getMessage()); - } - - try - { - method.invoke(null); - } - catch(Exception ex) - { - android.util.Log.e("AppearEffect", "exception invoking method: "+ex.getMessage()); - } - } - } - } diff --git a/src/main/java/org/distorted/effect/AppearEffectMove.java b/src/main/java/org/distorted/effect/AppearEffectMove.java deleted file mode 100644 index 06e00be3..00000000 --- a/src/main/java/org/distorted/effect/AppearEffectMove.java +++ /dev/null @@ -1,58 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2019 Leszek Koltunski // -// // -// This file is part of Distorted. // -// // -// Distorted is free software: you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation, either version 2 of the License, or // -// (at your option) any later version. // -// // -// Distorted is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // -/////////////////////////////////////////////////////////////////////////////////////////////////// - -package org.distorted.effect; - -import org.distorted.library.effect.Effect; -import org.distorted.library.effect.MatrixEffectMove; -import org.distorted.library.type.Dynamic3D; -import org.distorted.library.type.Static3D; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class AppearEffectMove extends AppearEffect - { - public int createEffects(int duration) - { - int w = mScreen.getWidth(); - int h = mScreen.getHeight(); - int xmove = w/2 + (w. // -/////////////////////////////////////////////////////////////////////////////////////////////////// - -package org.distorted.effect; - -import org.distorted.library.effect.Effect; -import org.distorted.library.effect.MatrixEffectMove; -import org.distorted.library.type.Dynamic3D; -import org.distorted.library.type.Static3D; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class AppearEffectNone extends AppearEffect - { - public int createEffects(int duration) - { - mCubeEffectPosition = new int[] {-1}; - mCubeEffects = new Effect[mCubeEffectPosition.length]; - - Dynamic3D d0 = new Dynamic3D(1,0.5f); - d0.add(new Static3D(0,0,0)); - mCubeEffects[0] = new MatrixEffectMove(d0); - - return 1; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// enable all effects used in this Appear (here: none). Called by reflection from the parent class. - - @SuppressWarnings("unused") - static void enable() - { - - } - } diff --git a/src/main/java/org/distorted/effect/AppearEffectRound.java b/src/main/java/org/distorted/effect/AppearEffectRound.java deleted file mode 100644 index 00bf0289..00000000 --- a/src/main/java/org/distorted/effect/AppearEffectRound.java +++ /dev/null @@ -1,67 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2019 Leszek Koltunski // -// // -// This file is part of Distorted. // -// // -// Distorted is free software: you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation, either version 2 of the License, or // -// (at your option) any later version. // -// // -// Distorted is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // -/////////////////////////////////////////////////////////////////////////////////////////////////// - -package org.distorted.effect; - -import org.distorted.library.effect.Effect; -import org.distorted.library.effect.MatrixEffectMove; -import org.distorted.library.effect.MatrixEffectScale; -import org.distorted.library.type.Dynamic; -import org.distorted.library.type.Dynamic3D; -import org.distorted.library.type.Static3D; - -import static org.distorted.magic.RubikRenderer.TEXTURE_SIZE; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class AppearEffectRound extends AppearEffect - { - public int createEffects(int duration) - { - float X = TEXTURE_SIZE/3; - - mCubeEffectPosition = new int[] {6,7}; - mCubeEffects = new Effect[mCubeEffectPosition.length]; - - Dynamic3D d0 = new Dynamic3D(duration, 0.5f); - d0.add(new Static3D( 0.01f, 0.01f, 0.01f)); - d0.add(new Static3D( 1.00f, 1.00f, 1.00f)); - mCubeEffects[0] = new MatrixEffectScale(d0); - - Dynamic3D d1 = new Dynamic3D(duration, 0.5f); - d1.setMode(Dynamic.MODE_PATH); - d1.add(new Static3D( 0, 0, 0)); - d1.add(new Static3D(-X, 0, 0)); - d1.add(new Static3D( 0, 0, 0)); - mCubeEffects[1] = new MatrixEffectMove(d1); - - return 2; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Enable all effects used in this Appear. Called by reflection from the parent class. -// Matrix Effects do not have to be enabled. - - @SuppressWarnings("unused") - static void enable() - { - - } - } - diff --git a/src/main/java/org/distorted/effect/AppearEffectScale.java b/src/main/java/org/distorted/effect/AppearEffectScale.java deleted file mode 100644 index 40add6bd..00000000 --- a/src/main/java/org/distorted/effect/AppearEffectScale.java +++ /dev/null @@ -1,54 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2019 Leszek Koltunski // -// // -// This file is part of Distorted. // -// // -// Distorted is free software: you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation, either version 2 of the License, or // -// (at your option) any later version. // -// // -// Distorted is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // -/////////////////////////////////////////////////////////////////////////////////////////////////// - -package org.distorted.effect; - -import org.distorted.library.effect.Effect; -import org.distorted.library.effect.MatrixEffectScale; -import org.distorted.library.type.Dynamic3D; -import org.distorted.library.type.Static3D; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class AppearEffectScale extends AppearEffect - { - public int createEffects(int duration) - { - mCubeEffectPosition = new int[] {6}; - mCubeEffects = new Effect[mCubeEffectPosition.length]; - - Dynamic3D d0 = new Dynamic3D(duration, 0.5f); - d0.add(new Static3D(0.01f, 0.01f, 0.01f)); - d0.add(new Static3D(1.00f, 1.00f, 1.00f)); - mCubeEffects[0] = new MatrixEffectScale(d0); - - return 1; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Enable all effects used in this Appear. Called by reflection from the parent class. -// Matrix Effects do not have to be enabled. - - @SuppressWarnings("unused") - static void enable() - { - - } - } - diff --git a/src/main/java/org/distorted/effect/AppearEffectTransparency.java b/src/main/java/org/distorted/effect/AppearEffectTransparency.java deleted file mode 100644 index 680c0886..00000000 --- a/src/main/java/org/distorted/effect/AppearEffectTransparency.java +++ /dev/null @@ -1,78 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2019 Leszek Koltunski // -// // -// This file is part of Distorted. // -// // -// Distorted is free software: you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation, either version 2 of the License, or // -// (at your option) any later version. // -// // -// Distorted is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // -/////////////////////////////////////////////////////////////////////////////////////////////////// - -package org.distorted.effect; - -import org.distorted.library.effect.Effect; -import org.distorted.library.effect.FragmentEffectAlpha; -import org.distorted.library.effect.VertexEffectWave; -import org.distorted.library.type.Dynamic1D; -import org.distorted.library.type.Dynamic5D; -import org.distorted.library.type.Static1D; -import org.distorted.library.type.Static3D; -import org.distorted.library.type.Static5D; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class AppearEffectTransparency extends AppearEffect - { - public int createEffects(int duration) - { - mCubeEffectPosition = new int[] {-1}; - mCubeEffects = new Effect[mCubeEffectPosition.length]; - - Dynamic1D d0 = new Dynamic1D(duration, 0.5f); - d0.add(new Static1D(0.0f)); - d0.add(new Static1D(1.0f)); - mCubeEffects[0] = new FragmentEffectAlpha(d0); - - mNodeEffectPosition = new int[] {-1}; - mNodeEffects = new Effect[mNodeEffectPosition.length]; - - int w = mScreen.getWidth(); - int h = mScreen.getHeight(); - int min = w. // -/////////////////////////////////////////////////////////////////////////////////////////////////// - -package org.distorted.effect; - -import org.distorted.library.effect.Effect; -import org.distorted.library.main.DistortedEffects; -import org.distorted.library.main.DistortedScreen; -import org.distorted.library.message.EffectListener; -import org.distorted.magic.RubikCube; - -import java.lang.reflect.Method; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public abstract class DisappearEffect implements EffectListener - { - public enum Type - { - NONE (DisappearEffectNone.class ), - TRANSPARENCY (DisappearEffectTransparency.class), - MOVE (DisappearEffectMove.class ), - ROUND (DisappearEffectRound.class ), - SCALE (DisappearEffectScale.class ), - ; - - private final Class effectClass; - - Type(Class effectClass) - { - this.effectClass = effectClass; - } - } - - public static final int NUM_EFFECTS = Type.values().length; - private static final Type[] types; - - static - { - int i=0; - - types = new Type[NUM_EFFECTS]; - - for(Type type: Type.values()) - { - types[i] = type; - i++; - } - } - - private final int FAKE_EFFECT_ID = -2; - - private EffectListener mListener; - private RubikCube mCube; - private int mCubeEffectNumber, mNodeEffectNumber, mEffectFinished, mEffectReturned; - - DistortedScreen mScreen; - Effect[] mCubeEffects; - int[] mCubeEffectPosition; - Effect[] mNodeEffects; - int[] mNodeEffectPosition; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - DisappearEffect() - { - mEffectReturned = 0; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - abstract int createEffects(int duration); - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public static Type getType(int ordinal) - { - return types[ordinal]; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void effectFinished(final long effectID) - { - for(int i=0; i cls = type.effectClass; - - try - { - method = cls.getMethod("enable"); - } - catch(NoSuchMethodException ex) - { - android.util.Log.e("DisappearEffect", "exception getting method: "+ex.getMessage()); - } - - try - { - method.invoke(null); - } - catch(Exception ex) - { - android.util.Log.e("DisappearEffect", "exception invoking method: "+ex.getMessage()); - } - } - } - } diff --git a/src/main/java/org/distorted/effect/DisappearEffectMove.java b/src/main/java/org/distorted/effect/DisappearEffectMove.java deleted file mode 100644 index 6f97b879..00000000 --- a/src/main/java/org/distorted/effect/DisappearEffectMove.java +++ /dev/null @@ -1,58 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2019 Leszek Koltunski // -// // -// This file is part of Distorted. // -// // -// Distorted is free software: you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation, either version 2 of the License, or // -// (at your option) any later version. // -// // -// Distorted is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // -/////////////////////////////////////////////////////////////////////////////////////////////////// - -package org.distorted.effect; - -import org.distorted.library.effect.Effect; -import org.distorted.library.effect.MatrixEffectMove; -import org.distorted.library.type.Dynamic3D; -import org.distorted.library.type.Static3D; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class DisappearEffectMove extends DisappearEffect - { - public int createEffects(int duration) - { - int w = mScreen.getWidth(); - int h = mScreen.getHeight(); - int xmove = w/2 + (w. // -/////////////////////////////////////////////////////////////////////////////////////////////////// - -package org.distorted.effect; - -import org.distorted.library.effect.Effect; -import org.distorted.library.effect.MatrixEffectMove; -import org.distorted.library.type.Dynamic3D; -import org.distorted.library.type.Static3D; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class DisappearEffectNone extends DisappearEffect - { - public int createEffects(int duration) - { - mCubeEffectPosition = new int[] {-1}; - mCubeEffects = new Effect[mCubeEffectPosition.length]; - - Dynamic3D d0 = new Dynamic3D(1,0.5f); - d0.add(new Static3D(0,0,0)); - mCubeEffects[0] = new MatrixEffectMove(d0); - - return 1; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// enable all effects used in this Appear (here: none). Called by reflection from the parent class. - - @SuppressWarnings("unused") - static void enable() - { - - } - } diff --git a/src/main/java/org/distorted/effect/DisappearEffectRound.java b/src/main/java/org/distorted/effect/DisappearEffectRound.java deleted file mode 100644 index bf391f75..00000000 --- a/src/main/java/org/distorted/effect/DisappearEffectRound.java +++ /dev/null @@ -1,67 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2019 Leszek Koltunski // -// // -// This file is part of Distorted. // -// // -// Distorted is free software: you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation, either version 2 of the License, or // -// (at your option) any later version. // -// // -// Distorted is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // -/////////////////////////////////////////////////////////////////////////////////////////////////// - -package org.distorted.effect; - -import org.distorted.library.effect.Effect; -import org.distorted.library.effect.MatrixEffectMove; -import org.distorted.library.effect.MatrixEffectScale; -import org.distorted.library.type.Dynamic; -import org.distorted.library.type.Dynamic3D; -import org.distorted.library.type.Static3D; - -import static org.distorted.magic.RubikRenderer.TEXTURE_SIZE; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class DisappearEffectRound extends DisappearEffect - { - public int createEffects(int duration) - { - float X = TEXTURE_SIZE/3; - - mCubeEffectPosition = new int[] {6,7}; - mCubeEffects = new Effect[mCubeEffectPosition.length]; - - Dynamic3D d0 = new Dynamic3D(duration, 0.5f); - d0.add(new Static3D( 1.00f, 1.00f, 1.00f)); - d0.add(new Static3D( 0.01f, 0.01f, 0.01f)); - mCubeEffects[0] = new MatrixEffectScale(d0); - - Dynamic3D d1 = new Dynamic3D(duration, 0.5f); - d1.setMode(Dynamic.MODE_PATH); - d1.add(new Static3D( 0, 0, 0)); - d1.add(new Static3D(+X, 0, 0)); - d1.add(new Static3D( 0, 0, 0)); - mCubeEffects[1] = new MatrixEffectMove(d1); - - return 2; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Enable all effects used in this Appear. Called by reflection from the parent class. -// Matrix Effects do not have to be enabled. - - @SuppressWarnings("unused") - static void enable() - { - - } - } - diff --git a/src/main/java/org/distorted/effect/DisappearEffectScale.java b/src/main/java/org/distorted/effect/DisappearEffectScale.java deleted file mode 100644 index 6b6bc3e8..00000000 --- a/src/main/java/org/distorted/effect/DisappearEffectScale.java +++ /dev/null @@ -1,54 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2019 Leszek Koltunski // -// // -// This file is part of Distorted. // -// // -// Distorted is free software: you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation, either version 2 of the License, or // -// (at your option) any later version. // -// // -// Distorted is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // -/////////////////////////////////////////////////////////////////////////////////////////////////// - -package org.distorted.effect; - -import org.distorted.library.effect.Effect; -import org.distorted.library.effect.MatrixEffectScale; -import org.distorted.library.type.Dynamic3D; -import org.distorted.library.type.Static3D; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class DisappearEffectScale extends DisappearEffect - { - public int createEffects(int duration) - { - mCubeEffectPosition = new int[] {6}; - mCubeEffects = new Effect[mCubeEffectPosition.length]; - - Dynamic3D d0 = new Dynamic3D(duration, 0.5f); - d0.add(new Static3D(1.00f, 1.00f, 1.00f)); - d0.add(new Static3D(0.01f, 0.01f, 0.01f)); - mCubeEffects[0] = new MatrixEffectScale(d0); - - return 1; - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Enable all effects used in this Appear. Called by reflection from the parent class. -// Matrix Effects do not have to be enabled. - - @SuppressWarnings("unused") - static void enable() - { - - } - } - diff --git a/src/main/java/org/distorted/effect/DisappearEffectTransparency.java b/src/main/java/org/distorted/effect/DisappearEffectTransparency.java deleted file mode 100644 index 6ccd85dc..00000000 --- a/src/main/java/org/distorted/effect/DisappearEffectTransparency.java +++ /dev/null @@ -1,78 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2019 Leszek Koltunski // -// // -// This file is part of Distorted. // -// // -// Distorted is free software: you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation, either version 2 of the License, or // -// (at your option) any later version. // -// // -// Distorted is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // -/////////////////////////////////////////////////////////////////////////////////////////////////// - -package org.distorted.effect; - -import org.distorted.library.effect.Effect; -import org.distorted.library.effect.FragmentEffectAlpha; -import org.distorted.library.effect.VertexEffectWave; -import org.distorted.library.type.Dynamic1D; -import org.distorted.library.type.Dynamic5D; -import org.distorted.library.type.Static1D; -import org.distorted.library.type.Static3D; -import org.distorted.library.type.Static5D; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -class DisappearEffectTransparency extends DisappearEffect - { - public int createEffects(int duration) - { - mCubeEffectPosition = new int[] {-1}; - mCubeEffects = new Effect[mCubeEffectPosition.length]; - - Dynamic1D d0 = new Dynamic1D(duration, 0.5f); - d0.add(new Static1D(1.0f)); - d0.add(new Static1D(0.0f)); - mCubeEffects[0] = new FragmentEffectAlpha(d0); - - mNodeEffectPosition = new int[] {-1}; - mNodeEffects = new Effect[mNodeEffectPosition.length]; - - int w = mScreen.getWidth(); - int h = mScreen.getHeight(); - int min = w. // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.effect; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +import org.distorted.library.effect.Effect; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedScreen; +import org.distorted.library.message.EffectListener; +import org.distorted.magic.RubikCube; + +import java.lang.reflect.Method; + +public abstract class SizeChangeEffect implements EffectListener +{ + public enum Type + { + NONE (SizeChangeEffectAppearNone.class , SizeChangeEffectDisappearNone.class ), + TRANSPARENCY (SizeChangeEffectAppearTransparency.class, SizeChangeEffectDisappearTransparency.class), + MOVE (SizeChangeEffectAppearMove.class , SizeChangeEffectDisappearMove.class ), + ROUND (SizeChangeEffectAppearRound.class , SizeChangeEffectDisappearRound.class ), + SCALE (SizeChangeEffectAppearScale.class , SizeChangeEffectDisappearScale.class ), + ; + + final Class appear; + final Class disappear; + + Type(Class appear, Class disappear ) + { + this.appear = appear; + this.disappear = disappear; + } + } + + private static int NUM_EFFECTS = Type.values().length; + private static final Type[] types; + + static + { + int i=0; + types = new Type[NUM_EFFECTS]; + + for(Type type: Type.values()) + { + types[i++] = type; + } + } + + private EffectListener mListener; + private int mCubeEffectNumber, mNodeEffectNumber, mEffectFinished, mEffectReturned; + private int mFakeEffectID; + + RubikCube mCube; + DistortedScreen mScreen; + Effect[] mCubeEffects; + int[] mCubeEffectPosition; + Effect[] mNodeEffects; + int[] mNodeEffectPosition; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + SizeChangeEffect(int id) + { + mEffectReturned = 0; + mFakeEffectID = id; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static Type getType(int index) + { + return types[index]; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static String[] getNames() + { + String[] names = new String[NUM_EFFECTS]; + + for( int i=0; i. // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.effect; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public abstract class SizeChangeEffectAppear extends SizeChangeEffect + { + SizeChangeEffectAppear() + { + super(-1); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static SizeChangeEffectAppear create(Type type) throws InstantiationException, IllegalAccessException + { + return type.appear.newInstance(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + void effectsEnd() + { + + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + void startEnd() + { + mScreen.attach(mCube); + } + } diff --git a/src/main/java/org/distorted/effect/SizeChangeEffectAppearMove.java b/src/main/java/org/distorted/effect/SizeChangeEffectAppearMove.java new file mode 100644 index 00000000..bbb9cc33 --- /dev/null +++ b/src/main/java/org/distorted/effect/SizeChangeEffectAppearMove.java @@ -0,0 +1,58 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2019 Leszek Koltunski // +// // +// This file is part of Distorted. // +// // +// Distorted is free software: you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation, either version 2 of the License, or // +// (at your option) any later version. // +// // +// Distorted is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with Distorted. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.effect; + +import org.distorted.library.effect.Effect; +import org.distorted.library.effect.MatrixEffectMove; +import org.distorted.library.type.Dynamic3D; +import org.distorted.library.type.Static3D; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class SizeChangeEffectAppearMove extends SizeChangeEffectAppear + { + public int createEffects(int duration) + { + int w = mScreen.getWidth(); + int h = mScreen.getHeight(); + int xmove = w/2 + (w. // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.effect; + +import org.distorted.library.effect.Effect; +import org.distorted.library.effect.MatrixEffectMove; +import org.distorted.library.type.Dynamic3D; +import org.distorted.library.type.Static3D; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class SizeChangeEffectAppearNone extends SizeChangeEffectAppear + { + public int createEffects(int duration) + { + mCubeEffectPosition = new int[] {-1}; + mCubeEffects = new Effect[mCubeEffectPosition.length]; + + Dynamic3D d0 = new Dynamic3D(1,0.5f); + d0.add(new Static3D(0,0,0)); + mCubeEffects[0] = new MatrixEffectMove(d0); + + return 1; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// enable all effects used in this Appear (here: none). Called by reflection from the parent class. + + @SuppressWarnings("unused") + static void enable() + { + + } + } diff --git a/src/main/java/org/distorted/effect/SizeChangeEffectAppearRound.java b/src/main/java/org/distorted/effect/SizeChangeEffectAppearRound.java new file mode 100644 index 00000000..74733514 --- /dev/null +++ b/src/main/java/org/distorted/effect/SizeChangeEffectAppearRound.java @@ -0,0 +1,67 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2019 Leszek Koltunski // +// // +// This file is part of Distorted. // +// // +// Distorted is free software: you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation, either version 2 of the License, or // +// (at your option) any later version. // +// // +// Distorted is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with Distorted. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.effect; + +import org.distorted.library.effect.Effect; +import org.distorted.library.effect.MatrixEffectMove; +import org.distorted.library.effect.MatrixEffectScale; +import org.distorted.library.type.Dynamic; +import org.distorted.library.type.Dynamic3D; +import org.distorted.library.type.Static3D; + +import static org.distorted.magic.RubikRenderer.TEXTURE_SIZE; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class SizeChangeEffectAppearRound extends SizeChangeEffectAppear + { + public int createEffects(int duration) + { + float X = TEXTURE_SIZE/3; + + mCubeEffectPosition = new int[] {6,7}; + mCubeEffects = new Effect[mCubeEffectPosition.length]; + + Dynamic3D d0 = new Dynamic3D(duration, 0.5f); + d0.add(new Static3D( 0.01f, 0.01f, 0.01f)); + d0.add(new Static3D( 1.00f, 1.00f, 1.00f)); + mCubeEffects[0] = new MatrixEffectScale(d0); + + Dynamic3D d1 = new Dynamic3D(duration, 0.5f); + d1.setMode(Dynamic.MODE_PATH); + d1.add(new Static3D( 0, 0, 0)); + d1.add(new Static3D(-X, 0, 0)); + d1.add(new Static3D( 0, 0, 0)); + mCubeEffects[1] = new MatrixEffectMove(d1); + + return 2; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Enable all effects used in this Appear. Called by reflection from the parent class. +// Matrix Effects do not have to be enabled. + + @SuppressWarnings("unused") + static void enable() + { + + } + } + diff --git a/src/main/java/org/distorted/effect/SizeChangeEffectAppearScale.java b/src/main/java/org/distorted/effect/SizeChangeEffectAppearScale.java new file mode 100644 index 00000000..315235bf --- /dev/null +++ b/src/main/java/org/distorted/effect/SizeChangeEffectAppearScale.java @@ -0,0 +1,54 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2019 Leszek Koltunski // +// // +// This file is part of Distorted. // +// // +// Distorted is free software: you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation, either version 2 of the License, or // +// (at your option) any later version. // +// // +// Distorted is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with Distorted. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.effect; + +import org.distorted.library.effect.Effect; +import org.distorted.library.effect.MatrixEffectScale; +import org.distorted.library.type.Dynamic3D; +import org.distorted.library.type.Static3D; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class SizeChangeEffectAppearScale extends SizeChangeEffectAppear + { + public int createEffects(int duration) + { + mCubeEffectPosition = new int[] {6}; + mCubeEffects = new Effect[mCubeEffectPosition.length]; + + Dynamic3D d0 = new Dynamic3D(duration, 0.5f); + d0.add(new Static3D(0.01f, 0.01f, 0.01f)); + d0.add(new Static3D(1.00f, 1.00f, 1.00f)); + mCubeEffects[0] = new MatrixEffectScale(d0); + + return 1; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Enable all effects used in this Appear. Called by reflection from the parent class. +// Matrix Effects do not have to be enabled. + + @SuppressWarnings("unused") + static void enable() + { + + } + } + diff --git a/src/main/java/org/distorted/effect/SizeChangeEffectAppearTransparency.java b/src/main/java/org/distorted/effect/SizeChangeEffectAppearTransparency.java new file mode 100644 index 00000000..7084ea2a --- /dev/null +++ b/src/main/java/org/distorted/effect/SizeChangeEffectAppearTransparency.java @@ -0,0 +1,78 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2019 Leszek Koltunski // +// // +// This file is part of Distorted. // +// // +// Distorted is free software: you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation, either version 2 of the License, or // +// (at your option) any later version. // +// // +// Distorted is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with Distorted. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.effect; + +import org.distorted.library.effect.Effect; +import org.distorted.library.effect.FragmentEffectAlpha; +import org.distorted.library.effect.VertexEffectWave; +import org.distorted.library.type.Dynamic1D; +import org.distorted.library.type.Dynamic5D; +import org.distorted.library.type.Static1D; +import org.distorted.library.type.Static3D; +import org.distorted.library.type.Static5D; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class SizeChangeEffectAppearTransparency extends SizeChangeEffectAppear + { + public int createEffects(int duration) + { + mCubeEffectPosition = new int[] {-1}; + mCubeEffects = new Effect[mCubeEffectPosition.length]; + + Dynamic1D d0 = new Dynamic1D(duration, 0.5f); + d0.add(new Static1D(0.0f)); + d0.add(new Static1D(1.0f)); + mCubeEffects[0] = new FragmentEffectAlpha(d0); + + mNodeEffectPosition = new int[] {-1}; + mNodeEffects = new Effect[mNodeEffectPosition.length]; + + int w = mScreen.getWidth(); + int h = mScreen.getHeight(); + int min = w. // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.effect; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public abstract class SizeChangeEffectDisappear extends SizeChangeEffect + { + SizeChangeEffectDisappear() + { + super(-2); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static SizeChangeEffectDisappear create(Type type) throws InstantiationException, IllegalAccessException + { + return type.disappear.newInstance(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + void effectsEnd() + { + mScreen.detach(mCube); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + void startEnd() + { + + } + } diff --git a/src/main/java/org/distorted/effect/SizeChangeEffectDisappearMove.java b/src/main/java/org/distorted/effect/SizeChangeEffectDisappearMove.java new file mode 100644 index 00000000..7b42c0b2 --- /dev/null +++ b/src/main/java/org/distorted/effect/SizeChangeEffectDisappearMove.java @@ -0,0 +1,58 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2019 Leszek Koltunski // +// // +// This file is part of Distorted. // +// // +// Distorted is free software: you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation, either version 2 of the License, or // +// (at your option) any later version. // +// // +// Distorted is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with Distorted. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.effect; + +import org.distorted.library.effect.Effect; +import org.distorted.library.effect.MatrixEffectMove; +import org.distorted.library.type.Dynamic3D; +import org.distorted.library.type.Static3D; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class SizeChangeEffectDisappearMove extends SizeChangeEffectDisappear + { + public int createEffects(int duration) + { + int w = mScreen.getWidth(); + int h = mScreen.getHeight(); + int xmove = w/2 + (w. // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.effect; + +import org.distorted.library.effect.Effect; +import org.distorted.library.effect.MatrixEffectMove; +import org.distorted.library.type.Dynamic3D; +import org.distorted.library.type.Static3D; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class SizeChangeEffectDisappearNone extends SizeChangeEffectDisappear + { + public int createEffects(int duration) + { + mCubeEffectPosition = new int[] {-1}; + mCubeEffects = new Effect[mCubeEffectPosition.length]; + + Dynamic3D d0 = new Dynamic3D(1,0.5f); + d0.add(new Static3D(0,0,0)); + mCubeEffects[0] = new MatrixEffectMove(d0); + + return 1; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// enable all effects used in this Appear (here: none). Called by reflection from the parent class. + + @SuppressWarnings("unused") + static void enable() + { + + } + } diff --git a/src/main/java/org/distorted/effect/SizeChangeEffectDisappearRound.java b/src/main/java/org/distorted/effect/SizeChangeEffectDisappearRound.java new file mode 100644 index 00000000..67ab1fd1 --- /dev/null +++ b/src/main/java/org/distorted/effect/SizeChangeEffectDisappearRound.java @@ -0,0 +1,67 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2019 Leszek Koltunski // +// // +// This file is part of Distorted. // +// // +// Distorted is free software: you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation, either version 2 of the License, or // +// (at your option) any later version. // +// // +// Distorted is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with Distorted. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.effect; + +import org.distorted.library.effect.Effect; +import org.distorted.library.effect.MatrixEffectMove; +import org.distorted.library.effect.MatrixEffectScale; +import org.distorted.library.type.Dynamic; +import org.distorted.library.type.Dynamic3D; +import org.distorted.library.type.Static3D; + +import static org.distorted.magic.RubikRenderer.TEXTURE_SIZE; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class SizeChangeEffectDisappearRound extends SizeChangeEffectDisappear + { + public int createEffects(int duration) + { + float X = TEXTURE_SIZE/3; + + mCubeEffectPosition = new int[] {6,7}; + mCubeEffects = new Effect[mCubeEffectPosition.length]; + + Dynamic3D d0 = new Dynamic3D(duration, 0.5f); + d0.add(new Static3D( 1.00f, 1.00f, 1.00f)); + d0.add(new Static3D( 0.01f, 0.01f, 0.01f)); + mCubeEffects[0] = new MatrixEffectScale(d0); + + Dynamic3D d1 = new Dynamic3D(duration, 0.5f); + d1.setMode(Dynamic.MODE_PATH); + d1.add(new Static3D( 0, 0, 0)); + d1.add(new Static3D(+X, 0, 0)); + d1.add(new Static3D( 0, 0, 0)); + mCubeEffects[1] = new MatrixEffectMove(d1); + + return 2; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Enable all effects used in this Appear. Called by reflection from the parent class. +// Matrix Effects do not have to be enabled. + + @SuppressWarnings("unused") + static void enable() + { + + } + } + diff --git a/src/main/java/org/distorted/effect/SizeChangeEffectDisappearScale.java b/src/main/java/org/distorted/effect/SizeChangeEffectDisappearScale.java new file mode 100644 index 00000000..1e6a740b --- /dev/null +++ b/src/main/java/org/distorted/effect/SizeChangeEffectDisappearScale.java @@ -0,0 +1,54 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2019 Leszek Koltunski // +// // +// This file is part of Distorted. // +// // +// Distorted is free software: you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation, either version 2 of the License, or // +// (at your option) any later version. // +// // +// Distorted is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with Distorted. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.effect; + +import org.distorted.library.effect.Effect; +import org.distorted.library.effect.MatrixEffectScale; +import org.distorted.library.type.Dynamic3D; +import org.distorted.library.type.Static3D; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class SizeChangeEffectDisappearScale extends SizeChangeEffectDisappear + { + public int createEffects(int duration) + { + mCubeEffectPosition = new int[] {6}; + mCubeEffects = new Effect[mCubeEffectPosition.length]; + + Dynamic3D d0 = new Dynamic3D(duration, 0.5f); + d0.add(new Static3D(1.00f, 1.00f, 1.00f)); + d0.add(new Static3D(0.01f, 0.01f, 0.01f)); + mCubeEffects[0] = new MatrixEffectScale(d0); + + return 1; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Enable all effects used in this Appear. Called by reflection from the parent class. +// Matrix Effects do not have to be enabled. + + @SuppressWarnings("unused") + static void enable() + { + + } + } + diff --git a/src/main/java/org/distorted/effect/SizeChangeEffectDisappearTransparency.java b/src/main/java/org/distorted/effect/SizeChangeEffectDisappearTransparency.java new file mode 100644 index 00000000..a844559c --- /dev/null +++ b/src/main/java/org/distorted/effect/SizeChangeEffectDisappearTransparency.java @@ -0,0 +1,78 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2019 Leszek Koltunski // +// // +// This file is part of Distorted. // +// // +// Distorted is free software: you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation, either version 2 of the License, or // +// (at your option) any later version. // +// // +// Distorted is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with Distorted. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.effect; + +import org.distorted.library.effect.Effect; +import org.distorted.library.effect.FragmentEffectAlpha; +import org.distorted.library.effect.VertexEffectWave; +import org.distorted.library.type.Dynamic1D; +import org.distorted.library.type.Dynamic5D; +import org.distorted.library.type.Static1D; +import org.distorted.library.type.Static3D; +import org.distorted.library.type.Static5D; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +class SizeChangeEffectDisappearTransparency extends SizeChangeEffectDisappear + { + public int createEffects(int duration) + { + mCubeEffectPosition = new int[] {-1}; + mCubeEffects = new Effect[mCubeEffectPosition.length]; + + Dynamic1D d0 = new Dynamic1D(duration, 0.5f); + d0.add(new Static1D(1.0f)); + d0.add(new Static1D(0.0f)); + mCubeEffects[0] = new FragmentEffectAlpha(d0); + + mNodeEffectPosition = new int[] {-1}; + mNodeEffects = new Effect[mNodeEffectPosition.length]; + + int w = mScreen.getWidth(); + int h = mScreen.getHeight(); + int min = w effectClass; + final Class effect; - Type(Class effectClass) + Type(Class effect) { - this.effectClass = effectClass; + this.effect = effect; } } - public static final int NUM_EFFECTS = Type.values().length; + private static int NUM_EFFECTS = Type.values().length; private static final Type[] types; static { int i=0; - types = new Type[NUM_EFFECTS]; for(Type type: Type.values()) { - types[i] = type; - i++; + types[i++] = type; } } + private EffectListener mListener; + private int mCubeEffectNumberBefore, mCubeEffectNumberAfter, mNodeEffectNumberBefore, mNodeEffectNumberAfter, mEffectReturned; + private int mFakeEffectID; + private boolean mPhaseBefore; + + RubikCube mCube; + DistortedScreen mScreen; + Effect[] mCubeEffectsBefore, mCubeEffectsAfter; + int[] mCubeEffectPositionBefore, mCubeEffectPositionAfter; + Effect[] mNodeEffectsBefore, mNodeEffectsAfter; + int[] mNodeEffectPositionBefore, mNodeEffectPositionAfter; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + UnscrambleEffect() + { + mFakeEffectID = -3; + mPhaseBefore = true; + } + /////////////////////////////////////////////////////////////////////////////////////////////////// - public static UnscrambleEffect.Type getType(int ordinal) + public static Type getType(int ordinal) { return types[ordinal]; } +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static String[] getNames() + { + String[] names = new String[NUM_EFFECTS]; + + for( int i=0; i cls = type.effectClass; - try { - method = cls.getMethod("enable"); + method = type.effect.getMethod("enable"); } catch(NoSuchMethodException ex) { diff --git a/src/main/java/org/distorted/effect/UnscrambleEffectNone.java b/src/main/java/org/distorted/effect/UnscrambleEffectNone.java index 54057a03..8d6463c8 100644 --- a/src/main/java/org/distorted/effect/UnscrambleEffectNone.java +++ b/src/main/java/org/distorted/effect/UnscrambleEffectNone.java @@ -21,7 +21,33 @@ package org.distorted.effect; /////////////////////////////////////////////////////////////////////////////////////////////////// +import org.distorted.library.effect.Effect; +import org.distorted.library.effect.MatrixEffectMove; +import org.distorted.library.type.Dynamic3D; +import org.distorted.library.type.Static3D; + public class UnscrambleEffectNone extends UnscrambleEffect { + public void createEffects(int duration) + { + Dynamic3D d0 = new Dynamic3D(1,0.5f); + d0.add(new Static3D(0,0,0)); + + mCubeEffectPositionBefore = new int[] {-1}; + mCubeEffectsBefore = new Effect[mCubeEffectPositionBefore.length]; + mCubeEffectsBefore[0] = new MatrixEffectMove(d0); + + mCubeEffectPositionAfter = new int[] {-1}; + mCubeEffectsAfter = new Effect[mCubeEffectPositionAfter.length]; + mCubeEffectsAfter[0] = new MatrixEffectMove(d0); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Enable all effects used in this Effect. Called by reflection from the parent class. + + @SuppressWarnings("unused") + static void enable() + { + } } diff --git a/src/main/java/org/distorted/effect/UnscrambleEffectSpin.java b/src/main/java/org/distorted/effect/UnscrambleEffectSpin.java index 6cc4137d..54f69fbf 100644 --- a/src/main/java/org/distorted/effect/UnscrambleEffectSpin.java +++ b/src/main/java/org/distorted/effect/UnscrambleEffectSpin.java @@ -21,7 +21,38 @@ package org.distorted.effect; /////////////////////////////////////////////////////////////////////////////////////////////////// +import org.distorted.library.effect.Effect; +import org.distorted.library.effect.MatrixEffectScale; +import org.distorted.library.type.Dynamic3D; +import org.distorted.library.type.Static3D; + public class UnscrambleEffectSpin extends UnscrambleEffect { + public void createEffects(int duration) + { + mCubeEffectPositionBefore = new int[] {6}; + mCubeEffectsBefore = new Effect[mCubeEffectPositionBefore.length]; + + Dynamic3D d0 = new Dynamic3D(duration, 0.5f); + d0.add(new Static3D(1.00f, 1.00f, 1.00f)); + d0.add(new Static3D(0.01f, 0.01f, 0.01f)); + mCubeEffectsBefore[0] = new MatrixEffectScale(d0); + + mCubeEffectPositionAfter = new int[] {6}; + mCubeEffectsAfter = new Effect[mCubeEffectPositionAfter.length]; + + Dynamic3D d1 = new Dynamic3D(duration, 0.5f); + d1.add(new Static3D(0.01f, 0.01f, 0.01f)); + d1.add(new Static3D(1.00f, 1.00f, 1.00f)); + mCubeEffectsAfter[0] = new MatrixEffectScale(d1); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Enable all effects used in this Effect. Called by reflection from the parent class. + + @SuppressWarnings("unused") + static void enable() + { + } } diff --git a/src/main/java/org/distorted/magic/RubikActivity.java b/src/main/java/org/distorted/magic/RubikActivity.java index 93845c23..e85b6722 100644 --- a/src/main/java/org/distorted/magic/RubikActivity.java +++ b/src/main/java/org/distorted/magic/RubikActivity.java @@ -30,8 +30,8 @@ import android.support.v7.app.AppCompatActivity; import android.view.View; import org.distorted.component.HorizontalNumberPicker; -import org.distorted.effect.AppearEffect; -import org.distorted.effect.DisappearEffect; +import org.distorted.effect.SizeChangeEffectAppear; +import org.distorted.effect.SizeChangeEffectDisappear; import org.distorted.effect.UnscrambleEffect; import org.distorted.library.main.DistortedLibrary; @@ -43,11 +43,9 @@ public class RubikActivity extends AppCompatActivity implements RubikSettings.On private static final int SMALLEST_SIZE = 2; private static final int[] button_ids = {R.id.rubikSize2, R.id.rubikSize3, R.id.rubikSize4}; - public static final int DEFAULT_APPEAR_POS = 20; - public static final int DEFAULT_DISAPPEAR_POS = 20; + public static final int DEFAULT_SIZECHANGE_POS = 20; public static final int DEFAULT_UNSCRAMBLE_POS = 20; - public static final int DEFAULT_APPEAR_TYPE = 1; - public static final int DEFAULT_DISAPPEAR_TYPE = 1; + public static final int DEFAULT_SIZECHANGE_TYPE= 1; public static final int DEFAULT_UNSCRAMBLE_TYPE= 1; public static final int MIN_SCRAMBLE = 1; @@ -55,8 +53,8 @@ public class RubikActivity extends AppCompatActivity implements RubikSettings.On private static int mSize = DEFAULT_SIZE; - private int mAppearPos, mDisappearPos, mUnscramblePos; - private int mAppearType, mDisappearType, mUnscrambleType; + private int mSizeChangePos, mUnscramblePos; + private int mSizeChangeType, mUnscrambleType; private HorizontalNumberPicker mPicker; @@ -122,11 +120,9 @@ public class RubikActivity extends AppCompatActivity implements RubikSettings.On { Bundle args = new Bundle(); - args.putInt("appearPos" , mAppearPos ); - args.putInt("disappearPos" , mDisappearPos ); + args.putInt("sizechangePos" , mSizeChangePos ); args.putInt("unscramblePos" , mUnscramblePos ); - args.putInt("appearType" , mAppearType ); - args.putInt("disappearType" , mDisappearType ); + args.putInt("sizechangeType", mSizeChangeType); args.putInt("unscrambleType", mUnscrambleType); RubikSettings settings = new RubikSettings(); @@ -154,21 +150,19 @@ public class RubikActivity extends AppCompatActivity implements RubikSettings.On /////////////////////////////////////////////////////////////////////////////////////////////////// - public void Solve(View v) + public void Unscramble(View v) { RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); - view.getRenderer().solveCube(); + view.getRenderer().unscrambleCube(); } /////////////////////////////////////////////////////////////////////////////////////////////////// - public void onComplete(int aP, int dP, int uP, int aT, int dT, int uT ) + public void onComplete(int sP, int uP, int sT, int uT ) { - mAppearPos = aP; - mDisappearPos = dP; + mSizeChangePos = sP; mUnscramblePos = uP; - mAppearType = aT; - mDisappearType = dT; + mSizeChangeType= sT; mUnscrambleType= uT; applyPreferences(); @@ -224,13 +218,11 @@ public class RubikActivity extends AppCompatActivity implements RubikSettings.On SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences.Editor editor = preferences.edit(); - editor.putInt("appearPos" , mAppearPos ); - editor.putInt("disappearPos" , mDisappearPos ); + editor.putInt("sizechangePos" , mSizeChangePos ); editor.putInt("unscramblePos" , mUnscramblePos ); - editor.putInt("appearType" , mAppearType ); - editor.putInt("disappearType" , mDisappearType ); + editor.putInt("sizechangeType", mSizeChangeType); editor.putInt("unscrambleType", mUnscrambleType); - editor.putInt("scramble" , mPicker.getValue() ); + editor.putInt("scramble" , mPicker.getValue() ); editor.apply(); } @@ -241,11 +233,9 @@ public class RubikActivity extends AppCompatActivity implements RubikSettings.On { SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); - mAppearPos = preferences.getInt("appearPos" , DEFAULT_APPEAR_POS ); - mDisappearPos = preferences.getInt("disappearPos" , DEFAULT_DISAPPEAR_POS ); + mSizeChangePos = preferences.getInt("sizechangePos" , DEFAULT_SIZECHANGE_POS ); mUnscramblePos = preferences.getInt("unscramblePos" , DEFAULT_UNSCRAMBLE_POS ); - mAppearType = preferences.getInt("appearType" , DEFAULT_APPEAR_TYPE ); - mDisappearType = preferences.getInt("disappearType" , DEFAULT_DISAPPEAR_TYPE ); + mSizeChangeType= preferences.getInt("sizechangeType", DEFAULT_SIZECHANGE_TYPE); mUnscrambleType= preferences.getInt("unscrambleType", DEFAULT_UNSCRAMBLE_TYPE); int scramble = preferences.getInt("scramble" , MIN_SCRAMBLE ); @@ -259,11 +249,9 @@ public class RubikActivity extends AppCompatActivity implements RubikSettings.On RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); RubikRenderer renderer = view.getRenderer(); - renderer.setAppearDuration(translateDuration(mAppearPos)+1); - renderer.setDisappearDuration(translateDuration(mDisappearPos) +1); - renderer.setUnscrambleDuration(translateDuration(mUnscramblePos) +1); - renderer.setAppearType(AppearEffect.getType(mAppearType)); - renderer.setDisappearType(DisappearEffect.getType(mDisappearType)); + renderer.setSizeChangeDuration(translateDuration(mSizeChangePos)+1); + renderer.setUnscrambleDuration(translateDuration(mUnscramblePos)+1); + renderer.setSizeChangeType(SizeChangeEffectAppear.getType(mSizeChangeType)); renderer.setUnscrambleType(UnscrambleEffect.getType(mUnscrambleType)); } diff --git a/src/main/java/org/distorted/magic/RubikCube.java b/src/main/java/org/distorted/magic/RubikCube.java index 821ba483..8d3ebd10 100644 --- a/src/main/java/org/distorted/magic/RubikCube.java +++ b/src/main/java/org/distorted/magic/RubikCube.java @@ -210,6 +210,20 @@ public class RubikCube extends DistortedNode } } +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void unscramble() + { + for(int x=0; x adapterType = new ArrayAdapter<>(act,android.R.layout.simple_spinner_item, appear); adapterType.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - appearTypeSpinner.setAdapter(adapterType); + sizechangeTypeSpinner.setAdapter(adapterType); - if(mAppearType>=0 && mAppearType=0 && mSizeChangeType adapterType = new ArrayAdapter<>(act,android.R.layout.simple_spinner_item, disappear); - adapterType.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - disappearTypeSpinner.setAdapter(adapterType); - - if(mDisappearType>=0 && mDisappearType adapterType = new ArrayAdapter<>(act,android.R.layout.simple_spinner_item, unscramble); adapterType.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); unscrambleTypeSpinner.setAdapter(adapterType); @@ -204,59 +172,11 @@ public class RubikSettings extends AppCompatDialogFragment implements SeekBar.On return builder.create(); } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private String[] getAppearEffectNames() - { - int length = AppearEffect.NUM_EFFECTS; - AppearEffect.Type[] types = AppearEffect.Type.values(); - String[] names = new String[length]; - - for( int i=0; i diff --git a/src/main/res/layout/settings.xml b/src/main/res/layout/settings.xml index d57e73f4..9e1fb2b3 100644 --- a/src/main/res/layout/settings.xml +++ b/src/main/res/layout/settings.xml @@ -11,90 +11,7 @@ android:paddingStart="15dp" android:paddingEnd="15dp" android:gravity="start|center" - android:text="@string/disappear_effect" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - - - - - - - - - - - - - - - - - - - - - - About SAVE OK - New Cube Appear Effect: - Old Cube Disappear Effect: + Cube Size Change Effect: Cube Unscramble Effect: Duration: Type: