Skip to content

Commit bb5ba27

Browse files
Attempt to fix JS bindings
1 parent 4d3e63e commit bb5ba27

File tree

7 files changed

+11
-6
lines changed

7 files changed

+11
-6
lines changed

source/JsMaterialX/JsMaterialXGenEssl/JsEsslShaderGenerator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace mx = MaterialX;
1414
EMSCRIPTEN_BINDINGS(EsslShaderGenerator)
1515
{
1616
ems::class_<mx::EsslShaderGenerator, ems::base<mx::HwShaderGenerator>>("EsslShaderGenerator")
17-
.smart_ptr_constructor("EsslShaderGenerator", &std::make_shared<mx::EsslShaderGenerator, mx::TypeSystemPtr>)
17+
.constructor<mx::TypeSystemPtr>()
1818
BIND_CLASS_FUNC("create", mx::EsslShaderGenerator, create, 0, 1, mx::TypeSystemPtr)
1919
;
2020
}

source/JsMaterialX/JsMaterialXGenGlsl/JsGlslShaderGenerator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace mx = MaterialX;
1414
EMSCRIPTEN_BINDINGS(GlslShaderGenerator)
1515
{
1616
ems::class_<mx::GlslShaderGenerator, ems::base<mx::ShaderGenerator>>("GlslShaderGenerator")
17-
.smart_ptr_constructor("GlslShaderGenerator", &std::make_shared<mx::GlslShaderGenerator, mx::TypeSystemPtr>)
17+
.constructor<mx::TypeSystemPtr>()
1818
BIND_CLASS_FUNC("create", mx::GlslShaderGenerator, create, 0, 1, mx::TypeSystemPtr)
1919
;
2020
}

source/JsMaterialX/JsMaterialXGenMdl/JsMdlShaderGenerator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace mx = MaterialX;
1414
EMSCRIPTEN_BINDINGS(MdlShaderGenerator)
1515
{
1616
ems::class_<mx::MdlShaderGenerator, ems::base<mx::ShaderGenerator>>("MdlShaderGenerator")
17-
.smart_ptr_constructor("MdlShaderGenerator", &std::make_shared<mx::MdlShaderGenerator, mx::TypeSystemPtr>)
17+
.constructor<mx::TypeSystemPtr>()
1818
BIND_CLASS_FUNC("create", mx::MdlShaderGenerator, create, 0, 1, mx::TypeSystemPtr)
1919
;
2020
}

source/JsMaterialX/JsMaterialXGenMsl/JsMslShaderGenerator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace mx = MaterialX;
1414
EMSCRIPTEN_BINDINGS(MslShaderGenerator)
1515
{
1616
ems::class_<mx::MslShaderGenerator, ems::base<mx::ShaderGenerator>>("MslShaderGenerator")
17-
.smart_ptr_constructor("MslShaderGenerator", &std::make_shared<mx::MslShaderGenerator, mx::TypeSystemPtr>)
17+
.constructor<mx::TypeSystemPtr>()
1818
BIND_CLASS_FUNC("create", mx::MslShaderGenerator, create, 0, 1, mx::TypeSystemPtr)
1919
;
2020
}

source/JsMaterialX/JsMaterialXGenOsl/JsOslShaderGenerator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace mx = MaterialX;
1414
EMSCRIPTEN_BINDINGS(OslShaderGenerator)
1515
{
1616
ems::class_<mx::OslShaderGenerator, ems::base<mx::ShaderGenerator>>("OslShaderGenerator")
17-
.smart_ptr_constructor("OslShaderGenerator", &std::make_shared<mx::OslShaderGenerator, mx::TypeSystemPtr>)
17+
.constructor<mx::TypeSystemPtr>()
1818
BIND_CLASS_FUNC("create", mx::OslShaderGenerator, create, 0, 1, mx::TypeSystemPtr)
1919
;
2020
}

source/JsMaterialX/JsMaterialXGenShader/JsTypeDesc.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,9 @@ EMSCRIPTEN_BINDINGS(TypeDesc)
2727
.function("isAggregate", &mx::TypeDesc::isAggregate)
2828
.function("getName", &mx::TypeDesc::getName)
2929
;
30+
31+
ems::class_<mx::TypeSystem>("TypeSystem")
32+
.smart_ptr<std::shared_ptr<mx::TypeSystem>>("TypeSystemPtr")
33+
.class_function("create", &mx::TypeSystem::create)
34+
;
3035
}

source/JsMaterialX/JsMaterialXGenVk/JsVkShaderGenerator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace mx = MaterialX;
1414
EMSCRIPTEN_BINDINGS(VkShaderGenerator)
1515
{
1616
ems::class_<mx::VkShaderGenerator, ems::base<mx::ShaderGenerator>>("VkShaderGenerator")
17-
.smart_ptr_constructor("VkShaderGenerator", &std::make_shared<mx::VkShaderGenerator, mx::TypeSystemPtr>)
17+
.constructor<mx::TypeSystemPtr>()
1818
BIND_CLASS_FUNC("create", mx::VkShaderGenerator, create, 0, 1, mx::TypeSystemPtr)
1919
;
2020
}

0 commit comments

Comments
 (0)