commit 65362dd44f1ad649f52f00c420b185de7d9e79a8
Author: Leszek Koltunski <leszek@distoretedandroid.org>
Date:   Fri Dec 9 11:53:42 2016 +0000

    Various relatively minor cleanups.

diff --git a/src/main/java/org/distorted/library/DistortedFramebuffer.java b/src/main/java/org/distorted/library/DistortedFramebuffer.java
index 6f6f1b4..1962c06 100644
--- a/src/main/java/org/distorted/library/DistortedFramebuffer.java
+++ b/src/main/java/org/distorted/library/DistortedFramebuffer.java
@@ -29,14 +29,14 @@ import java.util.LinkedList;
 /**
  * Class which represents a OpenGL Framebuffer object.
  * <p>
- * User is able to create either WRITE-only Framebuffers from objects already constructed outside
- * of the library (the first constructor; primary use case: the screen) or an offscreen READ-WRITE
+ * User is able to create either Framebuffers from objects already constructed outside
+ * of the library (the first constructor; primary use case: the screen) or an offscreen
  * FBOs (used by the DistortedNode, but also can be used by external users of the library)
  * <p>
  * Also, keep all objects created in a static LinkedList. The point: we need to be able to mark
  * Framebuffers for deletion, and delete all marked objects later at a convenient time (that's
  * because we can only delete from a thread that holds the OpenGL context so here we provide a
- * framework where one is able to mark for deletion at any place and actual deletion takes place
+ * framework where one is able to mark for deletion at any time and actual deletion takes place
  * on the next render).
  */
 public class DistortedFramebuffer
@@ -271,7 +271,8 @@ public class DistortedFramebuffer
  * to set the size of an not-yet-created Framebuffer of an object that has been created with the
  * second constructor.
  * <p>
- * Fully creating an object, rendering to it, then resizing mid-render is also possible.
+ * Fully creating an object, rendering to it, then resizing mid-render is also possible. Actual
+ * resize takes place on the next render.
  *
  * @param width The new width.
  * @param height The new height.
diff --git a/src/main/java/org/distorted/library/EffectQueue.java b/src/main/java/org/distorted/library/EffectQueue.java
index 56441d8..b394fed 100644
--- a/src/main/java/org/distorted/library/EffectQueue.java
+++ b/src/main/java/org/distorted/library/EffectQueue.java
@@ -48,7 +48,7 @@ abstract class EffectQueue
 
   protected Vector<EffectListener> mListeners =null;
   protected int mNumListeners=0;  // ==mListeners.length(), but we only create mListeners if the first one gets added
-  protected long mBitmapID;
+  protected long mObjectID;
 
   private static boolean mCreated;
 
@@ -68,10 +68,9 @@ abstract class EffectQueue
     if( obj!=null )
       {
       mObjHalfX = obj.getWidth() / 2.0f;
-      mObjHalfY = obj.getHeight() / 2.0f;
+      mObjHalfY = obj.getHeight()/ 2.0f;
       mObjHalfZ = obj.getDepth() / 2.0f;
-
-      mBitmapID = obj.getID();
+      mObjectID = obj.getID();
       }
 
     if( mMax[mMaxIndex]>0 )
@@ -221,7 +220,7 @@ abstract class EffectQueue
                                           EffectMessage.EFFECT_REMOVED,
                                           (removedID<<EffectTypes.LENGTH)+EffectNames.getType(removedName).type,
                                           removedName,
-                                          mBitmapID,
+                                          mObjectID,
                                           null);
         }
       }
@@ -271,7 +270,7 @@ abstract class EffectQueue
                                       EffectMessage.EFFECT_REMOVED,
                                       (removedID<<EffectTypes.LENGTH)+EffectNames.getType(removedName).type,
                                       removedName,
-                                      mBitmapID,
+                                      mObjectID,
                                       null);
     }
   
diff --git a/src/main/java/org/distorted/library/EffectQueueFragment.java b/src/main/java/org/distorted/library/EffectQueueFragment.java
index 7a54524..babd491 100644
--- a/src/main/java/org/distorted/library/EffectQueueFragment.java
+++ b/src/main/java/org/distorted/library/EffectQueueFragment.java
@@ -75,7 +75,7 @@ class EffectQueueFragment extends EffectQueue
                                           EffectMessage.EFFECT_FINISHED,
                                           (mID[i]<<EffectTypes.LENGTH)+EffectTypes.FRAGMENT.type,
                                           mName[i],
