Skip to content

Commit ff60644

Browse files
chellmuthChris Hellmuth
chellmuth
authored and
Chris Hellmuth
committed
OslNodes -> OslNetwork
1 parent e914f00 commit ff60644

File tree

26 files changed

+191
-191
lines changed

26 files changed

+191
-191
lines changed

‎CMakeLists.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ option(MATERIALX_BUILD_DOCS "Create HTML documentation using Doxygen. Requires t
4040

4141
option(MATERIALX_BUILD_GEN_GLSL "Build the GLSL shader generator back-end." ON)
4242
option(MATERIALX_BUILD_GEN_OSL "Build the OSL shader generator back-end." ON)
43-
option(MATERIALX_BUILD_GEN_OSL_NODES "Build the OSL nodes shader generator back-end." ON)
43+
option(MATERIALX_BUILD_GEN_OSL_NETWORK "Build the OSL nodes shader generator back-end." ON)
4444
option(MATERIALX_BUILD_GEN_MDL "Build the MDL shader generator back-end." ON)
4545
option(MATERIALX_BUILD_GEN_MSL "Build the MSL shader generator back-end." ON)
4646
option(MATERIALX_BUILD_RENDER "Build the MaterialX Render modules." ON)
@@ -85,7 +85,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "iOS" OR CMAKE_SYSTEM_NAME MATCHES "tvOS" OR CMAKE
8585
set(MATERIALX_BUILD_GRAPH_EDITOR OFF)
8686
set(MATERIALX_BUILD_GEN_GLSL OFF)
8787
set(MATERIALX_BUILD_GEN_OSL OFF)
88-
set(MATERIALX_BUILD_GEN_OSL_NODES OFF)
88+
set(MATERIALX_BUILD_GEN_OSL_NETWORK OFF)
8989
set(MATERIALX_BUILD_GEN_MDL OFF)
9090
set(MATERIALX_BUILD_TESTS OFF)
9191
endif()
@@ -105,7 +105,7 @@ if (MATERIALX_BUILD_APPLE_FRAMEWORK)
105105
endif()
106106

107107
if (MATERIALX_BUILD_JS)
108-
set(MATERIALX_BUILD_GEN_OSL_NODES OFF)
108+
set(MATERIALX_BUILD_GEN_OSL_NETWORK OFF)
109109
set(MATERIALX_BUILD_RENDER OFF)
110110
set(MATERIALX_BUILD_TESTS OFF)
111111
endif()
@@ -139,7 +139,7 @@ if(SKBUILD)
139139
set(MATERIALX_PYTHON_FOLDER_NAME "MaterialX")
140140
endif()
141141

142-
if (MATERIALX_BUILD_GEN_OSL_NODES)
142+
if (MATERIALX_BUILD_GEN_OSL_NETWORK)
143143
set(MATERIALX_BUILD_DATA_LIBRARY ON)
144144
set(MATERIALX_BUILD_GEN_OSL ON)
145145
set(MATERIALX_BUILD_RENDER ON)
@@ -172,7 +172,7 @@ set(MATERIALX_LIBNAME_SUFFIX "" CACHE STRING "Specify a suffix to all libraries
172172
mark_as_advanced(MATERIALX_BUILD_DOCS)
173173
mark_as_advanced(MATERIALX_BUILD_GEN_GLSL)
174174
mark_as_advanced(MATERIALX_BUILD_GEN_OSL)
175-
mark_as_advanced(MATERIALX_BUILD_GEN_OSL_NODES)
175+
mark_as_advanced(MATERIALX_BUILD_GEN_OSL_NETWORK)
176176
mark_as_advanced(MATERIALX_BUILD_GEN_MDL)
177177
mark_as_advanced(MATERIALX_BUILD_GEN_MSL)
178178
mark_as_advanced(MATERIALX_BUILD_RENDER)
@@ -226,7 +226,7 @@ endif()
226226

227227
# Allow the OSL CMake package to provide binary locations for render tests.
228228
# This will not override explicitly provided oslc, testrender, and include paths.
229-
if((MATERIALX_BUILD_RENDER AND MATERIALX_BUILD_GEN_OSL AND MATERIALX_BUILD_TESTS) OR MATERIALX_BUILD_GEN_OSL_NODES)
229+
if((MATERIALX_BUILD_RENDER AND MATERIALX_BUILD_GEN_OSL AND MATERIALX_BUILD_TESTS) OR MATERIALX_BUILD_GEN_OSL_NETWORK)
230230
find_package(OSL QUIET)
231231
if(OSL_FOUND)
232232
if(NOT MATERIALX_OSL_BINARY_OSLC)
@@ -464,7 +464,7 @@ add_subdirectory(source/MaterialXFormat)
464464

465465
# Add shader generation subdirectories
466466
add_subdirectory(source/MaterialXGenShader)
467-
if(MATERIALX_BUILD_GEN_GLSL OR MATERIALX_BUILD_GEN_OSL OR MATERIALX_BUILD_GEN_OSL_NODES OR MATERIALX_BUILD_GEN_MDL OR MATERIALX_BUILD_GEN_MSL)
467+
if(MATERIALX_BUILD_GEN_GLSL OR MATERIALX_BUILD_GEN_OSL OR MATERIALX_BUILD_GEN_OSL_NETWORK OR MATERIALX_BUILD_GEN_MDL OR MATERIALX_BUILD_GEN_MSL)
468468
if (MATERIALX_BUILD_GEN_GLSL)
469469
add_definitions(-DMATERIALX_BUILD_GEN_GLSL)
470470
add_subdirectory(source/MaterialXGenGlsl)
@@ -473,9 +473,9 @@ if(MATERIALX_BUILD_GEN_GLSL OR MATERIALX_BUILD_GEN_OSL OR MATERIALX_BUILD_GEN_OS
473473
add_definitions(-DMATERIALX_BUILD_GEN_OSL)
474474
add_subdirectory(source/MaterialXGenOsl)
475475
endif()
476-
if (MATERIALX_BUILD_GEN_OSL_NODES)
477-
add_definitions(-DMATERIALX_BUILD_GEN_OSL_NODES)
478-
add_subdirectory(source/MaterialXGenOslNodes)
476+
if (MATERIALX_BUILD_GEN_OSL_NETWORK)
477+
add_definitions(-DMATERIALX_BUILD_GEN_OSL_NETWORK)
478+
add_subdirectory(source/MaterialXGenOslNetwork)
479479
endif()
480480
if (MATERIALX_BUILD_GEN_MDL)
481481
add_definitions(-DMATERIALX_BUILD_GEN_MDL)

‎libraries/CMakeLists.txt‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,9 @@ if(MATERIALX_BUILD_DATA_LIBRARY)
2828
add_custom_target(MaterialXBuildData ALL
2929
DEPENDS ${MATERIALX_DATA_LIBRARY_BUILD_FILES})
3030

31-
if (MATERIALX_BUILD_GEN_OSL_NODES AND MATERIALX_OSL_BINARY_OSLC)
32-
33-
set(OSO_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR}/DataLibraryBuild/targets/genoslnodes/osos)
34-
set(MTLX_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR}/DataLibraryBuild/targets/genoslnodes)
31+
if (MATERIALX_BUILD_GEN_OSL_NETWORK AND MATERIALX_OSL_BINARY_OSLC)
32+
set(OSO_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR}/DataLibraryBuild/targets/genoslnetwork/osos)
33+
set(MTLX_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR}/DataLibraryBuild/targets/genoslnetwork)
3534

