Integration

Author: Chris Hellmuth

source/MaterialXGenOslNodes/OslNodesShaderGenerator.cpp

@@ -36,8 +36,6 @@ ShaderPtr OslNodesShaderGenerator::generate(const string& name, ElementPtr eleme
     ShaderGraph& graph = shader->getGraph();
     ShaderStage& stage = shader->getStage(Stage::PIXEL);
 
-    emitLine("hello world!", stage, false);
-
     std::vector<string> connections;
     for (auto&& node : graph.getNodes()) {
         const string& name = node->getName();

source/MaterialXGenOslNodes/OslNodesShaderGenerator.h

@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#ifndef MATERIALX_OSLSHADERGENERATOR_H
-#define MATERIALX_OSLSHADERGENERATOR_H
+#ifndef MATERIALX_OSLNODESSHADERGENERATOR_H
+#define MATERIALX_OSLNODESSHADERGENERATOR_H
 
 /// @file
 /// OSL shading language generator

source/MaterialXGenOslNodes/OslNodesSyntax.cpp

@@ -377,7 +377,7 @@ OslNodesSyntax::OslNodesSyntax(TypeSystemPtr typeSystem) : Syntax(typeSystem)
         Type::FILENAME,
         std::make_shared<OSLFilenameTypeSyntax>(
             this,
-            "textureresource ",
+            "string",
             "textureresource (\"\", \"\")",
             "(\"\", \"\")",
             EMPTY_STRING,

source/MaterialXTest/CMakeLists.txt

@@ -53,7 +53,7 @@ if(MATERIALX_BUILD_GEN_GLSL OR MATERIALX_BUILD_GEN_OSL OR MATERIALX_BUILD_GEN_MD
     target_link_libraries(MaterialXTest MaterialXGenOsl)
 
     # add_subdirectory(MaterialXGenOslNodes)
-    # target_link_libraries(MaterialXTest MaterialXGenOslNodes)
+    target_link_libraries(MaterialXTest MaterialXGenOslNodes)
   endif()
   if(MATERIALX_BUILD_GEN_MDL)
     add_subdirectory(MaterialXGenMdl)

source/MaterialXTest/MaterialXRenderOsl/RenderOsl.cpp

@@ -14,6 +14,7 @@
 #endif
 
 #include <MaterialXGenOsl/OslShaderGenerator.h>
+#include <MaterialXGenOslNodes/OslNodesShaderGenerator.h>
 
 #include <MaterialXFormat/Util.h>
 
@@ -239,9 +240,10 @@ bool OslShaderRenderTester::runRenderer(const std::string& shaderName,
 
             std::string oslCmdStr = shader->getSourceCode();
             /// TODO: this is a temp value.
-            oslCmdStr  = "shader test_node test_node;\n";
-            oslCmdStr += "shader closure_passthrough closure_passthrough;\n";
-            oslCmdStr += "connect test_node.Out_Ci closure_passthrough.Cin;\n";
+            // oslCmdStr  = "shader test_node test_node;\n";
+            // oslCmdStr += "shader closure_passthrough closure_passthrough;\n";
+            // oslCmdStr += "connect test_node.Out_Ci closure_passthrough.Cin;\n";
+            printf("command string: %s\n", oslCmdStr.c_str());
 
 
             std::string shaderPath;
@@ -396,6 +398,6 @@ TEST_CASE("Render: OSL Nodes TestSuite", "[oslNodes]")
     mx::FilePath optionsFilePath = searchPath.find("resources/Materials/TestSuite/_options.mtlx");
 
     /// TODO: change to chris' new shader generator
-    OslShaderRenderTester renderTester(mx::OslShaderGenerator::create(), true);
+    OslShaderRenderTester renderTester(mx::OslNodesShaderGenerator::create(), true);
     renderTester.validate(optionsFilePath);
-}
+}