commit e8c81a8e3c4d34a400e02dbe6ef90f19f31f8382 Author: Leszek Koltunski Date: Wed Jun 22 12:21:10 2016 +0100 Cleanup, consistent variable names, minor details. diff --git a/src/main/java/org/distorted/library/Distorted.java b/src/main/java/org/distorted/library/Distorted.java index ae0e8e7..d6fe66a 100644 --- a/src/main/java/org/distorted/library/Distorted.java +++ b/src/main/java/org/distorted/library/Distorted.java @@ -38,7 +38,7 @@ import org.distorted.library.exception.*; public class Distorted { /** - * When creating an instance of a DistortedBitmap from another instance, do not clone anything. + * When creating an instance of a DistortedObject from another instance, do not clone anything. * Used in the copy constructor. */ public static final int CLONE_NOTHING = 0x0; @@ -297,7 +297,7 @@ public class Distorted mFOV = fov; if( mProjection.width>0 && mProjection.height>0 ) - mProjection.onSurfaceChanged( (int)mProjection.width, (int)mProjection.height); + mProjection.onSurfaceChanged( mProjection.width, mProjection.height); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/library/DistortedObject.java b/src/main/java/org/distorted/library/DistortedObject.java index 058a10d..ec471a9 100644 --- a/src/main/java/org/distorted/library/DistortedObject.java +++ b/src/main/java/org/distorted/library/DistortedObject.java @@ -415,7 +415,7 @@ public abstract class DistortedObject /////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Abort all Effects of a given type, for example all rotations. + * Abort all Effects of a given name, for example all rotations. * * @param name one of the constants defined in {@link EffectNames} * @return number of Effects aborted. @@ -457,7 +457,7 @@ public abstract class DistortedObject // Matrix-based effects /////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Moves the Object by a vector that changes in time as interpolated by the Dynamic. + * Moves the Object by a (possibly changing in time) vector. * * @param vector 3-dimensional Data which at any given time will return a Static3D * representing the current coordinates of the vector we want to move the Object with. @@ -470,7 +470,7 @@ public abstract class DistortedObject /////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Scales the Object by factors that change in time as returned by the Dynamic. + * Scales the Object by (possibly changing in time) 3D scale factors. * * @param scale 3-dimensional Dynamic which at any given time returns a Static3D * representing the current x- , y- and z- scale factors. @@ -483,7 +483,7 @@ public abstract class DistortedObject /////////////////////////////////////////////////////////////////////////////////////////////////// /** - * Scales the Object by one uniform factor in all 3 dimensions. Convenience function. + * Scales the Object by one uniform, constant factor in all 3 dimensions. Convenience function. * * @param scale The factor to scale all 3 dimensions with. * @return ID of the effect added, or -1 if we failed to add one. diff --git a/src/main/java/org/distorted/library/EffectMessageSender.java b/src/main/java/org/distorted/library/EffectMessageSender.java index 976f6c3..921415e 100644 --- a/src/main/java/org/distorted/library/EffectMessageSender.java +++ b/src/main/java/org/distorted/library/EffectMessageSender.java @@ -105,7 +105,8 @@ final class EffectMessageSender extends Thread while( mList.size()>0 ) { tmp = mList.remove(0); - tmp.mListener.effectMessage(tmp.mMessage, tmp.mEffectID, tmp.mEffectName, tmp.mBitmapID, tmp.mStr); + tmp.mListener.effectMessage(tmp.mMessage, tmp.mEffectID, EffectNames.getName(tmp.mEffectName), + tmp.mBitmapID, tmp.mStr); } synchronized(mThis) diff --git a/src/main/java/org/distorted/library/EffectNames.java b/src/main/java/org/distorted/library/EffectNames.java index 009889d..a73f0bc 100644 --- a/src/main/java/org/distorted/library/EffectNames.java +++ b/src/main/java/org/distorted/library/EffectNames.java @@ -93,7 +93,7 @@ public enum EffectNames * Uniforms: (forceX,forceY,forceZ,regionX,regionY,regionRX,regionRY,centerX,centerY) * Unity: (forceX,forceY,forceZ) = (0,0,0) */ - DISTORT ( EffectTypes.VERTEX , new float[] {0.0f,0.0f,0.0f} ), // keep this the first VERT effect (reason: getType) + DISTORT ( EffectTypes.VERTEX , new float[] {0.0f,0.0f,0.0f} ), /** * Deform the whole Object by applying a 2D vector of force to a center point. *

@@ -126,7 +126,7 @@ public enum EffectNames * Uniforms: (macroblockSize,UNUSED,UNUSED,UNUSED, regionX, regionY, regionRX, regionRY) * Unity: macroblockSize = 1 */ - MACROBLOCK ( EffectTypes.FRAGMENT, new float[] {1.0f} ), // keep this the first FRAG effect (reason: getType) + MACROBLOCK ( EffectTypes.FRAGMENT, new float[] {1.0f} ), /** * Make a given Region (partially) transparent. *

@@ -204,12 +204,13 @@ public enum EffectNames private static final int MAXDIM = 4; // maximum supported dimension of an effect - private EffectTypes type; - private float[] unity; - - static private float[] unities; - static private int[] dimensions; + private final EffectTypes type; + private final float[] unity; + private static final float[] unities; + private static final int[] dimensions; + private static final EffectNames[] names; + static { int len = values().length; @@ -217,11 +218,13 @@ public enum EffectNames dimensions = new int[len]; unities = new float[MAXDIM*len]; - + names = new EffectNames[len]; + for(EffectNames name: EffectNames.values()) { dimensions[i] = (name.unity==null ? 0 : name.unity.length); - + names[i] = name; + switch(dimensions[i]) { case 4: unities[MAXDIM*i+3] = name.unity[3]; @@ -244,14 +247,17 @@ public enum EffectNames } /////////////////////////////////////////////////////////////////////////////////////////////////// -// yes, I know we could have used values(i) but that allocates a new copy each time! static EffectTypes getType(int ordinal) { - if( ordinal0 ) { - mType = new int[mMax[mMaxIndex]]; + mName = new int[mMax[mMaxIndex]]; mUniforms = new float[numUniforms*mMax[mMaxIndex]]; mInter = new Dynamic[3][mMax[mMaxIndex]]; mCurrentDuration = new long[mMax[mMaxIndex]]; @@ -175,7 +175,7 @@ abstract class EffectQueue for(int i=0; i0 ) { - GLES20.glUniform1iv( mTypeH , mNumEffects, mType ,0); + GLES20.glUniform1iv( mTypeH , mNumEffects, mName,0); GLES20.glUniform4fv( mUniformsH,2*mNumEffects, mUniforms,0); } } @@ -160,7 +161,7 @@ class EffectQueueFragment extends EffectQueue mUniforms[NUM_UNIFORMS*i+6] = w*mBuf[4*i+2]; // in fragment shader rx and ry radii are the last two values of the second vec4 mUniforms[NUM_UNIFORMS*i+7] = h*mBuf[4*i+3]; // - if( mType[i]==EffectNames.MACROBLOCK.ordinal() ) // fill up the .y and .z components of the Interpolated values already to avoid having to compute this in the fragment shader + if( mName[i]==EffectNames.MACROBLOCK.ordinal() ) // fill up the .y and .z components of the Interpolated values already to avoid having to compute this in the fragment shader { mUniforms[NUM_UNIFORMS*i+1] = 2.0f*mObjHalfX/mUniforms[NUM_UNIFORMS*i]; mUniforms[NUM_UNIFORMS*i+2] = 2.0f*mObjHalfY/mUniforms[NUM_UNIFORMS*i]; diff --git a/src/main/java/org/distorted/library/EffectQueueMatrix.java b/src/main/java/org/distorted/library/EffectQueueMatrix.java index 5504189..4144a4d 100644 --- a/src/main/java/org/distorted/library/EffectQueueMatrix.java +++ b/src/main/java/org/distorted/library/EffectQueueMatrix.java @@ -111,16 +111,17 @@ class EffectQueueMatrix extends EffectQueue EffectMessageSender.newMessage( mListeners.elementAt(j), EffectMessage.EFFECT_FINISHED, (mID[i]<