Skip to content

Commit 4b63a53

Browse files
kwokcbkwokcb
authored
Add transmission color remap (#3)
* Add transmission color remap If metallness == roughness == 0 and transmission and color then set transmission color = color. * Update docs. * Add pillow dependence. * Patch js. * Cleanup.
1 parent 2ee6f6d commit 4b63a53

File tree

85 files changed

+2231
-1291
lines changed

Some content is hidden

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

85 files changed

+2231
-1291
lines changed

‎README.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ <h3>Dependencies</h3>
407407
<ol>
408408
<li>The MaterialX 1.39 or greater package for PhysicallyBased OpenPBR shader creation</li>
409409
<li>The <code>requests</code> package.</li>
410+
<li>The <code>pillow</code> package for image handling for GPUOpen package handling</li>
410411
</ol>
411412
<h3>Building</h3>
412413
<p>The <a href="https://github.com/kwokcb/materialxMaterials"><img src="https://raw.githubusercontent.com/kwokcb/materialxMaterials/20cbe6bde0844699824a9a7a05afe882c42b071d/documents/icons/github-mark-white.svg?token=ALYVGHLEDNQAPHZHPUNJNP3GXTAUQ" width=16px> GitHub repository</a> can be cloned and the package built using:</p>

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ The Python utilities require:
4949

5050
1. The MaterialX 1.39 or greater package for PhysicallyBased OpenPBR shader creation
5151
2. The `requests` package.
52+
3. The `pillow` package for image handling for GPUOpen package handling
5253

5354
<h3>Building</h3>
5455

‎documents/html/_js_g_p_u_open_loader_8js_source.html

Lines changed: 256 additions & 0 deletions
Large diffs are not rendered by default.

‎documents/html/_js_material_x_physically_based_8js_source.html

Lines changed: 281 additions & 240 deletions
Large diffs are not rendered by default.

‎documents/html/annotated.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,8 @@
9595
<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="classmaterialx_materials_1_1_g_p_u_open_loader_1_1_g_p_u_open_material_loader.html" target="_self">GPUOpenMaterialLoader</a></td><td class="desc">This class is used to load materials from the GPUOpen material database </td></tr>
9696
<tr id="row_0_1_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span id="arr_0_1_" class="arrow" onclick="toggleFolder('0_1_')">&#9660;</span><span class="icona"><span class="icon">N</span></span><a class="el" href="namespacematerialx_materials_1_1physically_based_material_x.html" target="_self">physicallyBasedMaterialX</a></td><td class="desc">Class to load Physically Based Materials from the PhysicallyBased site </td></tr>
9797
<tr id="row_0_1_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="classmaterialx_materials_1_1physically_based_material_x_1_1_physically_based_material_loader.html" target="_self">PhysicallyBasedMaterialLoader</a></td><td class="desc">Class to load Physically Based Materials from the PhysicallyBased site </td></tr>
98-
<tr id="row_1_"><td class="entry"><span style="width:0px;display:inline-block;">&#160;</span><span id="arr_1_" class="arrow" onclick="toggleFolder('1_')">&#9660;</span><span class="icona"><span class="icon">N</span></span><b>myserver</b></td><td class="desc"></td></tr>
99-
<tr id="row_1_0_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classmyserver_1_1_my_h_t_t_p_request_handler.html" target="_self">MyHTTPRequestHandler</a></td><td class="desc"></td></tr>
100-
<tr id="row_2_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="class_js_physically_based_material_loader.html" target="_self">JsPhysicallyBasedMaterialLoader</a></td><td class="desc">Javascript class for querying materials from the Physically Based database and creating MaterialX materials </td></tr>
98+
<tr id="row_1_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="class_g_p_u_open_material_loader.html" target="_self">GPUOpenMaterialLoader</a></td><td class="desc"></td></tr>
99+
<tr id="row_2_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="class_js_physically_based_material_loader.html" target="_self">JsPhysicallyBasedMaterialLoader</a></td><td class="desc">Javascript class for querying materials from the Physically Based database and creating MaterialX materials </td></tr>
101100
</table>
102101
</div><!-- directory -->
103102
</div><!-- contents -->

‎documents/html/annotated_dup.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ var annotated_dup =
88
[ "PhysicallyBasedMaterialLoader", "classmaterialx_materials_1_1physically_based_material_x_1_1_physically_based_material_loader.html", "classmaterialx_materials_1_1physically_based_material_x_1_1_physically_based_material_loader" ]
99
] ]
1010
] ],
11-
[ "myserver", null, [
12-
[ "MyHTTPRequestHandler", "classmyserver_1_1_my_h_t_t_p_request_handler.html", "classmyserver_1_1_my_h_t_t_p_request_handler" ]
13-
] ],
11+
[ "GPUOpenMaterialLoader", "class_g_p_u_open_material_loader.html", "class_g_p_u_open_material_loader" ],
1412
[ "JsPhysicallyBasedMaterialLoader", "class_js_physically_based_material_loader.html", "class_js_physically_based_material_loader" ]
1513
];

