Skip to content

Commit b7e3e6e

Browse files
authored
ILM 1.37 merge update (#717)
* ILM merge. * Apply: pybind/pybind11#2025 * Fix environment images path for render tests.
1 parent fe18120 commit b7e3e6e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1436
-776
lines changed

CHANGELOG.md

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,31 @@
11
# Change Log
22

3-
## [1.36.5] - Development
3+
## [1.37.0] - Development
4+
5+
Updated the MaterialX library to the v1.37 specification. See the [changelist](http://www.materialx.org/assets/MaterialX.v1.37REV2.Changelist.pdf) for a complete list of updates in v1.37. MaterialX documents from v1.36 and earlier are automatically upgraded at load-time.
6+
7+
### Added
8+
- Added support for LookGroup elements.
9+
- Added support for the 'uisoftmin', 'uisoftmax', and 'uistep' attributes, updating Autodesk Standard Surface to leverage these features.
10+
- Added support for the 'doc' attribute.
11+
12+
### Changed
13+
- Updated the set of standard nodes for v1.37.
14+
- Unified the rules for NodeDef outputs, with all NodeDefs defining their output set through Output children rather than 'type' attributes.
15+
- Replaced backdrop nodes with Backdrop elements.
16+
17+
## [1.36.5] - 2020-01-11
418

519
### Added
6-
- Added a Load Environment option to the viewer, allowing new latitude-longitude HDR environments to be loaded at run-time.
7-
- Added an initial TextureBaker class, supporting baking of graph outputs to textures.
20+
- Added a Load Environment option to the viewer, allowing arbitrary latitude-longitude HDR environments to be loaded at run-time.
21+
- Added an initial TextureBaker class, supporting baking of procedural content to textures.
822
- Added initial support for units, including the MaterialX\:\:Unit, MaterialX\:\:UnitDef, and MaterialX\:\:UnitTypeDef classes.
923
- Added support for unit conversion in shader code generation.
1024
- Added support for Visual Studio 2019.
1125

1226
### Changed
13-
- Updated subsurface interface and logic for Autodesk Standard Surface.
27+
- Updated Autodesk Standard Surface to the latest interface and graph.
28+
- Updated the PyBind11 library to version 2.4.3.
1429

1530
## [1.36.4] - 2019-09-26
1631

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Thank you for your interest in contributing to MaterialX!
22

33
## Contributor License Agreement
4-
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:
4+
Before contributing code to MaterialX, we ask that you sign a Contributor License Agreement (CLA). In the [documents/Contributing](documents/Contributing) folder of the repo you can find the two possible CLAs:
55

6-
- MaterialX_CLA_Corporate.pdf: please sign this one for corporate use
7-
- MaterialX_CLA_Individual.pdf: please sign this one if you're an individual contributor
6+
- [MaterialX_CLA_Corporate.pdf](documents/Contributing/MaterialX_CLA_Corporate.pdf): please sign this one for corporate use
7+
- [MaterialX_CLA_Individual.pdf](documents/Contributing/MaterialX_CLA_Individual.pdf): please sign this one if you're an individual contributor
88

99
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.
1010

documents/README.md

Lines changed: 0 additions & 6 deletions
This file was deleted.
-342 KB
Binary file not shown.
-746 KB
Binary file not shown.
-216 KB
Binary file not shown.
232 KB
Binary file not shown.
730 KB
Binary file not shown.
181 KB
Binary file not shown.

resources/Materials/TestSuite/_options.mtlx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@
7878
<parameter name="specularEnvironmentMethod" type="integer" value="1" />
7979

8080
<!-- Suggested radiance IBL file path -->
81-
<parameter name="radianceIBLPath" type="string" value="resources/Images/san_giuseppe_bridge.hdr" />
81+
<parameter name="radianceIBLPath" type="string" value="resources/Images/Environments/san_giuseppe_bridge.hdr" />
8282

8383
<!-- Suggested irradiance IBL file path -->
84-
<parameter name="irradianceIBLPath" type="string" value="resources/Images/san_giuseppe_bridge_diffuse.hdr" />
84+
<parameter name="irradianceIBLPath" type="string" value="resources/Images/Environments/san_giuseppe_bridge_diffuse.hdr" />
8585

8686
<!-- Transforms UVs of loaded geometry -->
8787
<parameter name="transformUVs" type="matrix44" value="1.0f, 0.0f, 0.0f, -0.235f, 0.0f, -1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f" />

0 commit comments

Comments
 (0)