expo-gl 15.0.3 → 15.0.4

package/CHANGELOG.md

@@ -10,6 +10,10 @@
 
 ### 💡 Others
 
+## 15.0.4 — 2025-01-19
+
+_This version does not introduce any user-facing changes._
+
 ## 15.0.3 — 2025-01-10
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '15.0.3'
+version = '15.0.4'
 
 def reactNativeArchitectures() {
     def value = project.getProperties().get("reactNativeArchitectures")
@@ -26,7 +26,7 @@ android {
   namespace "expo.modules.gl"
   defaultConfig {
     versionCode 31
-    versionName "15.0.3"
+    versionName "15.0.4"
 
     externalNativeBuild {
       cmake {

package/android/src/main/java/expo/modules/gl/GLCameraObject.java

@@ -61,6 +61,7 @@ import static android.opengl.GLES30.glUniformMatrix4fv;
 import static android.opengl.GLES30.glUseProgram;
 import static android.opengl.GLES30.glVertexAttribPointer;
 import static android.opengl.GLES30.glViewport;
+import static android.opengl.Matrix.orthoM;
 import static expo.modules.gl.cpp.EXGL.EXGLContextMapObject;
 
 public class GLCameraObject extends GLObject implements SurfaceTexture.OnFrameAvailableListener {
@@ -77,24 +78,34 @@ public class GLCameraObject extends GLObject implements SurfaceTexture.OnFrameAv
 
   private SurfaceTexture mCameraSurfaceTexture;
 
+  /* Coordinates that define how a texture is mapped onto a surface. Typically the values are
+    0.0f, 0.0f
+    1.0f, 0.0f
+    0.0f, 1.0f
+    1.0f, 0.0f
+    1.0f, 1.0f
+    0.0f, 1.0f
+   We invert them because [SurfaceTexture] has an inverted Y-Axis
+  */
   private float textureCoords[] = {
-      0.0f, 1.0f,
-      1.0f, 1.0f,
-      0.0f, 0.0f,
-      1.0f, 1.0f,
-      1.0f, 0.0f,
-      0.0f, 0.0f
+    0.0f, 1.0f, // Bottom-left
+    1.0f, 1.0f, // Bottom-right
+    0.0f, 0.0f, // Top-left
+    1.0f, 1.0f, // Bottom-right
+    1.0f, 0.0f, // Top-right
+    0.0f, 0.0f  // Top-left
   };
 
   private static String vertexShaderSource
       = "precision highp float;"
       + "attribute vec4 position;"
       + "uniform mat4 transformMatrix;"
+      + "uniform mat4 projectionMatrix;"
       + "varying vec2 coords;"
       + "void main() {"
       + "  vec2 clipSpace = (1.0 - 2.0 * position.xy);"
       + "  coords = (transformMatrix * position).xy;"
-      + "  gl_Position = vec4(clipSpace, 0.0, 1.0);"
+      + "  gl_Position = projectionMatrix * vec4(clipSpace, 0.0, 1.0);"
       + "}";
 
   private static String fragmentShaderSource
@@ -180,6 +191,9 @@ public class GLCameraObject extends GLObject implements SurfaceTexture.OnFrameAv
         int[] prevVertexArray = new int[1];
         int[] viewport = new int[4];
         float[] transformMatrix = new float[16];
+        float[] projectionMatrix = new float[16];
+
+        orthoM(projectionMatrix, 0, -1f, 1f, -1f, 1f, -1f, 1f);
 
         // get previous state
         glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, prevFramebuffer, 0);
@@ -196,6 +210,7 @@ public class GLCameraObject extends GLObject implements SurfaceTexture.OnFrameAv
         int positionLocation = glGetAttribLocation(mProgram, "position");
         int transformLocation = glGetUniformLocation(mProgram, "transformMatrix");
         int textureLocation = glGetUniformLocation(mProgram, "cameraTexture");
+        int projectionLocation = glGetUniformLocation(mProgram, "projectionMatrix");
 
         // setup objects on the first frame
         if (mTextureWidth == -1) {
@@ -242,6 +257,9 @@ public class GLCameraObject extends GLObject implements SurfaceTexture.OnFrameAv
           glBindTexture(GL_TEXTURE_EXTERNAL_OES, mExtTexture);
           glUniform1i(textureLocation, prevActiveTexture[0] - GL_TEXTURE0);
           glUniformMatrix4fv(transformLocation, 1, false, transformMatrix, 0);
+          glUniformMatrix4fv(projectionLocation, 1, false, projectionMatrix, 0);
+          glUniform1i(textureLocation, prevActiveTexture[0] - GL_TEXTURE0);
+          glUniformMatrix4fv(transformLocation, 1, false, transformMatrix, 0);
 
           // change viewport to fit the texture and draw
           glViewport(0, 0, mTextureWidth, mTextureHeight);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gl",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "description": "Provides GLView that acts as OpenGL ES render target and gives GL context object implementing WebGL 2.0 specification.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -57,5 +57,5 @@
       "optional": true
     }
   },
-  "gitHead": "986a4689b91f3efc527f7178a320b987c0005842"
+  "gitHead": "0a0c6d35a691fc59c0d94675d159ac9e3dfd6f26"
 }