diff --git a/source/JsMaterialX/JsMaterialXCore/JsDefinition.cpp b/source/JsMaterialX/JsMaterialXCore/JsDefinition.cpp index b86816ab08..0991c41901 100644 --- a/source/JsMaterialX/JsMaterialXCore/JsDefinition.cpp +++ b/source/JsMaterialX/JsMaterialXCore/JsDefinition.cpp @@ -30,7 +30,6 @@ EMSCRIPTEN_BINDINGS(definition) .function("getNodeGroup", &mx::NodeDef::getNodeGroup) BIND_MEMBER_FUNC("getImplementation", mx::NodeDef, getImplementation, 0, 1, stRef) .function("isVersionCompatible", &mx::NodeDef::isVersionCompatible) - BIND_MEMBER_FUNC("getDeclaration", mx::NodeDef, getDeclaration, 0, 1, stRef) .class_property("CATEGORY", &mx::NodeDef::CATEGORY) .class_property("NODE_ATTRIBUTE", &mx::NodeDef::NODE_ATTRIBUTE) .class_property("NODE_GROUP_ATTRIBUTE", &mx::NodeDef::NODE_GROUP_ATTRIBUTE) @@ -53,7 +52,6 @@ EMSCRIPTEN_BINDINGS(definition) .function("getFunction", &mx::Implementation::getFunction) .function("setNodeDef", &mx::Implementation::setNodeDef) .function("getNodeDef", &mx::Implementation::getNodeDef) - BIND_MEMBER_FUNC("getDeclaration", mx::Implementation, getDeclaration, 0, 1, stRef) .class_property("CATEGORY", &mx::Implementation::CATEGORY) .class_property("FILE_ATTRIBUTE", &mx::Implementation::FILE_ATTRIBUTE) .class_property("FUNCTION_ATTRIBUTE", &mx::Implementation::FUNCTION_ATTRIBUTE); diff --git a/source/JsMaterialX/JsMaterialXCore/JsInterface.cpp b/source/JsMaterialX/JsMaterialXCore/JsInterface.cpp index 24aa3c96ad..88b4394245 100644 --- a/source/JsMaterialX/JsMaterialXCore/JsInterface.cpp +++ b/source/JsMaterialX/JsMaterialXCore/JsInterface.cpp @@ -61,7 +61,6 @@ EMSCRIPTEN_BINDINGS(interface) ems::class_>("Output") .smart_ptr_constructor("Output", &std::make_shared) .smart_ptr>("Output") - BIND_MEMBER_FUNC("getUpstreamEdge", mx::Output, getUpstreamEdge, 0, 1, std::size_t) .function("getUpstreamEdgeCount", &mx::Output::getUpstreamEdgeCount) .function("hasUpstreamCycle", &mx::Output::hasUpstreamCycle) .class_property("CATEGORY", &mx::Output::CATEGORY) diff --git a/source/JsMaterialX/JsMaterialXCore/JsNode.cpp b/source/JsMaterialX/JsMaterialXCore/JsNode.cpp index 882fd9fa90..7777bec503 100644 --- a/source/JsMaterialX/JsMaterialXCore/JsNode.cpp +++ b/source/JsMaterialX/JsMaterialXCore/JsNode.cpp @@ -26,11 +26,9 @@ EMSCRIPTEN_BINDINGS(node) .function("getConnectedOutput", &mx::Node::getConnectedOutput) BIND_MEMBER_FUNC("getNodeDef", mx::Node, getNodeDef, 0, 1, stRef) BIND_MEMBER_FUNC("getImplementation", mx::Node, getImplementation, 0, 1, stRef) - BIND_MEMBER_FUNC("getUpstreamEdge", mx::Node, getUpstreamEdge, 0, 1, size_t) .function("getUpstreamEdgeCount", &mx::Node::getUpstreamEdgeCount) .function("getNodeDefOutput", &mx::Node::getNodeDefOutput) .function("getDownstreamPorts", &mx::Node::getDownstreamPorts) - BIND_MEMBER_FUNC("getDeclaration", mx::Node, getDeclaration, 0, 1, stRef) .function("addInputFromNodeDef", &mx::Node::addInputFromNodeDef) .class_property("CATEGORY", &mx::Node::CATEGORY); @@ -59,7 +57,6 @@ EMSCRIPTEN_BINDINGS(node) .function("setNodeDef", &mx::NodeGraph::setNodeDef) .function("getNodeDef", &mx::NodeGraph::getNodeDef) .function("getImplementation", &mx::NodeGraph::getImplementation) - BIND_MEMBER_FUNC("getDeclaration", mx::NodeGraph, getDeclaration, 0, 1, stRef) .function("addInterfaceName", &mx::NodeGraph::addInterfaceName) .function("removeInterfaceName", &mx::NodeGraph::removeInterfaceName) .function("modifyInterfaceName", &mx::NodeGraph::modifyInterfaceName) diff --git a/source/JsMaterialX/JsMaterialXCore/JsUtil.cpp b/source/JsMaterialX/JsMaterialXCore/JsUtil.cpp index 9c4488e98a..e6c9f166f7 100644 --- a/source/JsMaterialX/JsMaterialXCore/JsUtil.cpp +++ b/source/JsMaterialX/JsMaterialXCore/JsUtil.cpp @@ -29,7 +29,7 @@ EMSCRIPTEN_BINDINGS(util) ems::function("getVersionIntegers", ems::optional_override([]() { std::tuple version = mx::getVersionIntegers(); - return std::array { std::get<0>(version), std::get<1>(version), std::get<02>(version) }; + return std::array { std::get<0>(version), std::get<1>(version), std::get<2>(version) }; })); // Emscripten expects to provide a number from JS for a cpp 'char' parameter. diff --git a/source/JsMaterialX/JsMaterialXCore/JsValue.cpp b/source/JsMaterialX/JsMaterialXCore/JsValue.cpp index 42a1a6579a..d38112e6b1 100644 --- a/source/JsMaterialX/JsMaterialXCore/JsValue.cpp +++ b/source/JsMaterialX/JsMaterialXCore/JsValue.cpp @@ -44,7 +44,7 @@ EMSCRIPTEN_BINDINGS(value) ems::class_("Value") .smart_ptr>("Value") .smart_ptr>("Value") - .function("copy", &mx::Value::copy) + .function("copy", &mx::Value::copy, ems::pure_virtual()) .function("getTypeString", &mx::Value::getTypeString) .function("getValueString", &mx::Value::getValueString) .class_function("createValueFromStrings", &mx::Value::createValueFromStrings)