Skip to content

Commit 52e4146

Browse files
kwokcbkwokcb
authored
OCIO Node Graph Updates (#5)
* Update to use current default config. Replace old data files with 2.5 generated data files. Update examples building script to build graphs in addition to source impls. Still WIP to get all ops in but can be used for (regression) testing. * - Add in range, min, max clamping transform support. - Fix output file name as ":" may appear in colorspace names. * Fix namespace + invalid docs - Fix more places using ":" in color space name - Fix validation errors: value being left when nodename set. * More hard-coded attr fixes. * Fix range and offset. * Fix range to handle Nan properly. Clamp precssion. * Fix up exponentn + offset. Fix range check for None to avoid skipping. * Add log camera transform support.
1 parent cbdd977 commit 52e4146

File tree

178 files changed

+5473
-3513
lines changed

Some content is hidden

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

178 files changed

+5473
-3513
lines changed

‎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.6217921206570056, -0.0832588720009797, -0.1302564175070435, 1.1408047365754048, -0.010548319068357653, -0.024003356804618042, -0.1289689760649709, 1.1529723328695858" />
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" />
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.024003356804618042, 0., -0.62179212065700562, 1.1408047365754048, -0.1289689760649709, 0., -0.0832588720009797, -0.010548319068357653, 1.1529723328695858, 0., 0., 0., 0., 1.) * tmp;
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;
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.024003356804618042, 0., -0.62179212065700562, 1.1408047365754048, -0.1289689760649709, 0., -0.0832588720009797, -0.010548319068357653, 1.1529723328695858, 0., 0., 0., 0., 1.) * tmp;
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;
6767
outColor.rgb = vector(res.x, res.y, res.z);
6868
outColor.a = res.w;
6969
}

‎docs/doxygen_log.txt‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,27 @@
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)
1+
/Users/bernardkwok/work/materialxocio/src/materialxocio/core.py:73: warning: argument 'str' of command @param is not found in the argument list of materialxocio.core.OCIOMaterialaxGenerator::createValidName(self, str name)
2+
/Users/bernardkwok/work/materialxocio/src/materialxocio/core.py:73: warning: The following parameter of materialxocio.core.OCIOMaterialaxGenerator.createValidName(self, str name) is not documented:
3+
parameter 'name'
4+
Doxygen version used: 1.15.0
105
Searching for include files...
11-
Searching for files in directory D:/Work/materialx/materialxocio/src
6+
Searching for files in directory /Users/bernardkwok/work/materialxocio/src
127
Searching for example files...
138
Searching for images...
149
Searching for dot files...
1510
Searching for msc files...
1611
Searching for dia files...
12+
Searching for plantuml files...
1713
Searching for files to exclude
1814
Searching INPUT for files to process...
19-
Searching for files in directory D:/Work/materialx/materialxocio/src/materialxocio
15+
Searching for files in directory /Users/bernardkwok/work/materialxocio/src/materialxocio
2016
Reading and parsing tag files
2117
Parsing files
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...
18+
Reading /Users/bernardkwok/work/materialxocio/src/materialxocio/__init__.py...
19+
Parsing file /Users/bernardkwok/work/materialxocio/src/materialxocio/__init__.py...
20+
Reading /Users/bernardkwok/work/materialxocio/src/materialxocio/core.py...
21+
Parsing file /Users/bernardkwok/work/materialxocio/src/materialxocio/core.py...
22+
Reading /Users/bernardkwok/work/materialxocio/src/materialxocio/genOCIODefinitions.py...
23+
Parsing file /Users/bernardkwok/work/materialxocio/src/materialxocio/genOCIODefinitions.py...
24+
Reading /Users/bernardkwok/work/materialxocio/README.md...
2925
Building macro definition list...
3026
Building group list...
3127
Building directory list...
@@ -50,6 +46,7 @@ Searching for documented defines...
5046
Computing class inheritance relations...
5147
Computing class usage relations...
5248
Flushing cached template relations that have become invalid...
49+
Warn for undocumented namespaces...
5350
Computing class relations...
5451
Add enum values to enums...
5552
Searching for member function documentation...
@@ -96,9 +93,9 @@ Generating class documentation...
9693
Generating concept documentation...
9794
Generating module documentation...
9895
Generating namespace documentation...
99-
Generating docs for namespace materialxocio::core
100-
Generating docs for compound materialxocio::core::OCIOMaterialaxGenerator...
101-
Generating docs for namespace materialxocio::genOCIODefinitions
96+
Generating docs for namespace materialxocio.core
97+
Generating docs for compound materialxocio.core.OCIOMaterialaxGenerator...
98+
Generating docs for namespace materialxocio.genOCIODefinitions
10299
Generating graph info page...
103100
Generating directory documentation...
104101
Generating index page...
@@ -120,6 +117,6 @@ Generating example index...
120117
finalizing index lists...
121118
writing tag file...
122119
Running plantuml with JAVA...
123-
type lookup cache used 47/65536 hits=1 misses=47
124-
symbol lookup cache used 52/65536 hits=373 misses=52
120+
type lookup cache used 53/65536 hits=3 misses=53
121+
symbol lookup cache used 58/65536 hits=717 misses=58
125122
finished...

