feat: more work on multiple views/swapchains

thermion_dart/native/src/FilamentViewer.cpp

@@ -677,7 +677,7 @@ namespace thermion_filament
     }
     else
     {
-      Log("Created headless swapchain.");
+      Log("Created headless swapchain %dx%d.", width, height);
       swapChain = _engine->createSwapChain(width, height, filament::backend::SWAP_CHAIN_CONFIG_TRANSPARENT | filament::backend::SWAP_CHAIN_CONFIG_READABLE | filament::SwapChain::CONFIG_HAS_STENCIL_BUFFER);
     }
 #endif
@@ -1135,12 +1135,24 @@ namespace thermion_filament
   void FilamentViewer::capture(View *view, uint8_t *out, bool useFence, SwapChain *swapChain, RenderTarget *renderTarget, void (*onComplete)())
   {
 
-    if (!renderTarget)
-    {
-      Log("NO SWAPCHAIN");
+    if (!(renderTarget || swapChain)) {
+      Log("NO RENDER TARGET OR SWAPCHAIN");
       return;
     }
 
+    if(swapChain && !_engine->isValid(swapChain)) {
+      Log("SWAPCHAIN PROVIDED BUT NOT VALID");
+      return;
+    }
+
+    int i =0 ;
+    for(auto sc : _swapChains) {
+      if(sc == swapChain) {
+        Log("Using swapchain at index %d", i);
+      }
+      i++;
+    }
+
     Viewport const &vp = view->getViewport();
     size_t pixelBufferSize = vp.width * vp.height * 4;
     auto *pixelBuffer = new uint8_t[pixelBufferSize];

thermion_dart/native/src/SceneManager.cpp

@@ -528,13 +528,18 @@ namespace thermion_filament
                                    asset.second->getLightEntityCount());
             _assetLoader->destroyAsset(asset.second);
         }
-        for(auto* texture : _textures) {
+        for(auto *texture : _textures) {
             _engine->destroy(texture);
         }
 
+        for(auto *materialInstance : _materialInstances) {
+            _engine->destroy(materialInstance);
+        }
+
         // TODO - free geometry?
         _textures.clear();
         _assets.clear();
+        _materialInstances.clear();
     }
 
     FilamentInstance *SceneManager::getInstanceByEntityId(EntityId entityId)
@@ -2453,6 +2458,7 @@ EntityId SceneManager::createGeometry(
         }
         materialInstance->setParameter("baseColorFactor", RgbaType::sRGB, filament::math::float4{1.0f, 0.0f, 1.0f, 1.0f});
         materialInstance->setParameter("baseColorIndex", 0);
+        _materialInstances.push_back(materialInstance);
         return materialInstance;
     }
 
@@ -2460,6 +2466,7 @@ EntityId SceneManager::createGeometry(
         UvMap uvmap;
         auto instance = _unlitMaterialProvider->createMaterialInstance(nullptr, &uvmap);
         instance->setParameter("uvScale", filament::math::float2 { 1.0f, 1.0f });
+        _materialInstances.push_back(instance);
         return instance;
     }
 

thermion_dart/native/src/TView.cpp

@@ -1,27 +1,33 @@
-#ifdef _WIN32
-#pragma comment(lib, "Shlwapi.lib")
-#pragma comment(lib, "opengl32.lib")
-#endif
-
-#include "ResourceBuffer.hpp"
-#include "FilamentViewer.hpp"
-#include "filament/LightManager.h"
-#include "Log.hpp"
-#include "ThreadPool.hpp"
-
-#include <thread>
-#include <functional>
-
-#ifdef __EMSCRIPTEN__
-#include <emscripten/emscripten.h>
-#endif
-
-using namespace thermion_filament;
-
-extern "C"
-{
+#include <filament/View.h>
+#include <filament/Viewport.h>
+#include <filament/Engine.h>
+#include <filament/ToneMapper.h>
+#include <filament/ColorGrading.h>
 
 #include "ThermionDartApi.h"
+#include "TView.h"
+#include "Log.hpp"
+
+
+#ifdef __cplusplus
+namespace thermion {
+extern "C"
+{
+using namespace filament;
+
+#endif
+
+    EMSCRIPTEN_KEEPALIVE TViewport View_getViewport(TView *tView)
+    {
+        auto view = reinterpret_cast<View *>(tView);
+        auto & vp = view->getViewport();
+        TViewport tvp;
+        tvp.left = vp.left;
+        tvp.bottom = vp.bottom;
+        tvp.width = vp.width;
+        tvp.height = vp.height;
+        return tvp;
+    }
 
     EMSCRIPTEN_KEEPALIVE void View_updateViewport(TView *tView, uint32_t width, uint32_t height)
     {
@@ -54,10 +60,10 @@ extern "C"
         view->setShadowingEnabled(enabled);
     }
 
-    EMSCRIPTEN_KEEPALIVE void View_setShadowType(TView *tView, ShadowType shadowType)
+    EMSCRIPTEN_KEEPALIVE void View_setShadowType(TView *tView, int shadowType)
     {
         auto view = reinterpret_cast<View *>(tView);
-        view->setShadowType(shadowType);
+        view->setShadowType((ShadowType)shadowType);
     }
 
     EMSCRIPTEN_KEEPALIVE void View_setSoftShadowOptions(TView *tView, float penumbraScale, float penumbraRatioScale)
@@ -80,7 +86,7 @@ extern "C"
 #endif
     }
 
-    EMSCRIPTEN_KEEPALIVE void View_setToneMapping(TView *tView, TEngine *tEngine, int toneMapping)
+    EMSCRIPTEN_KEEPALIVE void View_setToneMapping(TView *tView, TEngine *tEngine, ToneMapping toneMapping)
     {
         auto view = reinterpret_cast<View *>(tView);
         auto engine = reinterpret_cast<Engine *>(tEngine);
@@ -139,4 +145,8 @@ extern "C"
         view->setCamera(camera);
     }
 
-}
+
+#ifdef __cplusplus
+}
+}
+#endif