Skip to content

Commit 0ebc51a

Browse files
committed
Update main docs.
1 parent 6018ac7 commit 0ebc51a

7 files changed

Lines changed: 77 additions & 34 deletions

File tree

README.html

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -398,10 +398,10 @@ <h4>Introduction</h4>
398398
<br>
399399
<div style="display: flex; align-items: center;">
400400
<img src="https://polyhaven.com/Logo%20256.png" width="64px" style="margin-right: 5px;">
401-
<a href="https://polyhaven.com/">PolyHaven Library</a> MaterialX assets can be downloaded (as zip files). Images and MaterialX documents can be extracted for any of the posted materials in the database. (More functionality is in progress)
401+
<a href="https://polyhaven.com/">PolyHaven Library</a> MaterialX assets can be downloaded (as zip files). Images and MaterialX documents can be extracted for any of the posted materials in the database.
402402
</div>
403403
</p>
404-
Each currently has <code>Python</code> or <code>Javascript</code> implementations, except for <em>Polyhaven</em> which only currently has <code>Python</code> support.
404+
Each currently has <code>Python</code> or <code>Javascript</code> implementations.
405405
</div><p><div class="container p-4 rounded-4 border border-secondary border-rounded">
406406
<h4>Usage Examples</h4>
407407
<iframe
@@ -431,21 +431,31 @@ <h5>3. ambientCg</h5>
431431
<p>A <b>NodeJS / Express</b> application can also be found on the <a href="https://kwokcb.github.io/materialxWeb/index.html" target="_blank">MaterialXWeb</a> site.</p>
432432
<p>This is designed to be a general purpose MaterialX <em>material inspector</em> supporting <code>ambientCg</code> and <code>GPUOpen</code> currently with the intent to add new libraries as they become available.</p>
433433
<img src="https://github.com/kwokcb/materialxWeb/blob/main/nodejs/materialxLibraryInspector/public/images/ambientCg_download_2.png?raw=true" width=50%>
434-
</div><p><div class="container p-4 rounded-4 border border-secondary border-rounded">
435434
<hr>
436435
<h5>4. PolyHaven</h5>
437436
<p>A Python library and command <code>polyHavenLoader</code> and <code>polyHavenLoaderCmd</code> are currently available which can<br>
438437
produce a filtered list of assets (textures) which have<br>
439438
MaterialX representations. This list cna be used to download<br>
440439
specific assets and save to zip format.</p>
441-
<h5>Loading into Web Editor</h5>
440+
<p>A Javascript library and Web interface is available <a href="https://kwokcb.github.io/materialxMaterials/javascript/JsPolyHaven/" target="__default">here</a>. Filtering by classification, name tags, and dependent image resolution is available. Materials may be previewed and / or saved.</p>
441+
<table>
442+
<tr>
443+
<td><img src="https://kwokcb.github.io/materialxMaterials/documents/images/PolyHaven_Page_0.png" width=100%></td>
444+
<td><img src="https://kwokcb.github.io/materialxMaterials/documents/images/PolyHaven_Page_1a.png" width=100%></td>
445+
<td><img src="https://kwokcb.github.io/materialxMaterials/documents/images/PolyHaven_Page_1b.png" width=100%></td>
446+
</tr>
447+
</table>
448+
</div><p><div class="container p-4 rounded-4 border border-secondary border-rounded">
449+
<h4>Loading into Web Editor</h4>
442450
<p>
443-
Below are screenshots of materials fetched from from <code>PhysicallyBased</code> and <code>GPU Open</code> and <code>ambientCg></code> (left to right images respectively). Note that the material zip from <code>GPU Open</code> and <code>ambientCg</code> is directly read into the editor via it's zip loading option.
451+
Below are screenshots of materials fetched from <code>PhysicallyBased</code>, <code>GPU Open</code>, <code>ambientCg></code> and <code>PolyHaven</code> (left to right images respectively).
452+
<p>Note that the material zip from <code>GPU Open</code> and <code>ambientCg</code> is directly read into the editor via it's zip loading option. <code>PolyHaven</code> builds a zip to allow loading via the zip loading option.</p>
444453
<table>
445454
<tr>
446455
<td><img src="https://kwokcb.github.io/MaterialXLab/documents/help/images/load_phybased_node_editor.png" width=100%></td>
447456
<td><img src="https://kwokcb.github.io/MaterialXLab/documents/help/images/load_zip_node_editor_3.png" width=100%></td>
448457
<td><img src="https://kwokcb.github.io/MaterialXLab/documents/help/images/load_ambientCG_node_editor.png" width=100%></td>
458+
<td><img src="https://kwokcb.github.io/materialxMaterials/documents/images/load_polyhaven_node_editor.png" width=100%></td>
449459
</tr>
450460
</table>
451461
</p>

