/ - Diff - Distorted Android

      * Aborts a single Effect.
+     *
      * @param id ID of the Effect we want to abort.
      * @return <code>true</code> if the Effect was found and successfully aborted.
      * @return number of Effects aborted. Always either 0 or 1.
      */
         public boolean abortEffect(long id)
         public int abortEffect(long id)
+          {
           int type = (int)(id&EffectTypes.MASK);
           if( type==EffectTypes.MATRIX.type   )  return mM.removeByID(id>>EffectTypes.LENGTH);
           if( type==EffectTypes.VERTEX.type   )  return mV.removeByID(id>>EffectTypes.LENGTH);
           if( type==EffectTypes.FRAGMENT.type )  return mF.removeByID(id>>EffectTypes.LENGTH);
           if( type==EffectTypes.OTHER.type    )  return mO.removeByID(id>>EffectTypes.LENGTH);
           if( type==EffectTypes.MATRIX.type   ) return mM.removeByID(id>>EffectTypes.LENGTH);
           if( type==EffectTypes.VERTEX.type   ) return mV.removeByID(id>>EffectTypes.LENGTH);
           if( type==EffectTypes.FRAGMENT.type ) return mF.removeByID(id>>EffectTypes.LENGTH);
           if( type==EffectTypes.OTHER.type    ) return mO.removeByID(id>>EffectTypes.LENGTH);
           return false;
           return 0;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
      * Abort all Effects of a given type, for example all rotations.
+     *
      * @param name one of the constants defined in {@link EffectNames}
      * @return <code>true</code> if a single Effect of type effectType has been found and aborted.
      * @return number of Effects aborted.
      */
         public boolean abortEffects(EffectNames name)
         public int abortEffects(EffectNames name)
+          {
           switch(name.getType())
+            {
-...
             case VERTEX  : return mV.removeByType(name);
             case FRAGMENT: return mF.removeByType(name);
             case OTHER   : return mO.removeByType(name);
             default      : return false;
             default      : return 0;
+            }
+          }

     package org.distorted.library;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     enum EffectNames
     /**
      * Names of Effects one can apply to DistortedObjects.
      */
     public enum EffectNames
+      {
       // EFFECT NAME /////// EFFECT TYPE ////////////// UNITY /////////////////////////
-...
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public EffectTypes getType()
+        {
         return type;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // yes, I know we could have used values(i)
     // yes, I know we could have used values(i) but that allocates a new copy each time!
       static EffectTypes getType(int ordinal)
+        {
-...
         return false;
+        }
+      }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // PUBLIC API
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     /**
      * Returns the Type of an individual Effect. For example, EffectNames.ROTATION.getType() will
      * return EffectTypes.MATRIX.
      * @return type of the effect.
      */
       public EffectTypes getType()
+        {
         return type;
+        }
+      }

src/main/java/org/distorted/library/EffectQueue.java
132	132
133	133	///////////////////////////////////////////////////////////////////////////////////////////////////
134	134
135		synchronized boolean removeByID(long id)
	135	synchronized int removeByID(long id)
136	136	{
137	137	int i = getEffectIndex(id);
138	138
139	139	if( i>=0 )
140	140	{
141	141	remove(i);
142		return true;
	142	return 1;
143	143	}
144	144
145		return false;
	145	return 0;
146	146	}
147	147
148	148	///////////////////////////////////////////////////////////////////////////////////////////////////
149	149
150		synchronized boolean removeByType(EffectNames effect)
	150	synchronized int removeByType(EffectNames effect)
151	151	{
152		boolean ret = false;
	152	int ret = 0;
153	153	int ord = effect.ordinal();
154	154
155	155	for(int i=0; i<mNumEffects; i++)
...	...
157	157	if( mType[i]==ord )
158	158	{
159	159	remove(i);
160		// TODO: don't we have to do a 'i--' here? Check this.
161		ret = true;
	160	i--;
	161	ret++;
162	162	}
163	163	}
164	164

Project

General

Profile

Distorted Android

Revision 476bbc81

Added by Leszek Koltunski almost 8 years ago