Windows embedder fixes

2024-10-14 11:23:56 +11:00
parent 1135ba054c
commit f9468db266
11 changed files with 91 additions and 59 deletions
--- a/thermion_dart/hook/build.dart
+++ b/thermion_dart/hook/build.dart
@@ -32,18 +32,14 @@ void main(List<String> args) async {
      final name = "thermion_dart.dart";
      final libUri = config.outputDirectory
          .resolve(config.targetOS.libraryFileName(name, linkMode));
-      output.addAsset(
-        
-          NativeCodeAsset(
-            package: config.packageName,
-            name: name,
-            file: libUri,
-            linkMode: linkMode,
-            os: config.targetOS,
-            architecture: config.dryRun ? null : config.targetArchitecture,
-          )
-        
-      );
+      output.addAsset(NativeCodeAsset(
+        package: config.packageName,
+        name: name,
+        file: libUri,
+        linkMode: linkMode,
+        os: config.targetOS,
+        architecture: config.dryRun ? null : config.targetArchitecture,
+      ));
      return;
    }

@@ -91,7 +87,6 @@ void main(List<String> args) async {
      "basis_transcoder"
    ];

-
    if (platform == "windows") {
      libDir = Directory(libDir).uri.toFilePath();
      libs = libs.map((lib) => "${libDir}${lib}.lib").toList();
@@ -117,7 +112,12 @@ void main(List<String> args) async {
      defines["WIN32"] = "1";
      defines["_DEBUG"] = "1";
      defines["_DLL"] = "1";
-      flags.addAll(["/std:c++20", "/MDd",  "/VERBOSE", ...defines.keys.map((k) => "/D$k=${defines[k]}").toList()]);
+      flags.addAll([
+        "/std:c++20",
+        "/MDd",
+        "/VERBOSE",
+        ...defines.keys.map((k) => "/D$k=${defines[k]}").toList()
+      ]);
    }

    if (platform == "ios") {
@@ -148,24 +148,23 @@ void main(List<String> args) async {
      name: packageName,
      language: Language.cpp,
      assetName: 'thermion_dart.dart',
-      sources:         platform == "windows" ? [] :
-sources,
-      includes: platform == "windows"? [] :  ['native/include', 'native/include/filament'],
+      sources: platform == "windows" ? [] : sources,
+      includes: platform == "windows"
+          ? []
+          : ['native/include', 'native/include/filament'],
      defines: platform == "windows" ? {} : defines,
      flags: [
        if (platform == "macos") '-mmacosx-version-min=13.0',
        if (platform == "ios") '-mios-version-min=13.0',
        ...flags,
        ...frameworks,
-        if (platform != "windows") 
-        ...libs.map((lib) => "-l$lib"),
-        if (platform != "windows") 
-        "-L$libDir",
-        if(platform == "windows") 
-        ...[
-          "/I${config.packageRoot.toFilePath()}\\native\\include", "/I${config.packageRoot.toFilePath()}native\\include\\filament",
+        if (platform != "windows") ...libs.map((lib) => "-l$lib"),
+        if (platform != "windows") "-L$libDir",
+        if (platform == "windows") ...[
+          "/I${config.packageRoot.toFilePath()}\\native\\include",
+          "/I${config.packageRoot.toFilePath()}native\\include\\filament",
          ...sources,
-          '/link', 
+          '/link',
          "/LIBPATH:$libDir",
          '/DLL',
        ]
@@ -187,17 +186,24 @@ sources,
          Architecture.ia32 => "i686-linux-android",
          _ => throw FormatException('Invalid')
        };
-          
+
        var compilerPath = config.cCompiler.compiler!.path;
-        
-        if(Platform.isWindows && compilerPath.startsWith("/")) {
+
+        if (Platform.isWindows && compilerPath.startsWith("/")) {
          compilerPath = compilerPath.substring(1);
        }
-        
-        var ndkRoot = File(compilerPath).parent.parent.uri.toFilePath(windows:true);

-        var stlPath =
-            File([ndkRoot, "sysroot", "usr", "lib", archExtension, "libc++_shared.so"].join(Platform.pathSeparator));
+        var ndkRoot =
+            File(compilerPath).parent.parent.uri.toFilePath(windows: true);
+
+        var stlPath = File([
+          ndkRoot,
+          "sysroot",
+          "usr",
+          "lib",
+          archExtension,
+          "libc++_shared.so"
+        ].join(Platform.pathSeparator));
        output.addAsset(NativeCodeAsset(
            package: "thermion_dart",
            name: "libc++_shared.so",
--- a/thermion_dart/lib/src/viewer/src/ffi/src/thermion_dart.g.dart
+++ b/thermion_dart/lib/src/viewer/src/ffi/src/thermion_dart.g.dart
@@ -142,6 +142,17 @@ external void Viewer_setViewRenderable(
  bool renderable,
 );

+@ffi.Native<
+    ffi.Void Function(ffi.Pointer<TViewer>, ffi.Pointer<ffi.Char>, ffi.Float,
+        ffi.Pointer<ffi.NativeFunction<ffi.Void Function()>>)>(isLeaf: true)
+external void Viewer_loadIblRenderThread(
+  ffi.Pointer<TViewer> viewer,
+  ffi.Pointer<ffi.Char> iblPath,
+  double intensity,
+  ffi.Pointer<ffi.NativeFunction<ffi.Void Function()>> onComplete,
+);
+
+
@ffi.Native<
    ffi.Void Function(
        ffi.Pointer<TViewer>,
--- a/thermion_dart/lib/src/viewer/src/ffi/src/thermion_viewer_ffi.dart
+++ b/thermion_dart/lib/src/viewer/src/ffi/src/thermion_viewer_ffi.dart
@@ -360,7 +360,12 @@ class ThermionViewerFFI extends ThermionViewer {
  Future loadIbl(String lightingPath, {double intensity = 30000}) async {
    final pathPtr =
        lightingPath.toNativeUtf8(allocator: allocator).cast<Char>();
-    load_ibl(_viewer!, pathPtr, intensity);
+
+    await withVoidCallback((cb) {
+      Viewer_loadIblRenderThread(_viewer!, pathPtr, intensity, cb);
+    });
+
+    
  }

  ///
--- a/thermion_dart/native/include/ThermionDartApi.h
+++ b/thermion_dart/native/include/ThermionDartApi.h
@@ -99,7 +99,7 @@ extern "C"
 	
 	
 	EMSCRIPTEN_KEEPALIVE void load_skybox(TViewer *viewer, const char *skyboxPath);
-	EMSCRIPTEN_KEEPALIVE void load_ibl(TViewer *viewer, const char *iblPath, float intensity);
+	EMSCRIPTEN_KEEPALIVE void Viewer_loadIbl(TViewer *viewer, const char *iblPath, float intensity);
 	EMSCRIPTEN_KEEPALIVE void create_ibl(TViewer *viewer, float r, float g, float b, float intensity);
 	EMSCRIPTEN_KEEPALIVE void rotate_ibl(TViewer *viewer, float *rotationMatrix);
 	EMSCRIPTEN_KEEPALIVE void remove_skybox(TViewer *viewer);
--- a/thermion_dart/native/include/ThermionDartRenderThreadApi.h
+++ b/thermion_dart/native/include/ThermionDartRenderThreadApi.h
@@ -34,7 +34,7 @@ extern "C"
    EMSCRIPTEN_KEEPALIVE void Viewer_captureRenderThread(TViewer *viewer, TView* view,  TSwapChain* swapChain, uint8_t* out, void (*onComplete)());
    EMSCRIPTEN_KEEPALIVE void Viewer_captureRenderTargetRenderThread(TViewer *viewer, TView* view,  TSwapChain* swapChain, TRenderTarget* renderTarget, uint8_t* out, void (*onComplete)());
    EMSCRIPTEN_KEEPALIVE void Viewer_requestFrameRenderThread(TViewer *viewer, void(*onComplete)());
-
+    EMSCRIPTEN_KEEPALIVE void Viewer_loadIblRenderThread(TViewer *viewer, const char *iblPath, float intensity, void(*onComplete)());
    EMSCRIPTEN_KEEPALIVE void View_setToneMappingRenderThread(TView *tView, TEngine *tEngine, thermion::ToneMapping toneMapping);
    EMSCRIPTEN_KEEPALIVE void View_setBloomRenderThread(TView *tView, double bloom);

--- a/thermion_dart/native/src/ThermionDartApi.cpp
+++ b/thermion_dart/native/src/ThermionDartApi.cpp
@@ -92,7 +92,7 @@ extern "C"
        ((FilamentViewer *)viewer)->createIbl(r, g, b, intensity);
    }

-    EMSCRIPTEN_KEEPALIVE void load_ibl(TViewer *viewer, const char *iblPath, float intensity)
+    EMSCRIPTEN_KEEPALIVE void Viewer_loadIbl(TViewer *viewer, const char *iblPath, float intensity)
    {
        ((FilamentViewer *)viewer)->loadIbl(iblPath, intensity);
    }
--- a/thermion_dart/native/src/ThermionDartRenderThreadApi.cpp
+++ b/thermion_dart/native/src/ThermionDartRenderThreadApi.cpp
@@ -258,6 +258,16 @@ extern "C"
    }
  }

+  EMSCRIPTEN_KEEPALIVE void Viewer_loadIblRenderThread(TViewer *viewer, const char *iblPath, float intensity, void(*onComplete)()) { 
+      std::packaged_task<void()> lambda(
+        [=]() mutable
+        {
+          Viewer_loadIbl(viewer, iblPath, intensity);
+          onComplete();
+        });
+      auto fut = _rl->add_task(lambda);
+  }
+
  EMSCRIPTEN_KEEPALIVE void
  set_frame_interval_render_thread(TViewer *viewer, float frameIntervalInMilliseconds)
  {
@@ -391,15 +401,6 @@ extern "C"
                                      });
    auto fut = _rl->add_task(lambda);
  }
-
-  EMSCRIPTEN_KEEPALIVE void load_ibl_render_thread(TViewer *viewer, const char *iblPath,
-                                                   float intensity)
-  {
-    std::packaged_task<void()> lambda(
-        [=]
-        { load_ibl(viewer, iblPath, intensity); });
-    auto fut = _rl->add_task(lambda);
-  }
  
  EMSCRIPTEN_KEEPALIVE void remove_skybox_render_thread(TViewer *viewer)
  {