expo-gl 12.2.0 → 12.3.0

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 12.3.0 — 2023-02-03
+
+### 🎉 New features
+
+- Migrated the view manager to the new Expo modules API and thus added support for Fabric on Android. ([#20749](https://github.com/expo/expo/pull/20749) by [@lukmccall](https://github.com/lukmccall))
+
+### 💡 Others
+
+- On Android bump `compileSdkVersion` and `targetSdkVersion` to `33`. ([#20721](https://github.com/expo/expo/pull/20721) by [@lukmccall](https://github.com/lukmccall))
+
 ## 12.2.0 — 2022-12-30
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '12.2.0'
+version = '12.3.0'
 
 def REACT_NATIVE_BUILD_FROM_SOURCE = findProject(":ReactAndroid") != null
 def REACT_NATIVE_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
@@ -81,7 +81,7 @@ afterEvaluate {
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 31)
+  compileSdkVersion safeExtGet("compileSdkVersion", 33)
 
   if (rootProject.hasProperty("ndkPath")) {
     ndkPath rootProject.ext.ndkPath
@@ -101,9 +101,9 @@ android {
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 31)
+    targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 31
-    versionName "12.2.0"
+    versionName "12.3.0"
 
     externalNativeBuild {
       cmake {

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

@@ -7,16 +7,10 @@ import java.util.List;
 
 import expo.modules.core.ExportedModule;
 import expo.modules.core.BasePackage;
-import expo.modules.core.ViewManager;
 
 public class GLPackage extends BasePackage {
   @Override
   public List<ExportedModule> createExportedModules(Context context) {
     return Collections.singletonList((ExportedModule) new GLObjectManagerModule(context));
   }
-
-  @Override
-  public List<ViewManager> createViewManagers(Context context) {
-    return Collections.singletonList((ViewManager) new GLViewManager());
-  }
 }

package/android/src/main/java/expo/modules/gl/GLView.kt

@@ -0,0 +1,85 @@
+package expo.modules.gl
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.SurfaceTexture
+import android.view.TextureView
+import android.view.TextureView.SurfaceTextureListener
+import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
+import expo.modules.kotlin.viewevent.EventDispatcher
+
+data class OnSurfaceCreateRecord(
+  @Field val exglCtxId: Int
+) : Record
+
+@SuppressLint("ViewConstructor")
+class GLView(context: Context, appContext: AppContext) : TextureView(context), SurfaceTextureListener {
+  private var onSurfaceCreateWasCalled = false
+  private var onSurfaceTextureWasCalledWithZeroSize = false
+  private var glContext = GLContext(
+    appContext
+      .legacyModuleRegistry
+      .getExportedModuleOfClass(GLObjectManagerModule::class.java) as GLObjectManagerModule
+  )
+
+  private val exglContextId: Int
+    get() = glContext.contextId
+
+  val onSurfaceCreate by EventDispatcher<OnSurfaceCreateRecord>()
+
+  init {
+    surfaceTextureListener = this
+    isOpaque = false
+  }
+
+  // Public interface to allow running events on GL thread
+  fun runOnGLThread(r: Runnable?) {
+    glContext.runAsync(r)
+  }
+
+  // `TextureView.SurfaceTextureListener` events
+  @Synchronized
+  override fun onSurfaceTextureAvailable(surfaceTexture: SurfaceTexture, width: Int, height: Int) {
+    if (!onSurfaceCreateWasCalled) {
+      // onSurfaceTextureAvailable is sometimes called with 0 size texture
+      // and immediately followed by onSurfaceTextureSizeChanged with actual size
+      if (width == 0 || height == 0) {
+        onSurfaceTextureWasCalledWithZeroSize = true
+      }
+      if (!onSurfaceTextureWasCalledWithZeroSize) {
+        initializeSurfaceInGLContext(surfaceTexture)
+      }
+      onSurfaceCreateWasCalled = true
+    }
+  }
+
+  override fun onSurfaceTextureDestroyed(surface: SurfaceTexture): Boolean {
+    glContext.destroy()
+
+    // reset flag, so the context will be recreated when the new surface is available
+    onSurfaceCreateWasCalled = false
+    return true
+  }
+
+  @Synchronized
+  override fun onSurfaceTextureSizeChanged(surfaceTexture: SurfaceTexture, width: Int, height: Int) {
+    if (onSurfaceTextureWasCalledWithZeroSize && (width != 0 || height != 0)) {
+      initializeSurfaceInGLContext(surfaceTexture)
+      onSurfaceTextureWasCalledWithZeroSize = false
+    }
+  }
+
+  override fun onSurfaceTextureUpdated(surface: SurfaceTexture) = Unit
+
+  fun flush() {
+    glContext.flush()
+  }
+
+  private fun initializeSurfaceInGLContext(surfaceTexture: SurfaceTexture) {
+    glContext.initialize(surfaceTexture) {
+      onSurfaceCreate(OnSurfaceCreateRecord(exglContextId))
+    }
+  }
+}

package/android/src/main/java/expo/modules/gl/GLViewModule.kt

@@ -0,0 +1,14 @@
+package expo.modules.gl
+
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+
+class GLViewModule : Module() {
+  override fun definition() = ModuleDefinition {
+    Name("ExponentGLView")
+
+    View(GLView::class) {
+      Events("onSurfaceCreate")
+    }
+  }
+}

package/expo-module.config.json

@@ -4,5 +4,8 @@
   "ios": {
     "podspecPath": "./ExpoGL.podspec",
     "modules": ["GLViewModule"]
+  },
+  "android": {
+    "modules": ["expo.modules.gl.GLViewModule"]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gl",
-  "version": "12.2.0",
+  "version": "12.3.0",
   "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",
@@ -44,10 +44,10 @@
     "@types/offscreencanvas": "2019.6.4",
     "@types/webgl2": "^0.0.6",
     "expo-module-scripts": "^3.0.0",
-    "react-test-renderer": "~18.1.0"
+    "react-test-renderer": "18.2.0"
   },
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "ba80e8181b79d06e00a245653727f4eaeb80420e"
+  "gitHead": "1815e2eaad8c753588c7b1eb74420174a28e01f4"
 }

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

@@ -1,117 +0,0 @@
-package expo.modules.gl;
-
-import android.content.Context;
-import android.graphics.SurfaceTexture;
-import android.os.Bundle;
-import android.view.TextureView;
-
-import expo.modules.core.ModuleRegistry;
-import expo.modules.core.interfaces.services.EventEmitter;
-
-public class GLView extends TextureView implements TextureView.SurfaceTextureListener {
-  private boolean mOnSurfaceCreateCalled = false;
-  private boolean mOnSurfaceTextureCreatedWithZeroSize = false;
-
-  private GLContext mGLContext;
-  private ModuleRegistry mModuleRegistry;
-
-  // Suppresses ViewConstructor warnings
-  public GLView(Context context) {
-    super(context);
-  }
-
-  public GLView(Context context, ModuleRegistry moduleRegistry) {
-    super(context);
-    setSurfaceTextureListener(this);
-    setOpaque(false);
-
-    GLObjectManagerModule objectManager = (GLObjectManagerModule)moduleRegistry.getExportedModuleOfClass(GLObjectManagerModule.class);
-    mGLContext = new GLContext(objectManager);
-    mModuleRegistry = moduleRegistry;
-  }
-
-  // Public interface to allow running events on GL thread
-
-  public void runOnGLThread(Runnable r) {
-    mGLContext.runAsync(r);
-  }
-
-  public GLContext getGLContext() {
-    return mGLContext;
-  }
-
-
-  // `TextureView.SurfaceTextureListener` events
-
-  @Override
-  synchronized public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int width, int height) {
-    if (!mOnSurfaceCreateCalled) {
-      // onSurfaceTextureAvailable is sometimes called with 0 size texture
-      // and immediately followed by onSurfaceTextureSizeChanged with actual size
-      if (width == 0 || height == 0) {
-        mOnSurfaceTextureCreatedWithZeroSize = true;
-      }
-
-      if (!mOnSurfaceTextureCreatedWithZeroSize) {
-        initializeSurfaceInGLContext(surfaceTexture);
-      }
-
-      mOnSurfaceCreateCalled = true;
-    }
-  }
-
-  @Override
-  public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
-    mGLContext.destroy();
-
-    // reset flag, so the context will be recreated when the new surface is available
-    mOnSurfaceCreateCalled = false;
-
-    return true;
-  }
-
-  @Override
-  synchronized public void onSurfaceTextureSizeChanged(SurfaceTexture surfaceTexture, int width, int height) {
-    if (mOnSurfaceTextureCreatedWithZeroSize && (width != 0 || height != 0)) {
-      initializeSurfaceInGLContext(surfaceTexture);
-      mOnSurfaceTextureCreatedWithZeroSize = false;
-    }
-  }
-
-  @Override
-  public void onSurfaceTextureUpdated(SurfaceTexture surface) {
-  }
-
-  public void flush() {
-    mGLContext.flush();
-  }
-
-  public int getEXGLCtxId() {
-    return mGLContext.getContextId();
-  }
-
-  private void initializeSurfaceInGLContext(SurfaceTexture surfaceTexture) {
-    mGLContext.initialize(surfaceTexture, new Runnable() {
-      @Override
-      public void run() {
-        final Bundle event = new Bundle();
-        final EventEmitter eventEmitter = mModuleRegistry.getModule(EventEmitter.class);
-
-        event.putInt("exglCtxId", mGLContext.getContextId());
-
-        eventEmitter.emit(getId(), new EventEmitter.BaseEvent() {
-          @Override
-          public String getEventName() {
-            return "onSurfaceCreate";
-          }
-
-          @Override
-          public Bundle getEventBody() {
-            return event;
-          }
-        });
-      }
-    });
-  }
-}
-

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

@@ -1,38 +0,0 @@
-package expo.modules.gl;
-
-import android.content.Context;
-
-import java.util.Arrays;
-import java.util.List;
-
-import expo.modules.core.ModuleRegistry;
-import expo.modules.core.ViewManager;
-
-public class GLViewManager extends ViewManager<GLView> {
-  private ModuleRegistry mModuleRegistry;
-
-  @Override
-  public String getName() {
-    return "ExponentGLView";
-  }
-
-  @Override
-  public GLView createViewInstance(Context context) {
-    return new GLView(context, mModuleRegistry);
-  }
-
-  @Override
-  public ViewManagerType getViewManagerType() {
-    return ViewManagerType.SIMPLE;
-  }
-
-  @Override
-  public List<String> getExportedEventNames() {
-    return Arrays.asList("onSurfaceCreate");
-  }
-
-  @Override
-  public void onCreate(ModuleRegistry moduleRegistry) {
-    mModuleRegistry = moduleRegistry;
-  }
-}