3635
set(SENTINEL_FILE ${CMAKE_CURRENT_BINARY_DIR}/buildosos.sentinel)
3736

@@ -40,18 +39,18 @@ if(MATERIALX_BUILD_DATA_LIBRARY)
4039
COMMAND touch ${SENTINEL_FILE}
4140
COMMAND cmake -E make_directory ${OSO_BUILD_PATH}
4241
COMMAND cmake -E make_directory ${MTLX_BUILD_PATH}
43-
COMMAND MaterialXGenOslNodes_LibsToOso
42+
COMMAND MaterialXGenOslNetwork_LibsToOso
4443
--outputOsoPath ${OSO_BUILD_PATH}
4544
--outputMtlxPath ${MTLX_BUILD_PATH}
4645
--oslCompilerPath ${MATERIALX_OSL_BINARY_OSLC}
4746
--oslIncludePath ${MATERIALX_OSL_INCLUDE_PATH}
48-
--libraryRelativeOsoPath libraries/targets/genoslnodes/osos
47+
--libraryRelativeOsoPath libraries/targets/genoslnetwork/osos
4948
--removeNdPrefix true
50-
DEPENDS ${MATERIALX_DATA_LIBRARY_SOURCE_FILES} MaterialXGenOslNodes_LibsToOso
49+
DEPENDS ${MATERIALX_DATA_LIBRARY_SOURCE_FILES} MaterialXGenOslNetwork_LibsToOso
5150
)
5251

