forked from AcademySoftwareFoundation/MaterialX
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Initial release of MaterialX v1.35.2
- Loading branch information
1 parent
7924f5d
commit fcb0bf1
Showing
127 changed files
with
50,719 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
# Change Log | ||
|
||
## [1.35.2] - 2017-07-03 | ||
|
||
### Added | ||
- Added OSL source files for the standard nodes. | ||
- Added example document 'PostShaderComposite.mtlx'. | ||
- Added method MaterialX\:\:prependXInclude. | ||
|
||
### Changed | ||
- Argument 'writeXIncludes' defaults to true in MaterialX\:\:writeToXmlStream and MaterialX\:\:writeToXmlString. | ||
|
||
### Fixed | ||
- Fixed handling of BindInput elements with missing connections. | ||
|
||
## [1.35.1] - 2017-06-23 | ||
|
||
### Added | ||
- Added a 'viewercollection' attribute to MaterialX\:\:Visibility. | ||
- Added Python support for visibility and source URI methods. | ||
|
||
### Changed | ||
- Changed naming convention from 'ColorSpace' to 'ColorManagement' in Document methods. | ||
- Split library document 'mx_stdlib.mtlx' into 'mx_stdlib_defs.mtlx' and 'mx_stdlib_osl_impl.mtlx'. | ||
|
||
## [1.35.0] - 2017-06-20 | ||
|
||
Updated the MaterialX library to the v1.35 specification. | ||
|
||
### Added | ||
- Added the MaterialX\:\:Visibility class. | ||
- Added 'file', 'function', and 'language' attributes to MaterialX\:\:Implementation. | ||
- Added 'node' and 'nodedef' attributes to MaterialX\:\:ShaderRef. In v1.35, these attributes define which NodeDef is referenced by a ShaderRef. | ||
- Added a 'material' attribute to MaterialX\:\:MaterialAssign. In v1.35, this attribute defines which Material is referenced by a MaterialAssign. | ||
|
||
### Changed | ||
- Removed the MaterialX\:\:LightAssign and MaterialX\:\:Light classes. In v1.35, this functionality is now handled by the MaterialX\:\:Visibility class. | ||
- Removed the 'default' attribute from MaterialX\:\:ValueElement. In v1.35, this functionality is now handled by the 'value' attribute. | ||
- Replaced the 'matrix' type with 'matrix33' and 'matrix44', and replaced the MaterialX\:\:Matrix16 class with MaterialX\:\:Matrix3x3 and MaterialX\:\:Matrix4x4. | ||
- Renamed Material\:\:getMaterialAssigns to Material\:\:getReferencingMaterialAssigns. | ||
- Change the argument type for MaterialAssign\:\:setExclusive and MaterialAssign\:\:getExclusive to boolean. | ||
|
||
## [1.34.4] - 2017-06-09 | ||
|
||
### Added | ||
- Added support for graph-based implementations of nodes. | ||
- Added support for subtree/subgraph pruning in traversals. | ||
- Added NodeGraph\:\:topologicalSort and MaterialX\:\:printGraphDot methods. | ||
- Added a File module to MaterialXFormat and MaterialXTest. | ||
|
||
### Changed | ||
- Extended NodeGraph::flattenSubgraphs to support subgraph recursion. | ||
- Added a searchPath argument to MaterialX\:\:readFromXmlFile. | ||
|
||
### Fixed | ||
- Fixed an issue where connecting elements were not returned in graph traversal edges. | ||
|
||
## [1.34.3] - 2017-05-16 | ||
|
||
### Added | ||
- Added support for document validation, including the Document\:\:validate and Element\:\:validate methods. | ||
- Added helper methods ValueElement\:\:getResolvedValueString and Element\:\:getNamePath. | ||
- Added standard library document. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
project(MaterialX) | ||
set(MATERIALX_MAJOR_VERSION 1) | ||
set(MATERIALX_MINOR_VERSION 35) | ||
set(MATERIALX_BUILD_VERSION 2) | ||
|
||
cmake_minimum_required(VERSION 3.1) | ||
set(CMAKE_CXX_STANDARD 11) | ||
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) | ||
|
||
option(MATERIALX_BUILD_PYTHON "Build the MaterialX Python package from C++ bindings. Requires Python 2.6 or greater." OFF) | ||
option(MATERIALX_GENERATE_DOCS "Create HTML documentation using Doxygen. Requires that Doxygen be installed." OFF) | ||
|
||
mark_as_advanced(MATERIALX_GENERATE_DOCS) | ||
|
||
set(MATERIALX_PYTHON_EXECUTABLE "" CACHE FILEPATH | ||
"Path to the Python executable (e.g. 'C:/Python27/python.exe').") | ||
set(MATERIALX_PYTHON_INCLUDE_DIR "" CACHE PATH | ||
"Path to the headers of the Python installation (e.g. 'C:/Python27/include').") | ||
set(MATERIALX_PYTHON_LIBRARY "" CACHE FILEPATH | ||
"Path to the Python library file (e.g. 'C:/Python27/libs/python27.lib').") | ||
set(MATERIALX_PYTHON_OCIO_DIR "" CACHE PATH | ||
"Path to a folder containing the default OCIO configuration to be packaged with MaterialX Python (e.g. 'D:/Projects/OpenColorIO-Configs/aces_1.0.3').") | ||
|
||
mark_as_advanced(MATERIALX_PYTHON_EXECUTABLE) | ||
mark_as_advanced(MATERIALX_PYTHON_INCLUDE_DIR) | ||
mark_as_advanced(MATERIALX_PYTHON_LIBRARY) | ||
mark_as_advanced(MATERIALX_PYTHON_OCIO_DIR) | ||
|
||
set(PYTHON_INCLUDE_DIR ${MATERIALX_PYTHON_INCLUDE_DIR}) | ||
set(PYTHON_LIBRARY ${MATERIALX_PYTHON_LIBRARY}) | ||
|
||
# Adjust the default installation path | ||
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) | ||
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/installed" CACHE PATH "Default install path" FORCE) | ||
endif() | ||
|
||
# Adjust compiler settings | ||
if(MSVC) | ||
if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") | ||
string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") | ||
else() | ||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") | ||
endif() | ||
elseif(CMAKE_COMPILER_IS_GNUCXX) | ||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") | ||
endif() | ||
|
||
# Add subdirectories | ||
add_subdirectory(source/MaterialXCore) | ||
add_subdirectory(source/MaterialXFormat) | ||
add_subdirectory(source/MaterialXTest) | ||
|
||
if(MATERIALX_BUILD_PYTHON) | ||
add_subdirectory(source/PyMaterialX) | ||
add_subdirectory(python) | ||
endif(MATERIALX_BUILD_PYTHON) | ||
|
||
if(MATERIALX_GENERATE_DOCS) | ||
add_subdirectory(documents) | ||
endif(MATERIALX_GENERATE_DOCS) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
Thank you for your interest in contributing to MaterialX! | ||
|
||
## Contributor License Agreement | ||
Before contributing code to MaterialX, we ask that you sign a Contributor License Agreement (CLA). In the `documents/Contributing` folder of the repo you can find the two possible CLAs: | ||
|
||
- MaterialX_CLA_Corporate.pdf: please sign this one for corporate use | ||
- MaterialX_CLA_Individual.pdf: please sign this one if you're an individual contributor | ||
|
||
Once your CLA is signed, send it to [email protected] and wait for confirmation that we've received it. After that, you can submit pull requests. | ||
|
||
## Coding Conventions | ||
Please follow the coding convention and style in each file and in each library when adding new files. |
Oops, something went wrong.