Skip to content

Commit

Permalink
April 8, 2024 Update. (#152)
Browse files Browse the repository at this point in the history
  • Loading branch information
@kwokcb
kwokcb authored Apr 8, 2024
1 parent d5447d1 commit d5862d2
Show file tree
Hide file tree
Showing 325 changed files with 51,853 additions and 22,127 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ If you find value in here and want support its progress, Please consider sponsor

## Visit the site
<a href="https://kwokcb.github.io/MaterialX_Learn/">
<img loading="lazy" src="./documents/images/march_2024_1.38.9_final.png" width="60%">
<img src="./documents/images/march_2024_1.38.9_final.png" width="60%">
</a>

## March, 2024 Update
Expand Down
341 changes: 341 additions & 0 deletions about.html
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions about.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ In the "spirit" of MaterialX, the site design tries to match the related content
<table>
<tr>
<td>
<img loading="lazy" src="../documents/images/MX%20Learn.svg" class="img-fluid" style="width:100%">
<img src="../documents/images/MX%20Learn.svg" class="img-fluid" style="width:100%">
</td>
<td>
<img loading="lazy" src="../documents/images/logo3d_2.png" class="rounded-4 img-fluid" style="width:60%">
<img src="../documents/images/logo3d_2.png" class="rounded-4 img-fluid" style="width:60%">
</td>
<td>
<img loading="lazy" src="../documents/images/web_logo_poster.png" class="rounded-4 img-fluid" style="width:100%">
<img src="../documents/images/web_logo_poster.png" class="rounded-4 img-fluid" style="width:100%">
</td>
</tr>
<table>
Expand All @@ -33,7 +33,7 @@ with open standards as an active contributor for MaterialX at the Academy Softwa

### Development

<a href="https://github.com/kwokcb/MaterialX_Learn" target="_blank"><img loading="lazy" src="../documents/images/GitHub_Logo.png" width="50" style="background-color: white"></a> The hope is that this site will grow organically over time based on user feedback.
<a href="https://github.com/kwokcb/MaterialX_Learn" target="_blank"><img src="../documents/images/GitHub_Logo.png" width="50" style="background-color: white"></a> The hope is that this site will grow organically over time based on user feedback.

Naturally any contributions are greatly appreciated, especially in terms of "learning" tutorials, and example user workflows. More will be added to the GitHub repo as things progress.

Expand All @@ -47,7 +47,7 @@ Currently all content is structured to be as reusable as possible outside of thi
<tr>
<td>
<a href="https://www.linkedin.com/in/bernard-cb-kwok/" target="_blank">
<img loading="lazy" src="../documents/images/bernard_filtered.png" class=m-2 rounded-4 float-end height="128">
<img src="../documents/images/bernard_filtered.png" class=m-2 rounded-4 float-end height="128">
<br>Bernard Kwok</a>
<hr>
Bernard has been working in the graphics industry for 30+ years in the areas of rendering, games and interactive workflows. His current passion is open standards and is an active contributor for <a href="https://github.com/AcademySoftwareFoundation/MaterialX" target="_blank">MaterialX</a>
Expand All @@ -56,7 +56,7 @@ Foundation</a> and the <a href="https://www.khronos.org/gltf/" target="_blank">K

<td>
<a href="https://www.linkedin.com/in/mgkwok/" target="_blank">
<img loading="lazy" src="../documents/images/matthew_filtered.png" class="m-2 rounded-4 float-end" height="128"><br>Matthew Kwok</a>
<img src="../documents/images/matthew_filtered.png" class="m-2 rounded-4 float-end" height="128"><br>Matthew Kwok</a>
<hr>
Matthew is a <a href="https://guannankwok.wixstudio.io/uxportfolio" target="_blank">UX designer</a> with experience in graphic design and content creation.
His current interests lie in the area of learning and visualization for web and AR,
Expand Down
31 changes: 18 additions & 13 deletions documents/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="Authors: Bernard Kwok and Matthew Kwok. Resource site for the
Academy Software Foundation MaterialX -- an open source industry standard for 3D / Cg materials.
Resources include interaction with related standards: OpenUSD, Khronos glTF, OpenImageIO.">

<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-J7404418VP"></script>
Expand All @@ -22,24 +25,26 @@
}
</style>

<link rel="icon" href="../documents/images/logo3d_icon.png" type="image/x-icon" />
<!-- <link rel="icon" href="../documents/images/logo3d_icon.png" type="image/x-icon" /> -->
<!--
<link rel="icon" href="../documents/images/logo3d_2_small.png" type="image/x-icon" />
-->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.1.0/css/all.css">
<!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.1.0/css/all.css"> -->

<link rel="stylesheet" href="../documents/css/style.css">

<!--
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Roboto&display=swap" rel="stylesheet">
-->



<title>MaterialX Learn</title>
<link rel="icon" type="images" href="../documents/images/logo3d_icon.png" class="img-fluid">
<link rel="icon" type="images" href="../documents/images/logo3d_icon.png" type="image/x-icon" class="img-fluid">

