fixed unit registry creation in js bindings (#1272)

autodesk-forks · Jul 14, 2021 · d9420ea · d9420ea
1 parent 18fefa8
commit d9420ea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/source/JsMaterialX/JsMaterialXCore/JsUnit.cpp b/source/JsMaterialX/JsMaterialXCore/JsUnit.cpp
@@ -13,6 +13,9 @@
 namespace ems = emscripten;
 namespace mx = MaterialX;
 
+// The following 3 functions should not be necessary, but due to unexpected behaviour of emscripten,
+// it reports signature mismatches if the functions are bound directly
+
 mx::LinearUnitConverterPtr LinearUnitConverterCreate(mx::UnitTypeDefPtr unitTypeDef) {
     return mx::LinearUnitConverter::create(unitTypeDef);
 }
@@ -21,6 +24,10 @@ mx::UnitConverterPtr UnitConverterRegistryGetUnitConverter(mx::UnitConverterRegi
     return registry.getUnitConverter(def);
 }
 
+mx::UnitConverterRegistryPtr UnitConverterRegistrycreate() {
+    return mx::UnitConverterRegistry::create();
+}
+
 EMSCRIPTEN_BINDINGS(unit)
 {
 
@@ -53,7 +60,7 @@ EMSCRIPTEN_BINDINGS(unit)
     ems::class_<mx::UnitConverterRegistry>("UnitConverterRegistry")
         .smart_ptr<std::shared_ptr<mx::UnitConverterRegistry>>("UnitConverterRegistry")
         .smart_ptr<std::shared_ptr<const mx::UnitConverterRegistry>>("UnitConverterRegistry")
-        .class_function("create", &mx::UnitConverterRegistry::create)
+        .class_function("create", &UnitConverterRegistrycreate)
         .function("addUnitConverter", &mx::UnitConverterRegistry::addUnitConverter)
         .function("removeUnitConverter", &mx::UnitConverterRegistry::removeUnitConverter)
         .function("getUnitConverter", &UnitConverterRegistryGetUnitConverter)

diff --git a/source/JsMaterialX/JsMaterialXGenShader/JsGenContext.cpp b/source/JsMaterialX/JsMaterialXGenShader/JsGenContext.cpp
@@ -5,6 +5,7 @@
 
 #include "../Helpers.h"
 
+#include <MaterialXCore/Unit.h>
 #include <MaterialXGenShader/GenContext.h>
 #include <MaterialXGenShader/ShaderGenerator.h>
 #include <MaterialXGenShader/DefaultColorManagementSystem.h>
@@ -50,7 +51,7 @@ mx::DocumentPtr loadStandardLibraries(mx::GenContext& context)
     mx::DocumentPtr stdLib;
     mx::LinearUnitConverterPtr _distanceUnitConverter;
     mx::StringVec _distanceUnitOptions;
-    mx::UnitConverterRegistryPtr unitRegistry;
+    mx::UnitConverterRegistryPtr unitRegistry(mx::UnitConverterRegistry::create());
     mx::FilePathVec libraryFolders = { "libraries" };
     mx::FileSearchPath searchPath;
     searchPath.append("/");