diff --git a/flask/converters/images/render_converter_1.png b/flask/converters/images/render_converter_1.png new file mode 100644 index 0000000..f270334 Binary files /dev/null and b/flask/converters/images/render_converter_1.png differ diff --git a/flask/converters/images/render_converter_2.png b/flask/converters/images/render_converter_2.png new file mode 100644 index 0000000..8e82743 Binary files /dev/null and b/flask/converters/images/render_converter_2.png differ diff --git a/flask/converters/static/js/MaterialXConversionApp.js b/flask/converters/static/js/MaterialXConversionApp.js index 08df8fe..51f458e 100644 --- a/flask/converters/static/js/MaterialXConversionApp.js +++ b/flask/converters/static/js/MaterialXConversionApp.js @@ -124,7 +124,7 @@ export class MaterialX_Conversion_Client extends WebSocketClient { // Copy the content from CodeMirror back to the textarea materialXTextArea.value = this.editor.getValue(); }); - this.editor.setSize('auto', '40em'); + this.editor.setSize('auto', '300px'); /////////////////////////////////////////////////////////////////////////////// diff --git a/flask/converters/templates/MaterialXConversionApp.html b/flask/converters/templates/MaterialXConversionApp.html index 47d14d5..78cd76c 100644 --- a/flask/converters/templates/MaterialXConversionApp.html +++ b/flask/converters/templates/MaterialXConversionApp.html @@ -22,7 +22,7 @@ .CodeMirror { font-size: 11px; border: solid thin lightskyblue; - height: 50em; + height: 20em; } @@ -46,9 +46,9 @@ /* Resizer element */ .resizer { - width: 10px; + width: 5px; cursor: ew-resize; - background-color: #dbdbdb; + background-color: #2d85ea; position: relative; } @@ -59,7 +59,7 @@ top: 0; bottom: 0; left: 50%; - border-left: 1px solid #ccc; + border-left: 1px solid #2d85ea; } @@ -70,7 +70,7 @@ -
+

MaterialX Server Rendering

Sample showing rendering of the document using the C++ MaterialxView @@ -105,26 +105,22 @@

MaterialX Server Rendering

-
-

MaterialX Conversion

- -

Sample showing support for glTF Texture Procedural, MaterialX, and OpenUSD interop - OpenUSD conversion uses the usd-core Python package with - custom code to generate a simplified USD document (*). glTF Texture Procedural - conversion uses the Python library found here -
- (*) Note that synchronization of USD to MaterialX 1.39 - is the target. -

+
+

MaterialX Server Conversion

+ + Sample support for glTF Texture Procedural, MaterialX, and OpenUSD interop + OpenUSD uses the latest usd-core custom generation of simplified USD. glTF + uses this library. +
-
+
-
- +
+
@@ -201,20 +197,18 @@

MaterialX Conversion

const resizableElements = resizableContainer.querySelectorAll('[id$="_RS"]'); resizableElements.forEach(element => { element.id = element.id.replace('_RS', ''); - console.log('RS element.id', element.id); + //console.log('RS element.id', element.id); }); - // Initialize the resizer initializeResizer(); - } else { - console.log('>>>>>>>>>>>>>>>>> Non resizable mode'); - + } + else { // Find all elements with an ID that ends with "Resizable" const resizableElements = nonResizableContainer.querySelectorAll('[id$="_NR"]'); resizableElements.forEach(element => { element.id = element.id.replace('_NR', ''); - console.log('NR element.id', element.id); + //console.log('NR element.id', element.id); }); // Show non-resizable container and hide resizable container @@ -233,6 +227,14 @@

MaterialX Conversion

} else { toggleResizableMode(false); } + + const wantgltf = urlParams.get('hidegltf'); + const glTF_container = document.getElementById('glTF_container'); + if (hidegltf=='true' || hidegltf=='1') { + glTF_container.style.display = 'none'; + } else { + glTF_container.style.display = 'block'; + }