Bridge filament basic render infrastructure

.gitignore

@@ -1,3 +1,4 @@
 # OSX
 #
 .DS_Store
+.vscode

package/android/CMakeLists.txt

@@ -17,6 +17,7 @@ find_library(LOG_LIB log)
 add_library(
         ${PACKAGE_NAME}
         SHARED
+
         # Shared C++
         ../cpp/FilamentView.cpp
         ../cpp/FilamentProxy.cpp
@@ -26,8 +27,20 @@ add_library(
         ../cpp/Listener.cpp
         ../cpp/jsi/HybridObject.cpp
         ../cpp/jsi/Promise.cpp
-        ../cpp/core/EngineWrapper.cpp
         ../cpp/test/TestHybridObject.cpp
+
+        # Filament Core
+        ../cpp/core/EngineWrapper.cpp
+        ../cpp/core/RendererWrapper.cpp
+        ../cpp/core/SceneWrapper.cpp
+        ../cpp/core/CameraWrapper.cpp
+        ../cpp/core/ViewWrapper.cpp
+        ../cpp/core/SwapChainWrapper.cpp
+
+        # Filament Utils
+        ../cpp/core/utils/EntityWrapper.cpp
+        ../cpp/core/utils/ManipulatorWrapper.cpp
+
         # Java JNI
         src/main/cpp/AndroidFilamentProxy.cpp
         src/main/cpp/AndroidSurface.cpp
@@ -56,19 +69,20 @@ target_include_directories(
 # Link everything together
 target_link_libraries(
         ${PACKAGE_NAME}
-        ${LOG_LIB}                          # <-- Logcat logger
-        android                             # <-- Android JNI core
-        ReactAndroid::jsi                   # <-- RN: JSI
-        ReactAndroid::reactnativejni        # <-- RN: React Native JNI bindings
-        fbjni::fbjni                        # <-- fbjni
-        GLESv3                              # <-- OpenGL (Core)
-        EGL                                 # <-- OpenGL (EGL)
+        ${LOG_LIB} # <-- Logcat logger
+        android # <-- Android JNI core
+        ReactAndroid::jsi # <-- RN: JSI
+        ReactAndroid::reactnativejni # <-- RN: React Native JNI bindings
+        fbjni::fbjni # <-- fbjni
+        GLESv3 # <-- OpenGL (Core)
+        EGL # <-- OpenGL (EGL)
 )
 
 # Filament (local CMake project as a git submodule)
 message("RN Filament: Adding pre-compiled libraries in ${FILAMENT_DIR}...")
 file(GLOB FILAMENT_LIBRARIES "${FILAMENT_DIR}/lib/${ANDROID_ABI}/*.a")
+
 foreach(file ${FILAMENT_LIBRARIES})
-    message("RN Filament: Linking ${file}...")
-    target_link_libraries(${PACKAGE_NAME} ${file})
+        message("RN Filament: Linking ${file}...")
+        target_link_libraries(${PACKAGE_NAME} ${file})
 endforeach()

package/android/src/main/java/com/margelo/filament/FilamentView.java

@@ -6,6 +6,7 @@
 import android.content.Context;
 import android.util.AttributeSet;
 
+import android.view.Choreographer;
 import android.view.SurfaceView;
 import android.view.View;
 
@@ -22,16 +23,26 @@ public class FilamentView extends SurfaceView {
   public FilamentView(Context context) {
     super(context);
     mHybridData = initHybrid(new SurfaceProvider(getHolder()));
+    setupView();
   }
 
   public FilamentView(Context context, @Nullable AttributeSet attrs) {
     super(context, attrs);
     mHybridData = initHybrid(new SurfaceProvider(getHolder()));
+    setupView();
   }
 
   public FilamentView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
     mHybridData = initHybrid(new SurfaceProvider(getHolder()));
+    setupView();
+  }
+
+  public void setupView() {
+    // Support transparent background
+    this.setZOrderOnTop(true);
+    // Disable overflow
+    this.setClipToOutline(true);
   }
 
   private native HybridData initHybrid(SurfaceProvider surfaceProvider);

package/android/src/main/java/com/margelo/filament/SurfaceProvider.java

@@ -1,5 +1,7 @@
 package com.margelo.filament;
 
+import android.graphics.PixelFormat;
+import android.view.Choreographer;
 import android.view.SurfaceHolder;
 
 import androidx.annotation.Keep;
@@ -17,6 +19,8 @@ public class SurfaceProvider {
 
     SurfaceProvider(SurfaceHolder holder) {
         mHybridData = initHybrid();
+        // Support transparent background
+        holder.setFormat(PixelFormat.TRANSLUCENT);
         holder.addCallback(new SurfaceHolder.Callback() {
             @Override
             public void surfaceCreated(@NonNull SurfaceHolder surfaceHolder) {

package/cpp/FilamentProxy.cpp

@@ -14,15 +14,20 @@ namespace margelo {
 
 using namespace facebook;
 
-std::shared_ptr<TestHybridObject> FilamentProxy::createTestObject() {
-  return std::make_shared<TestHybridObject>();
-}
-
 void FilamentProxy::loadHybridMethods() {
   registerHybridMethod("loadModel", &FilamentProxy::loadModel, this);
   registerHybridMethod("findFilamentView", &FilamentProxy::findFilamentView, this);
   registerHybridMethod("createTestObject", &FilamentProxy::createTestObject, this);
+  registerHybridMethod("createEngine", &FilamentProxy::createEngine, this);
   registerHybridMethod("createChoreographer", &FilamentProxy::createChoreographer, this);
 }
 
+std::shared_ptr<TestHybridObject> FilamentProxy::createTestObject() {
+  return std::make_shared<TestHybridObject>();
+}
+
+std::shared_ptr<EngineWrapper> FilamentProxy::createEngine() {
+  return std::make_shared<EngineWrapper>(createChoreographer());
+}
+
 } // namespace margelo

package/cpp/FilamentProxy.h

@@ -4,6 +4,9 @@
 
 #pragma once
 
+#include <jsi/jsi.h>
+
+#include <core/EngineWrapper.h>
 #include <string>
 #include <vector>
 
@@ -24,8 +27,12 @@ class FilamentProxy : public HybridObject {
   virtual std::shared_ptr<FilamentView> findFilamentView(int id) = 0;
   virtual std::shared_ptr<Choreographer> createChoreographer() = 0;
 
+  // For testing
   std::shared_ptr<TestHybridObject> createTestObject();
 
+  // Public API
+  std::shared_ptr<EngineWrapper> createEngine();
+
 public:
   virtual jsi::Runtime& getRuntime() = 0;
   virtual std::shared_ptr<react::CallInvoker> getCallInvoker() = 0;

package/cpp/SurfaceProvider.h

@@ -38,6 +38,7 @@ class SurfaceProvider : public HybridObject {
   void onSurfaceCreated(std::shared_ptr<Surface> surface);
   void onSurfaceChanged(std::shared_ptr<Surface> surface, int width, int height);
   void onSurfaceDestroyed(std::shared_ptr<Surface> surface);
+  void render(float frameTimeNanos);
 
 private:
   ListenerManager<Callback> _listeners;

package/cpp/core/CameraWrapper.cpp

@@ -0,0 +1,15 @@
+#include "CameraWrapper.h"
+
+void margelo::CameraWrapper::loadHybridMethods() {
+  registerHybridMethod("lookAt", &CameraWrapper::lookAt, this);
+}
+
+void margelo::CameraWrapper::lookAt(std::shared_ptr<ManipulatorWrapper> cameraManipulator) {
+  if (!cameraManipulator) {
+    throw std::invalid_argument("CameraManipulator is null");
+  }
+
+  math::float3 eye, center, up;
+  cameraManipulator->getManipulator()->getLookAt(&eye, &center, &up);
+  _camera->lookAt({eye[0], eye[1], eye[2]}, {center[0], center[1], center[2]}, {up[0], up[1], up[2]});
+}

package/cpp/core/CameraWrapper.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include "jsi/HybridObject.h"
+
+#include "utils/ManipulatorWrapper.h"
+#include <filament/Camera.h>
+
+namespace margelo {
+using namespace filament;
+
+class CameraWrapper : public HybridObject {
+public:
+  explicit CameraWrapper(const std::shared_ptr<Camera>& camera) : _camera(std::move(camera)) {}
+
+  void loadHybridMethods() override;
+
+  const std::shared_ptr<Camera>& getCamera() {
+    return _camera;
+  }
+
+private:
+  std::shared_ptr<Camera> _camera;
+
+private:
+  // Convenience methods
+  void lookAt(std::shared_ptr<ManipulatorWrapper> cameraManipulator);
+};
+} // namespace margelo