‎docs/html/____init_____8py_source.html‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
55
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
6-
<meta name="generator" content="Doxygen 1.12.0"/>
6+
<meta name="generator" content="Doxygen 1.15.0"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>MaterialXOCIO: __init__.py Source File</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -13,7 +13,6 @@
1313
<link href="navtree.css" rel="stylesheet" type="text/css"/>
1414
<script type="text/javascript" src="navtreedata.js"></script>
1515
<script type="text/javascript" src="navtree.js"></script>
16-
<script type="text/javascript" src="resize.js"></script>
1716
<script type="text/javascript" src="cookie.js"></script>
1817
<link href="search/search.css" rel="stylesheet" type="text/css"/>
1918
<script type="text/javascript" src="search/searchdata.js"></script>
@@ -37,26 +36,20 @@
3736
</table>
3837
</div>
3938
<!-- end header part -->
40-
<!-- Generated by Doxygen 1.12.0 -->
39+
<!-- Generated by Doxygen 1.15.0 -->
4140
<script type="text/javascript">
42-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
4341
var searchBox = new SearchBox("searchBox", "search/",'.html');
44-
/* @license-end */
4542
</script>
4643
<script type="text/javascript">
47-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
48-
$(function() { codefold.init(0); });
49-
/* @license-end */
44+
$(function() { codefold.init(); });
5045
</script>
5146
<script type="text/javascript" src="menudata.js"></script>
5247
<script type="text/javascript" src="menu.js"></script>
5348
<script type="text/javascript">
54-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
5549
$(function() {
5650
initMenu('',true,false,'search.php','Search',true);
5751
$(function() { init_search(); });
5852
});
59-
/* @license-end */
6053
</script>
6154
<div id="main-nav"></div>
6255
</div><!-- top -->
@@ -71,10 +64,9 @@
7164
</div>
7265
</div>
7366
<script type="text/javascript">
74-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
75-
$(function(){initNavTree('____init_____8py_source.html',''); initResizable(true); });
76-
/* @license-end */
67+
$(function(){initNavTree('____init_____8py_source.html','',''); });
7768
</script>
69+
<div id="container">
7870
<div id="doc-content">
7971
<!-- window showing the filter options -->
8072
<div id="MSearchSelectWindow"
@@ -106,11 +98,12 @@
10698
<div class="line"><a id="l00003" name="l00003"></a><span class="lineno"> 3</span> </div>
10799
</div><!-- fragment --></div><!-- contents -->
108100
</div><!-- doc-content -->
101+
</div><!-- container -->
109102
<!-- start footer part -->
110103
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
111104
<ul>
112-
<li class="navelem"><a class="el" href="dir_68267d1309a1af8e8297ef4c3efbcdba.html">src</a></li><li class="navelem"><a class="el" href="dir_fac5a7ed8ffd2d94e13f059ed632e0b1.html">materialxocio</a></li><li class="navelem"><b>__init__.py</b></li>
113-
<li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.12.0 </li>
105+
<li class="navelem"><b>src</b></li><li class="navelem"><b>materialxocio</b></li><li class="navelem"><b>__init__.py</b></li>
106+
<li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.15.0 </li>
114107
</ul>
115108
</div>
116109
</body>