53-
add_custom_target(MaterialXBuild_genoslnodes_buildOsos ALL DEPENDS ${SENTINEL_FILE})
54-
add_dependencies(MaterialXBuildData MaterialXBuild_genoslnodes_buildOsos)
52+
add_custom_target(MaterialXBuild_genoslnetwork_buildOsos ALL DEPENDS ${SENTINEL_FILE})
53+
add_dependencies(MaterialXBuildData MaterialXBuild_genoslnetwork_buildOsos)
5554

5655
endif()
5756

libraries/targets/genoslnodes.mtlx renamed to libraries/targets/genoslnetwork.mtlx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<!-- ======================================================================== -->
1010
<!-- Base target definition for OSL targets using shader generation. -->
1111
<!-- ======================================================================== -->
12-
<targetdef name="genoslnodes" />
12+
<targetdef name="genoslnetwork" />
1313

1414
</materialx>

‎python/Scripts/generateshader.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import MaterialX.PyMaterialXGenMdl as mx_gen_mdl
1212
import MaterialX.PyMaterialXGenMsl as mx_gen_msl
1313
import MaterialX.PyMaterialXGenOsl as mx_gen_osl
14+
import MaterialX.PyMaterialXGenOslNetwork as mx_gen_osl_network
1415
import MaterialX.PyMaterialXGenShader as mx_gen_shader
1516

1617
def validateCode(sourceCodeFile, codevalidator, codevalidatorArgs):
@@ -92,8 +93,8 @@ def main():
9293
gentarget = opts.target
9394
if gentarget == 'osl':
9495
shadergen = mx_gen_osl.OslShaderGenerator.create()
95-
if gentarget == 'oslnodes':
96-
shadergen = mx_gen_osl.OslNodeShaderGenerator.create()
96+
if gentarget == 'oslnetwork':
97+
shadergen = mx_gen_osl_network.OslNetworkShaderGenerator.create()
9798
elif gentarget == 'mdl':
9899
shadergen = mx_gen_mdl.MdlShaderGenerator.create()
99100
elif gentarget == 'essl':

‎resources/Materials/TestSuite/_options.mtlx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<!-- Comma separated list of target" specifiers to indicate which
2323
code generators to use. -->
24-
<input name="targets" type="string" value="genglsl,genosl,genoslnodes,genmdl,genessl,genmsl" />
24+
<input name="targets" type="string" value="genglsl,genosl,genoslnetwork,genmdl,genessl,genmsl" />
2525

2626
<!-- Check the count of number of implementations used for a given generator -->
2727
<input name="checkImplCount" type="boolean" value="true" />

