diff --git a/flask/converters/static/js/MaterialXConversionApp.js b/flask/converters/static/js/MaterialXConversionApp.js index 51f458e..08df8fe 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', '300px'); + this.editor.setSize('auto', '40em'); /////////////////////////////////////////////////////////////////////////////// diff --git a/flask/converters/templates/MaterialXConversionApp.html b/flask/converters/templates/MaterialXConversionApp.html index 484bc62..47d14d5 100644 --- a/flask/converters/templates/MaterialXConversionApp.html +++ b/flask/converters/templates/MaterialXConversionApp.html @@ -1,5 +1,6 @@ + @@ -14,9 +15,9 @@ - - - + + + + + + - + - -
-

MaterialX Conversion App

- -

Sample application used to support glTF node graph / MaterialX / OpenUSD interop - testing and site deployment. OpenUSD conversion uses usd-core and - custom code to generate a simplified USD document (*). glTF Texture Procedural - conversion uses the library found here -
- (*) Note that synchronization of USD to MaterialX 1.39 - is the target. + +

+

MaterialX Server Rendering

+

+ Sample showing rendering of the document using the C++ MaterialxView + core utility.

-
-
- - + -
-
- - + +
+
+
+ + +
+
+ + +
+ +
+ +
+

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. +

+
-
-
-
+
- +
-
+
@@ -82,8 +143,99 @@

MaterialX Conversion App

// Setup text formatting client.setupXML(); }; + + + - + + - + + \ No newline at end of file diff --git a/flask/gpuopen/data/Motley Patchwork Rug.zip b/flask/gpuopen/data/Motley Patchwork Rug.zip new file mode 100644 index 0000000..6de4f14 Binary files /dev/null and b/flask/gpuopen/data/Motley Patchwork Rug.zip differ