‎documents/html/bc_sd.png

635 Bytes
Loading

‎documents/html/class_g_p_u_open_material_loader-members.html

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2+
<html xmlns="http://www.w3.org/1999/xhtml">
3+
<head>
4+
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
5+
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
6+
<meta name="generator" content="Doxygen 1.9.1"/>
7+
<meta name="viewport" content="width=device-width, initial-scale=1"/>
8+
<title>MaterialXMaterials: Member List</title>
9+
<link href="tabs.css" rel="stylesheet" type="text/css"/>
10+
<script type="text/javascript" src="jquery.js"></script>
11+
<script type="text/javascript" src="dynsections.js"></script>
12+
<link href="navtree.css" rel="stylesheet" type="text/css"/>
13+
<script type="text/javascript" src="resize.js"></script>
14+
<script type="text/javascript" src="navtreedata.js"></script>
15+
<script type="text/javascript" src="navtree.js"></script>
16+
<link href="search/search.css" rel="stylesheet" type="text/css"/>
17+
<script type="text/javascript" src="search/searchdata.js"></script>
18+
<script type="text/javascript" src="search/search.js"></script>
19+
<link href="doxygen.css" rel="stylesheet" type="text/css" />
20+
<link href="doxygen-awesome.css" rel="stylesheet" type="text/css"/>
21+
</head>
22+
<body>
23+
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
24+
<div id="titlearea">
25+
<table cellspacing="0" cellpadding="0">
26+
<tbody>
27+
<tr style="height: 56px;">
28+
<td id="projectalign" style="padding-left: 0.5em;">
29+
<div id="projectname">MaterialXMaterials
30+
&#160;<span id="projectnumber">0.0.1</span>
31+
</div>
32+
<div id="projectbrief">Utilities for retrieving materials from remote servers</div>
33+
</td>
34+
</tr>
35+
</tbody>
36+
</table>
37+
</div>
38+
<!-- end header part -->
39+
<!-- Generated by Doxygen 1.9.1 -->
40+
<script type="text/javascript">
41+
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
42+
var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
43+
/* @license-end */
44+
</script>
45+
<script type="text/javascript" src="menudata.js"></script>
46+
<script type="text/javascript" src="menu.js"></script>
47+
<script type="text/javascript">
48+
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
49+
$(function() {
50+
initMenu('',true,false,'search.php','Search');
51+
$(document).ready(function() { init_search(); });
52+
});
53+
/* @license-end */</script>
54+
<div id="main-nav"></div>
55+
</div><!-- top -->
56+
<div id="side-nav" class="ui-resizable side-nav-resizable">
57+
<div id="nav-tree">
58+
<div id="nav-tree-contents">
59+
<div id="nav-sync" class="sync"></div>
60+
</div>
61+
</div>
62+
<div id="splitbar" style="-moz-user-select:none;"
63+
class="ui-resizable-handle">
64+
</div>
65+
</div>
66+
<script type="text/javascript">
67+
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
68+
$(document).ready(function(){initNavTree('class_g_p_u_open_material_loader.html',''); initResizable(); });
69+
/* @license-end */
70+
</script>
71+
<div id="doc-content">
72+
<!-- window showing the filter options -->
73+
<div id="MSearchSelectWindow"
74+
onmouseover="return searchBox.OnSearchSelectShow()"
75+
onmouseout="return searchBox.OnSearchSelectHide()"
76+
onkeydown="return searchBox.OnSearchSelectKey(event)">
77+
</div>
78+
79+
<!-- iframe showing the search results (closed by default) -->
80+
<div id="MSearchResultsWindow">
81+
<iframe src="javascript:void(0)" frameborder="0"
82+
name="MSearchResults" id="MSearchResults">
83+
</iframe>
84+
</div>
85+
86+
<div class="header">
87+
<div class="headertitle">
88+
<div class="title">GPUOpenMaterialLoader Member List</div> </div>
89+
</div><!--header-->
90+
<div class="contents">
91+
92+
<p>This is the complete list of members for <a class="el" href="class_g_p_u_open_material_loader.html">GPUOpenMaterialLoader</a>, including all inherited members.</p>
93+
<table class="directory">
94+
<tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>constructor</b>() (defined in <a class="el" href="class_g_p_u_open_material_loader.html">GPUOpenMaterialLoader</a>)</td><td class="entry"><a class="el" href="class_g_p_u_open_material_loader.html">GPUOpenMaterialLoader</a></td><td class="entry"></td></tr>
95+
<tr bgcolor="#f0f0f0"><td class="entry"><b>downloadPackage</b>(listNumber, materialNumber, packageId=0) (defined in <a class="el" href="class_g_p_u_open_material_loader.html">GPUOpenMaterialLoader</a>)</td><td class="entry"><a class="el" href="class_g_p_u_open_material_loader.html">GPUOpenMaterialLoader</a></td><td class="entry"></td></tr>
96+
<tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>downloadPackageByExpression</b>(searchExpr, packageId=0) (defined in <a class="el" href="class_g_p_u_open_material_loader.html">GPUOpenMaterialLoader</a>)</td><td class="entry"><a class="el" href="class_g_p_u_open_material_loader.html">GPUOpenMaterialLoader</a></td><td class="entry"></td></tr>
97+
<tr bgcolor="#f0f0f0"><td class="entry"><b>getMaterials</b>() (defined in <a class="el" href="class_g_p_u_open_material_loader.html">GPUOpenMaterialLoader</a>)</td><td class="entry"><a class="el" href="class_g_p_u_open_material_loader.html">GPUOpenMaterialLoader</a></td><td class="entry"></td></tr>
98+
</table></div><!-- contents -->
99+
</div><!-- doc-content -->
100+
<!-- start footer part -->
101+
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
102+
<ul>
103+
<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.9.1 </li>
104+
</ul>
105+
</div>
106+
</body>
107+
</html>

