Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.39 cleanup #17

Merged
merged 2 commits into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v3
uses: actions/configure-pages@v5
- name: Upload artifact
uses: actions/upload-pages-artifact@v2
uses: actions/upload-pages-artifact@v3
with:
# Upload entire repository
path: '.'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ See the [home page](https://kwokcb.github.io/materialxgltf/) for this project.
Below is an example of converting the "Sci Fi Helmet" asset (found in the **[glTF Sample Model repository](https://github.com/KhronosGroup/glTF-Sample-Assets/tree/main/Models/SciFiHelmet)**) to MaterialX and previewing.
<!--
<img src="https://github.com/kwokcb/glTF_MaterialX/raw/main/docs/gltf_import-graphEditor2.png" width="80%"> -->
<img src="https://github.com/kwokcb/materialxgltf/docs/images/SciFiHelmet_graph.png" width="100%">
<img src="https://kwokcb.github.io/materialxgltf/docs/images/SciFiHelmet_graph.png" width="100%">

The functionality found here is equivalent to the C++ module available in
**[this repository](https://github.com/kwokcb/glTF_MaterialX)**. Note that additional documentation can be found on that site.
Expand Down Expand Up @@ -145,7 +145,7 @@ The sample input file is the "BoomBox with Axes" file from the glTF https://gith

This is converted from glTF to a MaterialX document which can be previewed / modified using an integration which supports MaterialX. Here the file is loaded into the a graph editor

<img src="https://github.com/kwokcb/materialxgltf/docs/images/BoomBox_graph.png" alt="Graph Editor Snapshot" width="100%">
<img src="https://kwokcb.github.io/materialxgltf/docs/images/BoomBox_graph.png" alt="Graph Editor Snapshot" width="100%">


The converted materials are then used to create a new glTF file using sample "shaderball" data with each material found assigned to different instances of the "shaderball"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ <h1><a class="anchor" id="autotoc_md5"></a>
<p>This package supports the bi-directional translation between MaterialX materials and glTF materials. The minimum version of MaterialX required is 1.38.9 and the target glTF version is 2.0.1. The current package is synced with MaterialX release 1.39.</p>
<p>See the <a href="https://kwokcb.github.io/materialxgltf/">home page</a> for this project.</p>
<p>Below is an example of converting the "Sci Fi Helmet" asset (found in the <b><a href="https://github.com/KhronosGroup/glTF-Sample-Assets/tree/main/Models/SciFiHelmet">glTF Sample Model repository</a></b>) to MaterialX and previewing.</p>
<p><img src="https://github.com/kwokcb/materialxgltf/docs/images/SciFiHelmet_graph.png" alt="" width="100%" class="inline"/></p>
<p><img src="https://kwokcb.github.io/materialxgltf/docs/images/SciFiHelmet_graph.png" alt="" width="100%" class="inline"/></p>
<p>The functionality found here is equivalent to the C++ module available in <b><a href="https://github.com/kwokcb/glTF_MaterialX">this repository</a></b>. Note that additional documentation can be found on that site.</p>
<h1><a class="anchor" id="autotoc_md6"></a>
Installation</h1>
Expand Down Expand Up @@ -185,7 +185,7 @@ <h1><a class="anchor" id="autotoc_md12"></a>
<p>The sample input file is the "BoomBox with Axes" file from the glTF <a href="https://github.com/KhronosGroup/glTF-Sample-Assets/tree/main/Models/sitory">https://github.com/KhronosGroup/glTF-Sample-Assets/tree/main/Models/sitory</a> found <b><a href="https://github.com/KhronosGroup/glTF-Sample-Assets/tree/main/Models/BoomBoxWithAxes/glTF">here</a></b>.</p>
<p><img src="https://github.com/KhronosGroup/glTF-Sample-Assets/blob/main/Models/BoomBoxWithAxes/screenshot/screenshot_large.jpg?raw=true" alt="" width="30%" class="inline"/></p>
<p>This is converted from glTF to a MaterialX document which can be previewed / modified using an integration which supports MaterialX. Here the file is loaded into the a graph editor</p>
<p><img src="https://github.com/kwokcb/materialxgltf/docs/images/BoomBox_graph.png" alt="Graph Editor Snapshot" width="100%" class="inline"/></p>
<p><img src="https://kwokcb.github.io/materialxgltf/docs/images/BoomBox_graph.png" alt="Graph Editor Snapshot" width="100%" class="inline"/></p>
<p>The converted materials are then used to create a new glTF file using sample "shaderball" data with each material found assigned to different instances of the "shaderball"</p>
<p><img src="https://raw.githubusercontent.com/kwokcb/MaterialX_Learn/main/documents/images/mtlx_to_gltf_materialviewer.png" alt="VSCode Snapshot" width="50%" class="inline"/></p>
<h1><a class="anchor" id="autotoc_md13"></a>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/navtreedata.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ var NAVTREE =

var NAVTREEINDEX =
[
""
"____main_____8py.html#a0fdc40264ff91ec3c2e0b7e02ab0aa08"
];

var SYNCONMSG = 'click to disable panel synchronisation';
Expand Down
10 changes: 5 additions & 5 deletions docs/html/navtreeindex0.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
var NAVTREEINDEX0 =
{
"":[1,0,0],
"":[1,0,0,0],
"":[1,0,0,1],
"":[1,0,0,2],
"____main_____8py.html#a0fdc40264ff91ec3c2e0b7e02ab0aa08":[1,0,0,0,0],
"annotated.html":[2,0],
"classes.html":[2,1],
Expand Down Expand Up @@ -115,5 +111,9 @@ var NAVTREEINDEX0 =
"namespacemembers.html":[1,1,0],
"namespacemembers_func.html":[1,1,1],
"namespaces.html":[1,0],
"pages.html":[]
"pages.html":[],
"":[1,0,0,0],
"":[1,0,0,1],
"":[1,0,0],
"":[1,0,0,2]
};