commit 3f3bf7dc72b7f827506a51efdb27909c913de819
Author: Leszek Koltunski <leszek@distoretedandroid.org>
Date:   Tue Dec 13 18:01:37 2016 +0000

    Minor

diff --git a/src/main/java/org/distorted/library/Distorted.java b/src/main/java/org/distorted/library/Distorted.java
index e1c6b1e..09caf82 100644
--- a/src/main/java/org/distorted/library/Distorted.java
+++ b/src/main/java/org/distorted/library/Distorted.java
@@ -84,13 +84,10 @@ public class Distorted
 
   private static final String TAG = Distorted.class.getSimpleName();
   private static boolean mInitialized = false;
-  
-  private static int mProgramH;         // handle to our shading program.
-  private static int mTextureUniformH;  // the texture.
 
-  static int mPositionH;                // model position information
-  static int mNormalH;                  // model normal information.
-  static int mTextureCoordH;            // model texture coordinate information.
+  static int mPositionH;       // model position information
+  static int mNormalH;         // model normal information.
+  static int mTextureCoordH;   // model texture coordinate information.
 
   static DistortedFramebuffer mFramebuffer = new DistortedFramebuffer(0); // output to the screen
 
@@ -325,16 +322,16 @@ public class Distorted
     final int vertexShaderHandle   = compileShader(GLES20.GL_VERTEX_SHADER  , vertexShader  );     
     final int fragmentShaderHandle = compileShader(GLES20.GL_FRAGMENT_SHADER, fragmentShader);     
       
-    mProgramH = createAndLinkProgram(vertexShaderHandle, fragmentShaderHandle, new String[] {"a_Position",  "a_Color", "a_Normal", "a_TexCoordinate"});                                                            
+    int programH = createAndLinkProgram(vertexShaderHandle, fragmentShaderHandle, new String[] {"a_Position",  "a_Color", "a_Normal", "a_TexCoordinate"});
 
     mFramebuffer.setProjection(60.0f,0.0f,0.0f);
 
-    GLES20.glUseProgram(mProgramH);
+    GLES20.glUseProgram(programH);
 
-    mTextureUniformH = GLES20.glGetUniformLocation(mProgramH, "u_Texture");
-    mPositionH       = GLES20.glGetAttribLocation( mProgramH, "a_Position");
-    mNormalH         = GLES20.glGetAttribLocation( mProgramH, "a_Normal");
-    mTextureCoordH   = GLES20.glGetAttribLocation( mProgramH, "a_TexCoordinate");
+    int textureUniformH = GLES20.glGetUniformLocation(programH, "u_Texture");
+    mPositionH          = GLES20.glGetAttribLocation( programH, "a_Position");
+    mNormalH            = GLES20.glGetAttribLocation( programH, "a_Normal");
+    mTextureCoordH      = GLES20.glGetAttribLocation( programH, "a_TexCoordinate");
 
     GLES20.glEnable (GLES20.GL_DEPTH_TEST);
     GLES20.glDepthFunc(GLES20.GL_LEQUAL);
@@ -344,11 +341,11 @@ public class Distorted
     GLES20.glCullFace(GLES20.GL_BACK);
     GLES20.glFrontFace(GLES20.GL_CW);
     GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
-    GLES20.glUniform1i(mTextureUniformH, 0);
+    GLES20.glUniform1i(textureUniformH, 0);
 
-    EffectQueueFragment.getUniforms(mProgramH);
-    EffectQueueVertex.getUniforms(mProgramH);
-    EffectQueueMatrix.getUniforms(mProgramH);
+    EffectQueueFragment.getUniforms(programH);
+    EffectQueueVertex.getUniforms(programH);
+    EffectQueueMatrix.getUniforms(programH);
     
     GLES20.glEnableVertexAttribArray(mPositionH);        
     GLES20.glEnableVertexAttribArray(mNormalH);
diff --git a/src/main/java/org/distorted/library/DistortedTexture.java b/src/main/java/org/distorted/library/DistortedTexture.java
index 3afadac..28d9f08 100644
--- a/src/main/java/org/distorted/library/DistortedTexture.java
+++ b/src/main/java/org/distorted/library/DistortedTexture.java
@@ -24,6 +24,7 @@ import android.graphics.Matrix;
 import android.opengl.GLES20;
 import android.opengl.GLUtils;
 
+import java.util.Arrays;
 import java.util.HashMap;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -97,8 +98,7 @@ public class DistortedTexture
 
   long getBitmapID()
     {
-    if( mBmp!=null && mBitmapID==0 ) mBitmapID = mBmp.hashCode();
-
+    if( mBmp!=null && mBitmapID==0 ) mBitmapID = Arrays.hashCode(mBmp);
     return mBitmapID;
     }