‎docs/html/annotated.html‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
55
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
6-
<meta name="generator" content="Doxygen 1.12.0"/>
6+
<meta name="generator" content="Doxygen 1.15.0"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>MaterialXOCIO: Class List</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -13,7 +13,6 @@
1313
<link href="navtree.css" rel="stylesheet" type="text/css"/>
1414
<script type="text/javascript" src="navtreedata.js"></script>
1515
<script type="text/javascript" src="navtree.js"></script>
16-
<script type="text/javascript" src="resize.js"></script>
1716
<script type="text/javascript" src="cookie.js"></script>
1817
<link href="search/search.css" rel="stylesheet" type="text/css"/>
1918
<script type="text/javascript" src="search/searchdata.js"></script>
@@ -37,26 +36,20 @@
3736
</table>
3837
</div>
3938
<!-- end header part -->
40-
<!-- Generated by Doxygen 1.12.0 -->
39+
<!-- Generated by Doxygen 1.15.0 -->
4140
<script type="text/javascript">
42-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
4341
var searchBox = new SearchBox("searchBox", "search/",'.html');
44-
/* @license-end */
4542
</script>
4643
<script type="text/javascript">
47-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
48-
$(function() { codefold.init(0); });
49-
/* @license-end */
44+
$(function() { codefold.init(); });
5045
</script>
5146
<script type="text/javascript" src="menudata.js"></script>
5247
<script type="text/javascript" src="menu.js"></script>
5348
<script type="text/javascript">
54-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
5549
$(function() {
5650
initMenu('',true,false,'search.php','Search',true);
5751
$(function() { init_search(); });
5852
});
59-
/* @license-end */
6053
</script>
6154
<div id="main-nav"></div>
6255
</div><!-- top -->
@@ -71,10 +64,9 @@
7164
</div>
7265
</div>
7366
<script type="text/javascript">
74-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
75-
$(function(){initNavTree('annotated.html',''); initResizable(true); });
76-
/* @license-end */
67+
$(function(){initNavTree('annotated.html','',''); });
7768
</script>
69+
<div id="container">
7870
<div id="doc-content">
7971
<!-- window showing the filter options -->
8072
<div id="MSearchSelectWindow"
@@ -103,17 +95,18 @@
10395
<div class="contents">
10496
<div class="textblock">Here are the classes, structs, unions and interfaces with brief descriptions:</div><div class="directory">
10597
<div class="levels">[detail level <span onclick="javascript:dynsection.toggleLevel(1);">1</span><span onclick="javascript:dynsection.toggleLevel(2);">2</span><span onclick="javascript:dynsection.toggleLevel(3);">3</span>]</div><table class="directory">
106-
<tr id="row_0_" class="even"><td class="entry"><span style="width:0px;display:inline-block;">&#160;</span><span id="arr_0_" class="arrow" onclick="dynsection.toggleFolder('0_')">&#9660;</span><span class="icona"><span class="icon">N</span></span><b>materialxocio</b></td><td class="desc"></td></tr>
107-
<tr id="row_0_0_" class="odd"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span id="arr_0_0_" class="arrow" onclick="dynsection.toggleFolder('0_0_')">&#9660;</span><span class="icona"><span class="icon">N</span></span><a class="el" href="namespacematerialxocio_1_1core.html" target="_self">core</a></td><td class="desc">Utilities to generate MaterialX color transform definitions using OCIO </td></tr>
98+
<tr id="row_0_" class="even"><td class="entry"><span style="width:0px;display:inline-block;">&#160;</span><span id="arr_0_" class="arrow" onclick="dynsection.toggleFolder('0_')"><span class="arrowhead opened"></span></span><span class="icona"><span class="icon">N</span></span><b>materialxocio</b></td><td class="desc"></td></tr>
99+
<tr id="row_0_0_" class="odd"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span id="arr_0_0_" class="arrow" onclick="dynsection.toggleFolder('0_0_')"><span class="arrowhead opened"></span></span><span class="icona"><span class="icon">N</span></span><a class="el" href="namespacematerialxocio_1_1core.html" target="_self">core</a></td><td class="desc">Utilities to generate MaterialX color transform definitions using OCIO </td></tr>
108100
<tr id="row_0_0_0_" class="even"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classmaterialxocio_1_1core_1_1_o_c_i_o_materialax_generator.html" target="_self">OCIOMaterialaxGenerator</a></td><td class="desc">A class to generate MaterialX color transform definitions using OCIO </td></tr>
109101
</table>
110102
</div><!-- directory -->
111103
</div><!-- contents -->
112104
</div><!-- doc-content -->
105+
</div><!-- container -->
113106
<!-- start footer part -->
114107
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
115108
<ul>
116-
<li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.12.0 </li>
109+
<li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.15.0 </li>
117110
</ul>
118111
</div>
119112
</body>

