v3.0.2 - fixed crash setUniform4fv + "too many uniforms" error

Author: andresoviedo

README.md

@@ -13,10 +13,10 @@ The application does not use any third party library.
 * Collada format (DAE): https://en.wikipedia.org/wiki/COLLADA
 
 
-News (15/07/2020)
+News (03/09/2020)
 =================
 
-* New version released 3.0.0
+* New version released 3.0.2
 * Collada support for polygon with holes
 * Wavefront support for smoothing groups
 * New FPS counter (frames per second)
@@ -183,6 +183,11 @@ ChangeLog
 
 (f) fixed, (i) improved, (n) new feature
 
+- 3.0.2 (03/09/2020)
+  - (f) setUniform4fv function had length zero - issue detected with Xiaomi Redmi 8
+  - (f) gl_MaxVertexUniformVectors is apparently not working - "too many uniforms" - detected in Xiaomi Redmi 8
+- 3.0.1 (15/07/2020)
+  - (f) Forgot to add requestLegacyExternalStorage option
 - 3.0.0 (15/07/2020)
   - (n) Support for Object Groups  (wavefront: o,g, dae: <geometry>)
   - (n) Support for Smoothing Groups (wavefront)

app/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
     package="org.andresoviedo.dddmodel2"
-    android:versionCode="24"
-    android:versionName="2.7.0">
+    android:versionCode="26"
+    android:versionName="3.0.2">
 
     <uses-sdk
         tools:overrideLibrary="android.support.compat, android.arch.lifecycle" />
@@ -19,7 +19,8 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" android:largeHeap="true">
+        android:theme="@style/AppTheme" android:largeHeap="true"
+        android:requestLegacyExternalStorage="true">
         <activity
             android:name="org.andresoviedo.app.model3D.MainActivity"
             android:label="@string/app_name" >

engine/src/main/java/org/andresoviedo/android_3d_model_engine/drawer/GLES20Renderer.java

@@ -211,17 +211,15 @@ private void setUniform3(float[] uniform3f, String variableName) {
         int handle = GLES20.glGetUniformLocation(mProgram, variableName);
         GLUtil.checkGlError("glGetUniformLocation");
 
-        // Pass in the light position in eye space.
-        GLES20.glUniform3fv(handle, 0, uniform3f, 0);
+        GLES20.glUniform3fv(handle, 1, uniform3f, 0);
         GLUtil.checkGlError("glUniform3fv");
     }
 
     private void setUniform4(float[] uniform4f, String variableName) {
         int handle = GLES20.glGetUniformLocation(mProgram, variableName);
         GLUtil.checkGlError("glGetUniformLocation");
 
-        // Pass in the light position in eye space.
-        GLES20.glUniform4fv(handle, 0, uniform4f, 0);
+        GLES20.glUniform4fv(handle, 1, uniform4f, 0);
         GLUtil.checkGlError("glUniform4fv");
     }
 

engine/src/main/java/org/andresoviedo/android_3d_model_engine/drawer/RendererFactory.java

@@ -86,7 +86,7 @@ public Renderer getDrawer(Object3DData obj, boolean usingTextures, boolean using
         vertexShaderCode = vertexShaderCode.replace("void main(){", "void main(){\n\tgl_PointSize = 5.0;");
 
         // use opengl constant to dynamically set up array size in shaders. That should be >=120
-        vertexShaderCode = vertexShaderCode.replace("const int MAX_JOINTS = 60;","const int MAX_JOINTS = gl_MaxVertexUniformVectors;");
+        vertexShaderCode = vertexShaderCode.replace("const int MAX_JOINTS = 60;","const int MAX_JOINTS = gl_MaxVertexUniformVectors > 60 ? 60 : gl_MaxVertexUniformVectors;");
 
         // create drawer
         Log.v("RendererFactory", "\n---------- Vertex shader ----------\n");