‎documents/html/class_g_p_u_open_material_loader.html

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2+
<html xmlns="http://www.w3.org/1999/xhtml">
3+
<head>
4+
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
5+
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
6+
<meta name="generator" content="Doxygen 1.9.1"/>
7+
<meta name="viewport" content="width=device-width, initial-scale=1"/>
8+
<title>MaterialXMaterials: GPUOpenMaterialLoader Class Reference</title>
9+
<link href="tabs.css" rel="stylesheet" type="text/css"/>
10+
<script type="text/javascript" src="jquery.js"></script>
11+
<script type="text/javascript" src="dynsections.js"></script>
12+
<link href="navtree.css" rel="stylesheet" type="text/css"/>
13+
<script type="text/javascript" src="resize.js"></script>
14+
<script type="text/javascript" src="navtreedata.js"></script>
15+
<script type="text/javascript" src="navtree.js"></script>
16+
<link href="search/search.css" rel="stylesheet" type="text/css"/>
17+
<script type="text/javascript" src="search/searchdata.js"></script>
18+
<script type="text/javascript" src="search/search.js"></script>
19+
<link href="doxygen.css" rel="stylesheet" type="text/css" />
20+
<link href="doxygen-awesome.css" rel="stylesheet" type="text/css"/>
21+
</head>
22+
<body>
23+
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
24+
<div id="titlearea">
25+
<table cellspacing="0" cellpadding="0">
26+
<tbody>
27+
<tr style="height: 56px;">
28+
<td id="projectalign" style="padding-left: 0.5em;">
29+
<div id="projectname">MaterialXMaterials
30+
&#160;<span id="projectnumber">0.0.1</span>
31+
</div>
32+
<div id="projectbrief">Utilities for retrieving materials from remote servers</div>
33+
</td>
34+
</tr>
35+
</tbody>
36+
</table>
37+
</div>
38+
<!-- end header part -->
39+
<!-- Generated by Doxygen 1.9.1 -->
40+
<script type="text/javascript">
41+
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
42+
var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
43+
/* @license-end */
44+
</script>
45+
<script type="text/javascript" src="menudata.js"></script>
46+
<script type="text/javascript" src="menu.js"></script>
47+
<script type="text/javascript">
48+
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
49+
$(function() {
50+
initMenu('',true,false,'search.php','Search');
51+
$(document).ready(function() { init_search(); });
52+
});
53+
/* @license-end */</script>
54+
<div id="main-nav"></div>
55+
</div><!-- top -->
56+
<div id="side-nav" class="ui-resizable side-nav-resizable">
57+
<div id="nav-tree">
58+
<div id="nav-tree-contents">
59+
<div id="nav-sync" class="sync"></div>
60+
</div>
61+
</div>
62+
<div id="splitbar" style="-moz-user-select:none;"
63+
class="ui-resizable-handle">
64+
</div>
65+
</div>
66+
<script type="text/javascript">
67+
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
68+
$(document).ready(function(){initNavTree('class_g_p_u_open_material_loader.html',''); initResizable(); });
69+
/* @license-end */
70+
</script>
71+
<div id="doc-content">
72+
<!-- window showing the filter options -->
73+
<div id="MSearchSelectWindow"
74+
onmouseover="return searchBox.OnSearchSelectShow()"
75+
onmouseout="return searchBox.OnSearchSelectHide()"
76+
onkeydown="return searchBox.OnSearchSelectKey(event)">
77+
</div>
78+
79+
<!-- iframe showing the search results (closed by default) -->
80+
<div id="MSearchResultsWindow">
81+
<iframe src="javascript:void(0)" frameborder="0"
82+
name="MSearchResults" id="MSearchResults">
83+
</iframe>
84+
</div>
85+
86+
<div class="header">
87+
<div class="summary">
88+
<a href="#pub-methods">Public Member Functions</a> &#124;
89+
<a href="class_g_p_u_open_material_loader-members.html">List of all members</a> </div>
90+
<div class="headertitle">
91+
<div class="title">GPUOpenMaterialLoader Class Reference</div> </div>
92+
</div><!--header-->
93+
<div class="contents">
94+
<table class="memberdecls">
95+
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
96+
Public Member Functions</h2></td></tr>
97+
<tr class="memitem:a4155c2fcf6b2c38088f85c63e933aef9"><td class="memItemLeft" align="right" valign="top"><a id="a4155c2fcf6b2c38088f85c63e933aef9"></a>
98+
&#160;</td><td class="memItemRight" valign="bottom"><b>constructor</b> ()</td></tr>
99+
<tr class="separator:a4155c2fcf6b2c38088f85c63e933aef9"><td class="memSeparator" colspan="2">&#160;</td></tr>
100+
<tr class="memitem:aa20236461b74f2fd756649fa63757f05"><td class="memItemLeft" align="right" valign="top"><a id="aa20236461b74f2fd756649fa63757f05"></a>
101+
async&#160;</td><td class="memItemRight" valign="bottom"><b>getMaterials</b> ()</td></tr>
102+
<tr class="separator:aa20236461b74f2fd756649fa63757f05"><td class="memSeparator" colspan="2">&#160;</td></tr>
103+
<tr class="memitem:ae420983c6072cceb216459ed5ab2a2aa"><td class="memItemLeft" align="right" valign="top"><a id="ae420983c6072cceb216459ed5ab2a2aa"></a>
104+
async&#160;</td><td class="memItemRight" valign="bottom"><b>downloadPackage</b> (listNumber, materialNumber, packageId=0)</td></tr>
105+
<tr class="separator:ae420983c6072cceb216459ed5ab2a2aa"><td class="memSeparator" colspan="2">&#160;</td></tr>
106+
<tr class="memitem:a44ccdf25c1654dd628e8351889298e83"><td class="memItemLeft" align="right" valign="top"><a id="a44ccdf25c1654dd628e8351889298e83"></a>
107+
async&#160;</td><td class="memItemRight" valign="bottom"><b>downloadPackageByExpression</b> (searchExpr, packageId=0)</td></tr>
108+
<tr class="separator:a44ccdf25c1654dd628e8351889298e83"><td class="memSeparator" colspan="2">&#160;</td></tr>
109+
</table>
110+
<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
111+
<div class="textblock">
112+
<p class="definition">Definition at line <a class="el" href="_js_g_p_u_open_loader_8js_source.html#l00001">1</a> of file <a class="el" href="_js_g_p_u_open_loader_8js_source.html">JsGPUOpenLoader.js</a>.</p>
113+
</div><hr/>The documentation for this class was generated from the following file:<ul>
114+
<li><a class="el" href="_js_g_p_u_open_loader_8js_source.html">JsGPUOpenLoader.js</a></li>
115+
</ul>
116+
</div><!-- contents -->
117+
</div><!-- doc-content -->
118+
<!-- start footer part -->
119+
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
120+
<ul>
121+
<li class="navelem"><a class="el" href="class_g_p_u_open_material_loader.html">GPUOpenMaterialLoader</a></li>
122+
<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.9.1 </li>
123+
</ul>
124+
</div>
125+
</body>
126+
</html>

‎documents/html/class_g_p_u_open_material_loader.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
var class_g_p_u_open_material_loader =
2+
[
3+
[ "constructor", "class_g_p_u_open_material_loader.html#a4155c2fcf6b2c38088f85c63e933aef9", null ],
4+
[ "downloadPackage", "class_g_p_u_open_material_loader.html#ae420983c6072cceb216459ed5ab2a2aa", null ],
5+
[ "downloadPackageByExpression", "class_g_p_u_open_material_loader.html#a44ccdf25c1654dd628e8351889298e83", null ],
6+
[ "getMaterials", "class_g_p_u_open_material_loader.html#aa20236461b74f2fd756649fa63757f05", null ]
7+
];

0 commit comments

Comments
 (0)