</head>

Expand All @@ -53,7 +58,7 @@
<nav class="navbar sticky-top navbar-expand-lg bg-dark-subtle" data-bs-theme="dark">
<div class="container-md container-fluid">
<a class="navbar-brand" href="../index.html">
<h5><img loading="lazy" src="../documents/images/logo3d_2_small.png" alt="MaterialX Learn"
<h5><img src="../documents/images/logo3d_2_small.png" alt="MaterialX Learn"
class="rounded d-inline-block align-text-center" width="50px">
MaterialX Learn</h5>
</a>
Expand Down Expand Up @@ -111,7 +116,7 @@ <h5><img loading="lazy" src="../documents/images/logo3d_2_small.png" alt="Materi
href="../documents/definitions/library_glossary.html">Library
Glossary</a></li>
<li><a class="dropdown-item" href="https://materialx.org/docs/api/annotated.html"
target="_blank"><img loading="lazy" src="../documents/images/MaterialXLogo_200x155.png"
target="_blank"><img src="../documents/images/MaterialXLogo_200x155.png"
style="width:20px"> C++ API</a></li>

<li class="dropend">
Expand Down Expand Up @@ -146,7 +151,7 @@ <h5><img loading="lazy" src="../documents/images/logo3d_2_small.png" alt="Materi
<div class="dropdown-divider"></div>
<li>
<a class="dropdown-item" href="../documents/using_library.html">
<img loading="lazy" src="../documents/images/info-circle.svg"> Library User Guide
<img src="../documents/images/info-circle.svg"> Library User Guide
</a>
</li>
</ul>
Expand Down Expand Up @@ -235,18 +240,18 @@ <h2>About</h2>
<div class="row p-1 rounded-4 border btn-outline-secondary shadow justify-content-evenly">
<!--md-center-->
<div class="col-4">
<img loading="lazy" src="./images/MX Learn.svg" class="img-fluid" style="height:100%">
<img src="./images/MX Learn.svg" class="img-fluid" style="height:100%">
</div>
<div class="col-4">
<img loading="lazy" src="./images/logo3d_2.png" class="rounded-4 img-fluid" style="width:75%">
<img src="./images/logo3d_2.png" class="rounded-4 img-fluid" style="width:75%">
</div>
<div class="col-4">
<model-viewer class="rounded-4" style="background-color: rgb(59, 59, 59); width: 100%; height:100%" id="blah"
<model-viewer class="rounded-4" style="background-color: rgba(59, 59, 59, 0.0); width: 100%; height:100%" id="blah"
camera-controls touch-action="pan-y" src="../resources/logo3d.glb"
disable-zoom disable-pan disable-tap camera-orbit="160deg 66deg 20m"
environment-image="./images/rural_crossroads_1k.hdr" alt="logo viewer"
poster="./images/web_logo_poster.png" exposure="1.0" shadow-softness="0.5" shadow-intensity="0.7"
skybox-image="./images/rural_crossroads_1k.hdr">
skybox-image="">
</model-viewer>
</div>
</div>
Expand Down Expand Up @@ -284,7 +289,7 @@ <h4>Authors</h4>
<div class="col-6 " >
<p>
<a href="https://www.linkedin.com/in/bernard-cb-kwok/" target="_blank">
<img loading="lazy" src="images/bernard_filtered.png" class="m-2 rounded-4 float-end" height="128">
<img src="images/bernard_filtered.png" class="m-2 rounded-4 float-end" height="128">
Bernard Kwok</a>: Bernard has been working in the graphics industry for 30+ years in the areas
of rendering, games and interactive workflows. His current passion is open standards
and is an active contributor for
Expand All @@ -297,7 +302,7 @@ <h4>Authors</h4>
</div>
<div class="col-6">

<a href="https://www.linkedin.com/in/mgkwok/" target="_blank"><img loading="lazy" src="images/matthew_filtered.png" class="m-2 rounded-4 float-end" height="128">
<a href="https://www.linkedin.com/in/mgkwok/" target="_blank"><img src="images/matthew_filtered.png" class="m-2 rounded-4 float-end" height="128">
Matthew Kwok</a>: Matthew is a <a href="https://guannankwok.wixstudio.io/uxportfolio" target="_blank">UX designer</a> with experience in product design for content creation.
His current interests lie in the area of learning and visualization for web and AR,
which includes workflows using realistic materials.
Expand Down Expand Up @@ -329,7 +334,7 @@ <h4>Authors</h4>
</ul>
<p>
<a class="bg-dark p-2 right" rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">
<img loading="lazy" alt="Creative Commons License" style="border-width:0"
<img alt="Creative Commons License" style="border-width:0"
src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a>
&copy; 2022-2024 NanMu Consulting.</a>
</p>
Expand Down
Loading

0 comments on commit d5862d2

Please sign in to comment.