Bump build to 1.39.5 (dev) and ocio 2.5.0 (#4)

Author: kwokcb

README.html

@@ -376,22 +376,22 @@ <h3 id="installation">Installation</h3>
 </div></code></pre>
 <p>The distribution will be available on PyPi in the near future as <code>materialxocio</code>.</p>
 <h3 id="dependencies">Dependencies</h3>
-<p>The utilities require the following dependencies:</p>
+<p>The utilities have the following minimal dependencies:</p>
 <ul>
 <li>OpenColorIO 2.2 and above</li>
 <li>MaterialX 1.38.9 and above</li>
 </ul>
-<p>The latest version tested with is MaterialX 1.39.2 and OpenColorIO 2.4.1</p>
+<p>The latest version tested with is MaterialX 1.39.5 (development) and OpenColorIO 2.5.0 (release)</p>
 <h3 id="command-line-utilities">Command Line Utilities</h3>
 <p>The repository contains the following command line utilities:</p>
 <ul>
-<li>generateOCIODefinitions: Generates MaterialX node definitions from the default ACES Cg config for<br>
+<li>generateOCIODefinitions: Generates MaterialX node definitions from the default ACES Cg config for
 color transforms without LUTs. Each transform is from the source colorspace to lin_rec709.</li>
 <li>If source code implementations are generated, each definition consists of:
 <ul>
 <li>A node definition MaterialX file</li>
 <li>A node implementation MaterialX file</li>
-<li>Source code in the GLSL shading language. Note that options to use other OCIO<br>
+<li>Source code in the GLSL shading language. Note that options to use other OCIO
 provided languages can be added.</li>
 </ul>
 </li>

README.md

@@ -20,12 +20,12 @@ The distribution will be available on PyPi in the near future as `materialxocio`
 
 ### Dependencies
 
-The utilities require the following dependencies:
+The utilities have the following minimal dependencies:
 
 - OpenColorIO 2.2 and above
 - MaterialX 1.38.9 and above
 
-The latest version tested with is MaterialX 1.39.2 and OpenColorIO 2.4.1
+The latest version tested with is MaterialX 1.39.5 (development) and OpenColorIO 2.5.0 (release)
 
 ### Command Line Utilities
 

docs/data/acescg_to_lin_rec709_color3.mtlx

@@ -10,7 +10,7 @@
     </convert>
     <transform name="matrixTransform" type="vector3">
       <input name="in" type="vector3" nodename="asVec" />
-      <input name="mat" type="matrix33" value="1.7050509926579815, -0.6217921206570056, -0.0832588720009797, -0.1302564175070435, 1.1408047365754048, -0.010548319068357653, -0.024003356804618042, -0.1289689760649709, 1.1529723328695858" />
+      <input name="mat" type="matrix33" value="1.7050509926579815, -0.6217921206570057, -0.08325887200097967, -0.1302564175070435, 1.140804736575405, -0.010548319068357662, -0.024003356804618046, -0.12896897606497093, 1.1529723328695858" />
     </transform>
     <convert name="asColor" type="color3">
       <input name="in" type="vector3" nodename="matrixTransform" />

docs/data/mx_acescg_to_lin_rec709_color4.glsl

@@ -10,7 +10,7 @@ vec4 mx_acescg_to_lin_rec709_color4(vec4 inPixel)
   {
     vec4 res = vec4(outColor.rgb.r, outColor.rgb.g, outColor.rgb.b, outColor.a);
     vec4 tmp = res;
-    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;
+    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;
     outColor.rgb = vec3(res.x, res.y, res.z);
     outColor.a = res.w;
   }

docs/data/mx_acescg_to_lin_rec709_color4.osl

@@ -8,10 +8,7 @@
 
 vector4 __operator__mul__(matrix m, vector4 v)
 {
-  return vector4(v.x * m[0][0] + v.y * m[0][1] + v.z * m[0][2] + v.w * m[0][3], 
-                 v.x * m[1][0] + v.y * m[1][1] + v.z * m[1][2] + v.w * m[1][3], 
-                 v.x * m[2][0] + v.y * m[2][1] + v.z * m[2][2] + v.w * m[2][3], 
-                 v.x * m[3][0] + v.y * m[3][1] + v.z * m[3][2] + v.w * m[3][3]);
+  return transform(m, v);
 }
 
 vector4 __operator__mul__(color4 c, vector4 v)
@@ -54,6 +51,7 @@ vector4 max(vector4 v, color4 c)
 shader OSL_mx_acescg_to_lin_rec709_color4(color4 inColor = {color(0), 1}, output color4 outColor = {color(0), 1})
 {
 
+
 // Declaration of the OCIO shader function
 
 color4 mx_acescg_to_lin_rec709_color4(color4 inPixel)
@@ -65,7 +63,7 @@ color4 mx_acescg_to_lin_rec709_color4(color4 inPixel)
   {
     vector4 res = vector4(outColor.rgb.r, outColor.rgb.g, outColor.rgb.b, outColor.a);
     vector4 tmp = res;
-    res = matrix(1.7050509926579815, -0.62179212065700562, -0.0832588720009797, 0., -0.1302564175070435, 1.1408047365754048, -0.010548319068357653, 0., -0.024003356804618042, -0.1289689760649709, 1.1529723328695858, 0., 0., 0., 0., 1.) * tmp;
+    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;
     outColor.rgb = vector(res.x, res.y, res.z);
     outColor.a = res.w;
   }

docs/doxygen_log.txt

@@ -1,5 +1,13 @@
 warning: Tag 'OUTPUT_TEXT_DIRECTION' at line 102 of file 'Doxyfile' has become obsolete.
          To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u"
+warning: Tag 'CLANG_ASSISTED_PARSING' at line 1161 of file 'Doxyfile' belongs to an option that was not enabled at compile time.
+         To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u", or recompile doxygen with this feature enabled.
+warning: Tag 'CLANG_ADD_INC_PATHS' at line 1167 of file 'Doxyfile' belongs to an option that was not enabled at compile time.
+         To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u", or recompile doxygen with this feature enabled.
+warning: Tag 'CLANG_OPTIONS' at line 1175 of file 'Doxyfile' belongs to an option that was not enabled at compile time.
+         To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u", or recompile doxygen with this feature enabled.
+warning: Tag 'CLANG_DATABASE_PATH' at line 1188 of file 'Doxyfile' belongs to an option that was not enabled at compile time.
+         To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u", or recompile doxygen with this feature enabled.
 warning: Tag 'HTML_TIMESTAMP' at line 1335 of file 'Doxyfile' has become obsolete.
          To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u"
 warning: Tag 'FORMULA_TRANSPARENT' at line 1640 of file 'Doxyfile' has become obsolete.
@@ -23,31 +31,35 @@ warning: Tag 'DOT_TRANSPARENT' at line 2630 of file 'Doxyfile' has become obsole
 warning: tag INCLUDE_PATH: include path './src' does not exist
 warning: source './src' is not a readable file or directory... skipping.
 warning: Specified markdown mainpage 'README.md' does not exist
-D:/work/materialx/MaterialXocio/src/materialxocio/core.py:57: warning: Member printConfigs(self, configs) (function) of class materialxocio.core.OCIOMaterialaxGenerator is not documented.
-D:/work/materialx/MaterialXocio/src/materialxocio/core.py:82: warning: Member setShaderDescriptionParameters(self, shaderDesc, sourceSpace, targetSpace, typeName) (function) of class materialxocio.core.OCIOMaterialaxGenerator is not documented.
-D:/work/materialx/MaterialXocio/src/materialxocio/core.py:186: warning: Member MSL(self, config, sourceColorSpace, targetColorSpace) (function) of class materialxocio.core.OCIOMaterialaxGenerator is not documented.
-D:/work/materialx/MaterialXocio/src/materialxocio/core.py:193: warning: Member OSL(self, config, sourceColorSpace, targetColorSpace) (function) of class materialxocio.core.OCIOMaterialaxGenerator is not documented.
-D:/work/materialx/MaterialXocio/src/materialxocio/genOCIODefinitions.py:29: warning: Member main() (function) of namespace materialxocio.genOCIODefinitions is not documented.
-Doxygen version used: 1.12.0 (c73f5d30f9e8b1df5ba15a1d064ff2067cbb8267)
+/Users/bernardkwok/work/materialxocio/src/materialxocio/core.py:491: warning: Reached end of file while still searching closing '`' of a verbatim block starting at line 25
+/Users/bernardkwok/work/materialxocio/src/materialxocio/core.py:491: warning: Reached end of file while still inside a (nested) comment. Nesting level 1 (possible line reference(s): 2)
+/Users/bernardkwok/work/materialxocio/README.md:1: warning: No matching directory found for command \dir /Users/bernardkwok/work/materialxocio/
+/Users/bernardkwok/work/materialxocio/src/materialxocio/core.py:57: warning: Member printConfigs(self, configs) (function) of class materialxocio.core.OCIOMaterialaxGenerator is not documented.
+/Users/bernardkwok/work/materialxocio/src/materialxocio/core.py:82: warning: Member setShaderDescriptionParameters(self, shaderDesc, sourceSpace, targetSpace, typeName) (function) of class materialxocio.core.OCIOMaterialaxGenerator is not documented.
+/Users/bernardkwok/work/materialxocio/src/materialxocio/core.py:186: warning: Member MSL(self, config, sourceColorSpace, targetColorSpace) (function) of class materialxocio.core.OCIOMaterialaxGenerator is not documented.
+/Users/bernardkwok/work/materialxocio/src/materialxocio/core.py:193: warning: Member OSL(self, config, sourceColorSpace, targetColorSpace) (function) of class materialxocio.core.OCIOMaterialaxGenerator is not documented.
+/Users/bernardkwok/work/materialxocio/src/materialxocio/genOCIODefinitions.py:29: warning: Member main() (function) of namespace materialxocio.genOCIODefinitions is not documented.
+Doxygen version used: 1.15.0
 Searching for include files...
 Searching for example files...
 Searching for images...
 Searching for dot files...
 Searching for msc files...
 Searching for dia files...
+Searching for plantuml files...
 Searching for files to exclude
 Searching INPUT for files to process...
-Searching for files in directory D:/work/materialx/MaterialXocio/src/materialxocio
-Searching for files in directory D:/work/materialx/MaterialXocio/
+Searching for files in directory /Users/bernardkwok/work/materialxocio/src/materialxocio
+Searching for files in directory /Users/bernardkwok/work/materialxocio/
 Reading and parsing tag files
 Parsing files
-Reading D:/work/materialx/MaterialXocio/src/materialxocio/__init__.py...
-Parsing file D:/work/materialx/MaterialXocio/src/materialxocio/__init__.py...
-Reading D:/work/materialx/MaterialXocio/src/materialxocio/core.py...
-Parsing file D:/work/materialx/MaterialXocio/src/materialxocio/core.py...
-Reading D:/work/materialx/MaterialXocio/src/materialxocio/genOCIODefinitions.py...
-Parsing file D:/work/materialx/MaterialXocio/src/materialxocio/genOCIODefinitions.py...
-Reading D:/work/materialx/MaterialXocio/README.md...
+Reading /Users/bernardkwok/work/materialxocio/src/materialxocio/__init__.py...
+Parsing file /Users/bernardkwok/work/materialxocio/src/materialxocio/__init__.py...
+Reading /Users/bernardkwok/work/materialxocio/src/materialxocio/core.py...
+Parsing file /Users/bernardkwok/work/materialxocio/src/materialxocio/core.py...
+Reading /Users/bernardkwok/work/materialxocio/src/materialxocio/genOCIODefinitions.py...
+Parsing file /Users/bernardkwok/work/materialxocio/src/materialxocio/genOCIODefinitions.py...
+Reading /Users/bernardkwok/work/materialxocio/README.md...
 Building macro definition list...
 Building group list...
 Building directory list...
@@ -72,6 +84,7 @@ Searching for documented defines...
 Computing class inheritance relations...
 Computing class usage relations...
 Flushing cached template relations that have become invalid...
+Warn for undocumented namespaces...
 Computing class relations...
 Add enum values to enums...
 Searching for member function documentation...
@@ -118,13 +131,12 @@ Generating class documentation...
 Generating concept documentation...
 Generating module documentation...
 Generating namespace documentation...
-Generating docs for namespace materialxocio::core
-Generating docs for compound materialxocio::core::OCIOMaterialaxGenerator...
-Generating docs for namespace materialxocio::genOCIODefinitions
+Generating docs for namespace materialxocio.core
+Generating docs for compound materialxocio.core.OCIOMaterialaxGenerator...
+Generating docs for namespace materialxocio.genOCIODefinitions
 Generating graph info page...
 Generating directory documentation...
 Generating index page...
-Generating main page...
 Generating page index...
 Generating topic index...
 Generating module index...
@@ -143,5 +155,5 @@ finalizing index lists...
 writing tag file...
 Running plantuml with JAVA...
 type lookup cache used 51/65536 hits=2 misses=51
-symbol lookup cache used 52/65536 hits=383 misses=52
+symbol lookup cache used 50/65536 hits=565 misses=50
 finished...

docs/html/____init_____8py_source.html

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=11"/>
-<meta name="generator" content="Doxygen 1.12.0"/>
+<meta name="generator" content="Doxygen 1.15.0"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>MaterialXOCIO: __init__.py Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -13,7 +13,6 @@
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
@@ -37,26 +36,20 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.12.0 -->
+<!-- Generated by Doxygen 1.15.0 -->
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
 var searchBox = new SearchBox("searchBox", "search/",'.html');
-/* @license-end */
 </script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
-$(function() { codefold.init(0); });
-/* @license-end */
+$(function() { codefold.init(); });
 </script>
 <script type="text/javascript" src="menudata.js"></script>
 <script type="text/javascript" src="menu.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
 $(function() {
   initMenu('',true,false,'search.php','Search',true);
   $(function() { init_search(); });
 });
-/* @license-end */
 </script>
 <div id="main-nav"></div>
 </div><!-- top -->
@@ -71,10 +64,9 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
-$(function(){initNavTree('____init_____8py_source.html',''); initResizable(true); });
-/* @license-end */
+$(function(){initNavTree('____init_____8py_source.html','',''); });
 </script>
+<div id="container">
 <div id="doc-content">
 <!-- window showing the filter options -->
 <div id="MSearchSelectWindow"
@@ -102,15 +94,16 @@
 </div><!--header-->
 <div class="contents">
 <div class="fragment"><div class="line"><a id="l00001" name="l00001"></a><span class="lineno">    1</span><span class="comment"># Version</span></div>
-<div class="line"><a id="l00002" name="l00002"></a><span class="lineno">    2</span>__version__ = <span class="stringliteral">&#39;0.1.39.2&#39;</span></div>
+<div class="line"><a id="l00002" name="l00002"></a><span class="lineno">    2</span>__version__ = <span class="stringliteral">&#39;0.1.39.5&#39;</span></div>
 <div class="line"><a id="l00003" name="l00003"></a><span class="lineno">    3</span> </div>
 </div><!-- fragment --></div><!-- contents -->
 </div><!-- doc-content -->
+</div><!-- container -->
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <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>
-    <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>
+    <li class="navelem"><b>src</b></li><li class="navelem"><b>materialxocio</b></li><li class="navelem"><b>__init__.py</b></li>
+    <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>
   </ul>
 </div>
 </body>