Skip to content

Commit 0fedefe

Browse files
committed
Update with 2.5 OCIO and 1.39.5 MTLX.
1 parent ef139b1 commit 0fedefe

Some content is hidden

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

52 files changed

+808
-9878
lines changed

docs/data/ND_acescg_to_lin_rec709_color4_2.mtlx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</nodedef>
1212
<nodegraph name="NG_acescg_to_lin_rec709_color3" nodedef="ND_acescg_to_lin_rec709_color3">
1313
<acescg_to_lin_rec709 name="node1" type="color4" nodedef="ND_acescg_to_lin_rec709_color4">
14-
<input name="in" type="color4" value="0, 0, 0, 1" nodename="c3to4" />
14+
<input name="in" type="color4" nodename="c3to4" />
1515
</acescg_to_lin_rec709>
1616
<convert name="c3to4" type="color4">
1717
<input name="in" type="color3" interfacename="in" />

docs/data/acescg_to_lin_rec709_color3.mtlx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</convert>
1111
<transform name="matrixTransform" type="vector3">
1212
<input name="in" type="vector3" nodename="asVec" />
13-
<input name="mat" type="matrix33" value="1.7050509926579815, -0.6217921206570057, -0.08325887200097967, -0.1302564175070435, 1.140804736575405, -0.010548319068357662, -0.024003356804618046, -0.12896897606497093, 1.1529723328695858" />
13+
<input name="mat" type="matrix33" value="1.7050509926579815, -0.6217921206570056, -0.0832588720009797, -0.1302564175070435, 1.1408047365754048, -0.010548319068357653, -0.024003356804618042, -0.1289689760649709, 1.1529723328695858" />
1414
</transform>
1515
<convert name="asColor" type="color3">
1616
<input name="in" type="vector3" nodename="matrixTransform" />

docs/data/mx_acescg_to_lin_rec709_color4.glsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ vec4 mx_acescg_to_lin_rec709_color4(vec4 inPixel)
1010
{
1111
vec4 res = vec4(outColor.rgb.r, outColor.rgb.g, outColor.rgb.b, outColor.a);
1212
vec4 tmp = res;
13-
res = mat4(1.7050509926579815, -0.1302564175070435, -0.024003356804618046, 0., -0.62179212065700573, 1.140804736575405, -0.12896897606497093, 0., -0.083258872000979672, -0.010548319068357662, 1.1529723328695858, 0., 0., 0., 0., 1.) * tmp;
13+
res = mat4(1.7050509926579815, -0.1302564175070435, -0.024003356804618042, 0., -0.62179212065700562, 1.1408047365754048, -0.1289689760649709, 0., -0.0832588720009797, -0.010548319068357653, 1.1529723328695858, 0., 0., 0., 0., 1.) * tmp;
1414
outColor.rgb = vec3(res.x, res.y, res.z);
1515
outColor.a = res.w;
1616
}

docs/data/mx_acescg_to_lin_rec709_color4.osl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ color4 mx_acescg_to_lin_rec709_color4(color4 inPixel)
6363
{
6464
vector4 res = vector4(outColor.rgb.r, outColor.rgb.g, outColor.rgb.b, outColor.a);
6565
vector4 tmp = res;
66-
res = matrix(1.7050509926579815, -0.1302564175070435, -0.024003356804618046, 0., -0.62179212065700573, 1.140804736575405, -0.12896897606497093, 0., -0.083258872000979672, -0.010548319068357662, 1.1529723328695858, 0., 0., 0., 0., 1.) * tmp;
66+
res = matrix(1.7050509926579815, -0.1302564175070435, -0.024003356804618042, 0., -0.62179212065700562, 1.1408047365754048, -0.1289689760649709, 0., -0.0832588720009797, -0.010548319068357653, 1.1529723328695858, 0., 0., 0., 0., 1.) * tmp;
6767
outColor.rgb = vector(res.x, res.y, res.z);
6868
outColor.a = res.w;
6969
}