-                                          mBitmapID,
+                                          mObjectID,
                                           null);
       
         if( EffectNames.isUnity(mName[i], mUniforms, NUM_UNIFORMS*i) )
@@ -162,8 +162,8 @@ class EffectQueueFragment extends EffectQueue
       else return -1;
 
       mInter[1][mNumEffects] = null;
-      mUniforms[NUM_UNIFORMS*mNumEffects+6] = 1000*mObjHalfX;
-      mUniforms[NUM_UNIFORMS*mNumEffects+7] = 1000*mObjHalfY;
+      mUniforms[NUM_UNIFORMS*mNumEffects+6] = Float.MAX_VALUE;
+      mUniforms[NUM_UNIFORMS*mNumEffects+7] = Float.MAX_VALUE;
 
       mInter[2][mNumEffects] = null;
 
@@ -302,8 +302,8 @@ class EffectQueueFragment extends EffectQueue
       else return -1;
 
       mInter[1][mNumEffects]  = null;
-      mUniforms[NUM_UNIFORMS*mNumEffects+6] = 1000*mObjHalfX;
-      mUniforms[NUM_UNIFORMS*mNumEffects+7] = 1000*mObjHalfY;
+      mUniforms[NUM_UNIFORMS*mNumEffects+6] = Float.MAX_VALUE;
+      mUniforms[NUM_UNIFORMS*mNumEffects+7] = Float.MAX_VALUE;
 
       return addBase(eln);
       }
diff --git a/src/main/java/org/distorted/library/EffectQueueMatrix.java b/src/main/java/org/distorted/library/EffectQueueMatrix.java
index e0afd41..2e345ac 100644
--- a/src/main/java/org/distorted/library/EffectQueueMatrix.java
+++ b/src/main/java/org/distorted/library/EffectQueueMatrix.java
@@ -114,7 +114,7 @@ class EffectQueueMatrix extends EffectQueue
                                           EffectMessage.EFFECT_FINISHED,
                                          (mID[i]<<EffectTypes.LENGTH)+EffectTypes.MATRIX.type,
                                           mName[i],
-                                          mBitmapID,
+                                          mObjectID,
                                           null);
 
         if( EffectNames.isUnity(mName[i], mUniforms, NUM_UNIFORMS*i) )
diff --git a/src/main/java/org/distorted/library/EffectQueueVertex.java b/src/main/java/org/distorted/library/EffectQueueVertex.java
index 3a08cbf..3e184f7 100644
--- a/src/main/java/org/distorted/library/EffectQueueVertex.java
+++ b/src/main/java/org/distorted/library/EffectQueueVertex.java
@@ -85,7 +85,7 @@ class EffectQueueVertex extends EffectQueue
                                             EffectMessage.EFFECT_FINISHED,
                                            (mID[i]<<EffectTypes.LENGTH)+EffectTypes.VERTEX.type,
                                             mName[i],
-                                            mBitmapID,
+                                            mObjectID,
                                             null);
 
           if( EffectNames.isUnity(mName[i], mUniforms, NUM_UNIFORMS*i) )
@@ -369,7 +369,7 @@ class EffectQueueVertex extends EffectQueue
 
         mUniforms[NUM_UNIFORMS*mNumEffects+ 8] = tmp.getX();
         mUniforms[NUM_UNIFORMS*mNumEffects+ 9] =-tmp.getY();   // invert y already
-        mUniforms[NUM_UNIFORMS*mNumEffects+10] = z<=0.0f ? 1000*mObjHalfX : z;
+        mUniforms[NUM_UNIFORMS*mNumEffects+10] = z<=0.0f ? Float.MAX_VALUE : z;
         mUniforms[NUM_UNIFORMS*mNumEffects+11] = tmp.getW();
         mInter[1][mNumEffects] = null;
         }
@@ -379,7 +379,7 @@ class EffectQueueVertex extends EffectQueue
       {
       mUniforms[NUM_UNIFORMS*mNumEffects+ 8] = 0.0f;
       mUniforms[NUM_UNIFORMS*mNumEffects+ 9] = 0.0f;
-      mUniforms[NUM_UNIFORMS*mNumEffects+10] = 1000*mObjHalfX;
+      mUniforms[NUM_UNIFORMS*mNumEffects+10] = Float.MAX_VALUE;
       mUniforms[NUM_UNIFORMS*mNumEffects+11] = 0.0f;
       mInter[1][mNumEffects] = null;
       }