/ - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision f647630d

Added by Leszek Koltunski over 5 years ago

ID f647630db5d89badcadfa7963b36cd1317f0725e
Parent f548942f
Child c622889d

Simplify the way applications can get notifications when an effect finishes.

Now, instead of the 'DistortedEffects.(de)registerForNotifications()' 2 APIs, we call a single 'Effect.notifyWhenFinished()'.

     import org.distorted.library.effect.Effect;
     import org.distorted.library.main.DistortedScreen;
     import org.distorted.library.message.EffectListener;
     import org.distorted.library.message.EffectMessage;
     import org.distorted.magic.RubikCube;
     import java.lang.reflect.Method;
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void effectMessage(final EffectMessage em, final long effectID, final long objectID)
       public void effectFinished(final long effectID)
+        {
         for(int i=0; i<mCubeEffectNumber; i++)
+          {
-...
             if( mCubeEffectReturned == mCubeEffectFinished )
+              {
               mListener.effectMessage(null, FAKE_EFFECT_ID, 0);
+              }
             if( mCubeEffectReturned == mCubeEffectNumber )
+              {
               mCube.deregisterForMessages(this);
               mListener.effectFinished(FAKE_EFFECT_ID);
+              }
             mCube.remove(id);
-...
         for(int i=0; i<mCubeEffectNumber; i++)
+          {
           mCube.apply(mCubeEffects[i],mCubeEffectPosition[i]);
           mCubeEffects[i].notifyWhenFinished(this);
+          }
         mCube.registerForMessages(this);
         mScreen.attach(mCube);
         return FAKE_EFFECT_ID;

src/main/java/org/distorted/effect/DisappearEffect.java
22	22	import org.distorted.library.effect.Effect;
23	23	import org.distorted.library.main.DistortedScreen;
24	24	import org.distorted.library.message.EffectListener;
25		import org.distorted.library.message.EffectMessage;
26	25	import org.distorted.magic.RubikCube;
27	26
28	27	import java.lang.reflect.Method;
...	...
95	94
96	95	///////////////////////////////////////////////////////////////////////////////////////////////////
97	96
98		public void effectMessage(final EffectMessage em, final long effectID, final long objectID)
	97	public void effectFinished(final long effectID)
99	98	{
100	99	for(int i=0; i<mCubeEffectNumber; i++)
101	100	{
...	...
107	106
108	107	if( mCubeEffectReturned == mCubeEffectFinished )
109	108	{
110		mListener.effectMessage(null, FAKE_EFFECT_ID, 0);
	109	mListener.effectFinished(FAKE_EFFECT_ID);
111	110	}
112	111
113	112	if( mCubeEffectReturned == mCubeEffectNumber )
114	113	{
115	114	mScreen.detach(mCube);
116		mCube.deregisterForMessages(this);
117	115	}
118	116
119	117	mCube.remove(id);
...	...
144	142	for(int i=0; i<mCubeEffectNumber; i++)
145	143	{
146	144	mCube.apply(mCubeEffects[i],mCubeEffectPosition[i]);
	145	mCubeEffects[i].notifyWhenFinished(this);
147	146	}
148	147
149		mCube.registerForMessages(this);
150
151	148	return FAKE_EFFECT_ID;
152	149	}
153	150

         private Static1D mRotationAngleStatic, mRotationAngleMiddle, mRotationAngleFinal;
         private Static3D mMove, mScale, mNodeMove, mNodeScale;
         private DistortedTexture mTexture;
         private DistortedEffects mEffectsListeningForNow;
         private int mRotAxis, mRotRow;
         private int mSize;
-...
           return mEffects[0][0][0].getNumEffects(type);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         public void registerForMessages(EffectListener listener)
+          {
           mEffects[0][0][0].registerForMessages(listener);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         public void deregisterForMessages(EffectListener listener)
+          {
           mEffects[0][0][0].deregisterForMessages(listener);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // all DistortedTextures, DistortedNodes, DistortedFramebuffers, DistortedScreens and all types of
     // Meshes HAVE TO be markedForDeletion when they are no longer needed- otherwise we have a major
-...
                     if( first )
+                      {
                       first = false;
                       mEffectsListeningForNow = mEffects[x][y][z];
                       mEffectsListeningForNow.registerForMessages(listener);
                       mRotateEffect[x][y][z].notifyWhenFinished(listener);
                       effectID = mRotateEffect[x][y][z].getID();
+                      }
+                    }
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         void removeRotationNow(EffectListener listener)
         void removeRotationNow()
+          {
           mEffectsListeningForNow.deregisterForMessages(listener);
           int nearestAngleInDegrees = computeNearestAngle(mRotationAngleStatic.get1());
           double nearestAngleInRadians = nearestAngleInDegrees*Math.PI/180;
           float sinA =-(float)Math.sin(nearestAngleInRadians*0.5);

src/main/java/org/distorted/magic/RubikRenderer.java
30	30	import org.distorted.library.main.DistortedTexture;
31	31	import org.distorted.library.mesh.MeshQuad;
32	32	import org.distorted.library.message.EffectListener;
33		import org.distorted.library.message.EffectMessage;
34	33	import org.distorted.library.type.Static4D;
35	34
36	35	import javax.microedition.khronos.egl.EGLConfig;
...	...
126	125	if( mRemoveRotation )
127	126	{
128	127	mRemoveRotation=false;
129		mNewCube.removeRotationNow(this);
	128	mNewCube.removeRotationNow();
130	129	mCanRotate = true;
131	130	}
132	131
...	...
185	184
186	185	///////////////////////////////////////////////////////////////////////////////////////////////////
187	186
188		public void effectMessage(final EffectMessage em, final long effectID, final long objectID)
	187	public void effectFinished(final long effectID)
189	188	{
190		if( effectID == mRotationFinishedID )
	189	if( effectID == mRotationFinishedID)
191	190	{
192	191	mRemoveRotation = true;
193	192	}

             android:layout_width="0sp"
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:text="-" />
             android:text="-"
             android:textSize="30sp" />
         <TextView
             android:id="@+id/textNumber"
             android:layout_width="0sp"
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:inputType="number"
             android:text="0"
             android:textAlignment="center"
             android:textSize="48sp" />
             android:textSize="46sp" />
         <Button
             android:id="@+id/buttonMore"
             android:layout_width="0sp"
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:text="+" />
             android:text="+"
             android:textSize="30sp" />
     </LinearLayout>

Also available in: Unified diff

Project

General

Profile

Magic Cube

Revision f647630d

Added by Leszek Koltunski over 5 years ago