docs/doxygen_log.txt

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,31 @@
1-
Doxygen version used: 1.15.0
1+
warning: ignoring unsupported tag 'MARKDOWN_STRICT' at line 376, file Doxyfile
2+
warning: ignoring unsupported tag 'AUTOLINK_IGNORE_WORDS' at line 413, file Doxyfile
3+
warning: ignoring unsupported tag 'HIDE_UNDOC_NAMESPACES' at line 632, file Doxyfile
4+
warning: ignoring unsupported tag 'WARN_LAYOUT_FILE' at line 950, file Doxyfile
5+
warning: ignoring unsupported tag 'IMPLICIT_DIR_DOCS' at line 1228, file Doxyfile
6+
warning: ignoring unsupported tag 'PAGE_OUTLINE_PANEL' at line 1789, file Doxyfile
7+
warning: ignoring unsupported tag 'UML_MAX_EDGE_LABELS' at line 2719, file Doxyfile
8+
warning: ignoring unsupported tag 'PLANTUMLFILE_DIRS' at line 2904, file Doxyfile
9+
Doxygen version used: 1.12.0 (c73f5d30f9e8b1df5ba15a1d064ff2067cbb8267)
210
Searching for include files...
3-
Searching for files in directory /Users/bernardkwok/work/materialxocio/src
11+
Searching for files in directory D:/Work/materialx/materialxocio/src
412
Searching for example files...
513
Searching for images...
614
Searching for dot files...
715
Searching for msc files...
816
Searching for dia files...
9-
Searching for plantuml files...
1017
Searching for files to exclude
1118
Searching INPUT for files to process...
12-
Searching for files in directory /Users/bernardkwok/work/materialxocio/src/materialxocio
19+
Searching for files in directory D:/Work/materialx/materialxocio/src/materialxocio
1320
Reading and parsing tag files
1421
Parsing files
15-
Reading /Users/bernardkwok/work/materialxocio/src/materialxocio/__init__.py...
16-
Parsing file /Users/bernardkwok/work/materialxocio/src/materialxocio/__init__.py...
17-
Reading /Users/bernardkwok/work/materialxocio/src/materialxocio/core.py...
18-
Parsing file /Users/bernardkwok/work/materialxocio/src/materialxocio/core.py...
19-
Reading /Users/bernardkwok/work/materialxocio/src/materialxocio/genOCIODefinitions.py...
20-
Parsing file /Users/bernardkwok/work/materialxocio/src/materialxocio/genOCIODefinitions.py...
21-
Reading /Users/bernardkwok/work/materialxocio/README.md...
22+
Reading D:/Work/materialx/materialxocio/src/materialxocio/__init__.py...
23+
Parsing file D:/Work/materialx/materialxocio/src/materialxocio/__init__.py...
24+
Reading D:/Work/materialx/materialxocio/src/materialxocio/core.py...
25+
Parsing file D:/Work/materialx/materialxocio/src/materialxocio/core.py...
26+
Reading D:/Work/materialx/materialxocio/src/materialxocio/genOCIODefinitions.py...
27+
Parsing file D:/Work/materialx/materialxocio/src/materialxocio/genOCIODefinitions.py...
28+
Reading D:/Work/materialx/materialxocio/README.md...
2229
Building macro definition list...
2330
Building group list...
2431
Building directory list...
@@ -43,7 +50,6 @@ Searching for documented defines...
4350
Computing class inheritance relations...
4451
Computing class usage relations...
4552
Flushing cached template relations that have become invalid...
46-
Warn for undocumented namespaces...
4753
Computing class relations...
4854
Add enum values to enums...
4955
Searching for member function documentation...
@@ -90,9 +96,9 @@ Generating class documentation...
9096
Generating concept documentation...
9197
Generating module documentation...
9298
Generating namespace documentation...
93-
Generating docs for namespace materialxocio.core
94-
Generating docs for compound materialxocio.core.OCIOMaterialaxGenerator...
95-
Generating docs for namespace materialxocio.genOCIODefinitions
99+
Generating docs for namespace materialxocio::core
100+
Generating docs for compound materialxocio::core::OCIOMaterialaxGenerator...
101+
Generating docs for namespace materialxocio::genOCIODefinitions
96102
Generating graph info page...
97103
Generating directory documentation...
98104
Generating index page...
@@ -115,5 +121,5 @@ finalizing index lists...
115121
writing tag file...
116122
Running plantuml with JAVA...
117123
type lookup cache used 47/65536 hits=1 misses=47
118-
symbol lookup cache used 55/65536 hits=656 misses=55
124+
symbol lookup cache used 52/65536 hits=373 misses=52
119125
finished...

docs/html/____init_____8py_source.html

Lines changed: 0 additions & 110 deletions
This file was deleted.

docs/html/annotated.html

Lines changed: 0 additions & 113 deletions
This file was deleted.

0 commit comments

Comments
 (0)