‎docs/html/classes.html‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
55
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
6-
<meta name="generator" content="Doxygen 1.12.0"/>
6+
<meta name="generator" content="Doxygen 1.15.0"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>MaterialXOCIO: Class Index</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -13,7 +13,6 @@
1313
<link href="navtree.css" rel="stylesheet" type="text/css"/>
1414
<script type="text/javascript" src="navtreedata.js"></script>
1515
<script type="text/javascript" src="navtree.js"></script>
16-
<script type="text/javascript" src="resize.js"></script>
1716
<script type="text/javascript" src="cookie.js"></script>
1817
<link href="search/search.css" rel="stylesheet" type="text/css"/>
1918
<script type="text/javascript" src="search/searchdata.js"></script>
@@ -37,26 +36,20 @@
3736
</table>
3837
</div>
3938
<!-- end header part -->
40-
<!-- Generated by Doxygen 1.12.0 -->
39+
<!-- Generated by Doxygen 1.15.0 -->
4140
<script type="text/javascript">
42-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
4341
var searchBox = new SearchBox("searchBox", "search/",'.html');
44-
/* @license-end */
4542
</script>
4643
<script type="text/javascript">
47-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
48-
$(function() { codefold.init(0); });
49-
/* @license-end */
44+
$(function() { codefold.init(); });
5045
</script>
5146
<script type="text/javascript" src="menudata.js"></script>
5247
<script type="text/javascript" src="menu.js"></script>
5348
<script type="text/javascript">
54-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
5549
$(function() {
5650
initMenu('',true,false,'search.php','Search',true);
5751
$(function() { init_search(); });
5852
});
59-
/* @license-end */
6053
</script>
6154
<div id="main-nav"></div>
6255
</div><!-- top -->
@@ -71,10 +64,9 @@
7164
</div>
7265
</div>
7366
<script type="text/javascript">
74-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
75-
$(function(){initNavTree('classes.html',''); initResizable(true); });
76-
/* @license-end */
67+
$(function(){initNavTree('classes.html','',''); });
7768
</script>
69+
<div id="container">
7870
<div id="doc-content">
7971
<!-- window showing the filter options -->
8072
<div id="MSearchSelectWindow"
@@ -109,10 +101,11 @@
109101
</div>
110102
</div><!-- contents -->
111103
</div><!-- doc-content -->
104+
</div><!-- container -->
112105
<!-- start footer part -->
113106
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
114107
<ul>
115-
<li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.12.0 </li>
108+
<li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.15.0 </li>
116109
</ul>
117110
</div>
118111
</body>

0 commit comments

Comments
 (0)