README.md

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ either be mapped to MaterialX materials or are natively stored in that format.
4040
<br>
4141
<div style="display: flex; align-items: center;">
4242
<img src="https://polyhaven.com/Logo%20256.png" width="64px" style="margin-right: 5px;">
43-
<a href="https://polyhaven.com/">PolyHaven Library</a> MaterialX assets can be downloaded (as zip files). Images and MaterialX documents can be extracted for any of the posted materials in the database. (More functionality is in progress)
43+
<a href="https://polyhaven.com/">PolyHaven Library</a> MaterialX assets can be downloaded (as zip files). Images and MaterialX documents can be extracted for any of the posted materials in the database.
4444
</div>
4545

4646
</p>
47-
Each currently has <code>Python</code> or <code>Javascript</code> implementations, except for <em>Polyhaven</em> which only currently has <code>Python</code> support.
47+
Each currently has <code>Python</code> or <code>Javascript</code> implementations.
4848

4949
</div><p><div class="container p-4 rounded-4 border border-secondary border-rounded">
5050

@@ -87,8 +87,6 @@ This is designed to be a general purpose MaterialX *material inspector* supporti
8787

8888
<img src="https://github.com/kwokcb/materialxWeb/blob/main/nodejs/materialxLibraryInspector/public/images/ambientCg_download_2.png?raw=true" width=50%>
8989

90-
</div><p><div class="container p-4 rounded-4 border border-secondary border-rounded">
91-
9290
<hr>
9391
<h5>4. PolyHaven</h5>
9492

@@ -97,15 +95,30 @@ produce a filtered list of assets (textures) which have
9795
MaterialX representations. This list cna be used to download
9896
specific assets and save to zip format.
9997

100-
<h5>Loading into Web Editor</h5>
98+
A Javascript library and Web interface is available <a href="https://kwokcb.github.io/materialxMaterials/javascript/JsPolyHaven/" target="__default">here</a>. Filtering by classification, name tags, and dependent image resolution is available. Materials may be previewed and / or saved.
99+
100+
<table>
101+
<tr>
102+
<td><img src="https://kwokcb.github.io/materialxMaterials/documents/images/PolyHaven_Page_0.png" width=100%></td>
103+
<td><img src="https://kwokcb.github.io/materialxMaterials/documents/images/PolyHaven_Page_1a.png" width=100%></td>
104+
<td><img src="https://kwokcb.github.io/materialxMaterials/documents/images/PolyHaven_Page_1b.png" width=100%></td>
105+
</tr>
106+
</table>
107+
108+
</div><p><div class="container p-4 rounded-4 border border-secondary border-rounded">
109+
110+
<h4>Loading into Web Editor</h4>
101111

102112
<p>
103-
Below are screenshots of materials fetched from from <code>PhysicallyBased</code> and <code>GPU Open</code> and <code>ambientCg></code> (left to right images respectively). Note that the material zip from <code>GPU Open</code> and <code>ambientCg</code> is directly read into the editor via it's zip loading option.
113+
Below are screenshots of materials fetched from <code>PhysicallyBased</code>, <code>GPU Open</code>, <code>ambientCg></code> and <code>PolyHaven</code> (left to right images respectively).
114+
115+
Note that the material zip from <code>GPU Open</code> and <code>ambientCg</code> is directly read into the editor via it's zip loading option. <code>PolyHaven</code> builds a zip to allow loading via the zip loading option.
104116
<table>
105117
<tr>
106118
<td><img src="https://kwokcb.github.io/MaterialXLab/documents/help/images/load_phybased_node_editor.png" width=100%></td>
107119
<td><img src="https://kwokcb.github.io/MaterialXLab/documents/help/images/load_zip_node_editor_3.png" width=100%></td>
108120
<td><img src="https://kwokcb.github.io/MaterialXLab/documents/help/images/load_ambientCG_node_editor.png" width=100%></td>
121+
<td><img src="https://kwokcb.github.io/materialxMaterials/documents/images/load_polyhaven_node_editor.png" width=100%></td>
109122
</tr>
110123
</table>
111124
</p>

documents/doxygen_warnings.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ D:/Work/materialx/materialxMaterials/src/materialxMaterials/polyHavenLoader.py:3
5050
D:/Work/materialx/materialxMaterials/myserver.py:9: warning: Member end_headers(self) (function) of class myserver.MyHTTPRequestHandler is not documented.
5151
D:/Work/materialx/materialxMaterials/README.md:58: warning: Unsupported xml/html tag <iframe> found
5252
D:/Work/materialx/materialxMaterials/README.md:59: warning: Unsupported xml/html tag </iframe> found
53-
D:/Work/materialx/materialxMaterials/README.md:317: warning: end of comment block while expecting command </div>
53+
D:/Work/materialx/materialxMaterials/README.md:330: warning: end of comment block while expecting command </div>

0 commit comments

Comments
 (0)