source/MaterialXGenOslNodes/CMakeLists.txt renamed to source/MaterialXGenOslNetwork/CMakeLists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
file(GLOB_RECURSE materialx_source
2-
"${CMAKE_CURRENT_SOURCE_DIR}/OslNodesShaderGenerator.cpp"
3-
"${CMAKE_CURRENT_SOURCE_DIR}/OslNodesSyntax.cpp"
2+
"${CMAKE_CURRENT_SOURCE_DIR}/OslNetworkShaderGenerator.cpp"
3+
"${CMAKE_CURRENT_SOURCE_DIR}/OslNetworkSyntax.cpp"
44
"${CMAKE_CURRENT_SOURCE_DIR}/Nodes/OsoNode.cpp"
55
)
66
file(GLOB_RECURSE materialx_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
77

8-
mx_add_library(MaterialXGenOslNodes
8+
mx_add_library(MaterialXGenOslNetwork
99
SOURCE_FILES
1010
${materialx_source}
1111
HEADER_FILES
@@ -14,7 +14,7 @@ mx_add_library(MaterialXGenOslNodes
1414
MaterialXGenShader
1515
MaterialXCore
1616
EXPORT_DEFINE
17-
MATERIALX_GENOSLNODES_EXPORTS)
17+
MATERIALX_GENOSLNETWORK_EXPORTS)
1818

1919

2020
file(GLOB GenNodes_SRC "${CMAKE_CURRENT_SOURCE_DIR}/LibsToOso.cpp")
@@ -26,22 +26,22 @@ set(MATERIALX_LIBRARIES
2626
MaterialXGenOsl
2727
MaterialXRenderOsl)
2828

29-
add_executable(MaterialXGenOslNodes_LibsToOso ${GenNodes_SRC})
29+
add_executable(MaterialXGenOslNetwork_LibsToOso ${GenNodes_SRC})
3030

3131
target_link_libraries(
32-
MaterialXGenOslNodes_LibsToOso
32+
MaterialXGenOslNetwork_LibsToOso
3333
${MATERIALX_LIBRARIES})
3434

3535
set_target_properties(
36-
MaterialXGenOslNodes_LibsToOso PROPERTIES
36+
MaterialXGenOslNetwork_LibsToOso PROPERTIES
3737
INSTALL_RPATH "${MATERIALX_UP_ONE_RPATH}")
3838

3939
# TODO: We likely want to install that file elsewhere and not under `bin`,
4040
# if at all, as we maybe want to keep this executable available at build time only.
41-
install(TARGETS MaterialXGenOslNodes_LibsToOso
41+
install(TARGETS MaterialXGenOslNetwork_LibsToOso
4242
EXPORT MaterialX
4343
RUNTIME DESTINATION ${MATERIALX_INSTALL_BIN_PATH})
4444
if(MSVC)
45-
install(FILES $<TARGET_PDB_FILE:MaterialXGenOslNodes_LibsToOso>
45+
install(FILES $<TARGET_PDB_FILE:MaterialXGenOslNetwork_LibsToOso>
4646
DESTINATION ${MATERIALX_INSTALL_BIN_PATH} OPTIONAL)
4747
endif()

‎source/MaterialXGenOslNetwork/Export.h‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
//
2+
// Copyright Contributors to the MaterialX Project
3+
// SPDX-License-Identifier: Apache-2.0
4+
//
5+
6+
#ifndef MATERIALX_GENOSLNETWORK_EXPORT_H
7+
#define MATERIALX_GENOSLNETWORK_EXPORT_H
8+
9+
#include <MaterialXCore/Library.h>
10+
11+
/// @file
12+
/// Macros for declaring imported and exported symbols.
13+
14+
#if defined(MATERIALX_GENOSLNETWORK_EXPORTS)
15+
#define MX_GENOSLNETWORK_API MATERIALX_SYMBOL_EXPORT
16+
#define MX_GENOSLNETWORK_EXTERN_TEMPLATE(...) MATERIALX_EXPORT_EXTERN_TEMPLATE(__VA_ARGS__)
17+
#else
18+
#define MX_GENOSLNETWORK_API MATERIALX_SYMBOL_IMPORT
19+
#define MX_GENOSLNETWORK_EXTERN_TEMPLATE(...) MATERIALX_IMPORT_EXTERN_TEMPLATE(__VA_ARGS__)
20+
#endif
21+
22+
#endif

source/MaterialXGenOslNodes/LibsToOso.cpp renamed to source/MaterialXGenOslNetwork/LibsToOso.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
namespace mx = MaterialX;
2323

2424

25-
const std::string setCiOslNodeSource = R"(
25+
const std::string setCiOslNetworkSource = R"(
2626
2727
#include "mx_funcs.h"
2828
@@ -167,7 +167,7 @@ int main(int argc, char* const argv[])
167167
argPrefix = nextToken;
168168
else if (token == "--help")
169169
{
170-
std::cout << "MaterialXGenOslNodes - LibsToOso version " << mx::getVersionString() << std::endl;
170+
std::cout << "MaterialXGenOslNetwork - LibsToOso version " << mx::getVersionString() << std::endl;
171171
std::cout << options << std::endl;
172172

173173
return 0;
@@ -260,8 +260,8 @@ int main(int argc, char* const argv[])
260260
else
261261
loadLibraries({ "libraries" }, librariesSearchPath, librariesDoc);
262262

263-
const std::string target = "genoslnodes";
264-
mx::FilePath implMtlxDocFilePath = outputMtlxPath / "genoslnodes_impl.mtlx";
263+
const std::string target = "genoslnetwork";
264+
mx::FilePath implMtlxDocFilePath = outputMtlxPath / "genoslnetwork_impl.mtlx";
265265
mx::DocumentPtr implMtlxDoc = mx::createDocument();
266266

267267
// Create and setup the `OslRenderer` that will be used to both generate the `.osl` files as well as compile
@@ -303,7 +303,7 @@ int main(int argc, char* const argv[])
303303
// TODO: Check that we have a valid/opened file descriptor before doing anything with it?
304304
oslFile.open(oslFilePath);
305305
// Dump the content of the codegen'd `NodeDef` to our `.osl` file.
306-
oslFile << setCiOslNodeSource;
306+
oslFile << setCiOslNetworkSource;
307307
oslFile.close();
308308

309309
// Compile the `.osl` file to a `.oso` file next to it.

source/MaterialXGenOslNodes/Nodes/OsoNode.cpp renamed to source/MaterialXGenOslNetwork/Nodes/OsoNode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// SPDX-License-Identifier: Apache-2.0
44
//
55

6-
#include <MaterialXGenOslNodes/Nodes/OsoNode.h>
6+
#include <MaterialXGenOslNetwork/Nodes/OsoNode.h>
77
#include <MaterialXGenShader/GenContext.h>
88

99
MATERIALX_NAMESPACE_BEGIN

source/MaterialXGenOslNodes/Nodes/OsoNode.h renamed to source/MaterialXGenOslNetwork/Nodes/OsoNode.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
#ifndef MATERIALX_OSONODE_H
77
#define MATERIALX_OSONODE_H
88

9-
#include <MaterialXGenOslNodes/Export.h>
9+
#include <MaterialXGenOslNetwork/Export.h>
1010

1111
#include <MaterialXGenShader/ShaderNodeImpl.h>
1212

1313
MATERIALX_NAMESPACE_BEGIN
1414

15-
class MX_GENOSLNODES_API OsoNode : public ShaderNodeImpl
15+
class MX_GENOSLNETWORK_API OsoNode : public ShaderNodeImpl
1616
{
1717
public:
1818
static ShaderNodeImplPtr create();

0 commit comments

Comments
 (0)