Additional improvements to web viewer

- Merge separate code paths for GUI initialization and folder clearing. - Use the GUI constructor for title assignment.
AcademySoftwareFoundation · Dec 20, 2023 · 39138cf · 39138cf
1 parent 00e5f73
commit 39138cf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 30 deletions.
diff --git a/javascript/MaterialXView/source/index.js b/javascript/MaterialXView/source/index.js
@@ -41,7 +41,7 @@ function init()
     materialsSelect.value = materialFilename;
     materialsSelect.addEventListener('change', (e) => {
         materialFilename = e.target.value;
-        viewer.getEditor().clearFolders();
+        viewer.getEditor().initialize();
         viewer.getMaterial().loadMaterials(viewer, materialFilename);
         viewer.getEditor().updateProperties(0.9);
         viewer.getScene().setUpdateTransforms();
@@ -122,7 +122,7 @@ function init()
 
     setLoadingCallback(file => {
         materialFilename = file.fullPath || file.name;
-        viewer.getEditor().clearFolders();
+        viewer.getEditor().initialize();
         viewer.getMaterial().loadMaterials(viewer, materialFilename);
         viewer.getEditor().updateProperties(0.9);
         viewer.getScene().setUpdateTransforms();

diff --git a/javascript/MaterialXView/source/viewer.js b/javascript/MaterialXView/source/viewer.js
@@ -416,6 +416,21 @@ export class Scene
 */
 export class Editor
 {
+    // Initialize the editor, clearing any elements from previous materials.
+    initialize()
+    {
+        Array.from(document.getElementsByClassName('lil-gui')).forEach(
+            function (element, index, array) {
+                if (element.className) {
+                    element.remove();
+                }
+            }
+        );
+
+        this._gui = new GUI( { title: "Property Editor" } );
+        this._gui.close();
+    }
+
     // Update ui properties
     // - Hide close button
     // - Update transparency so scene shows through if overlapping
@@ -439,34 +454,6 @@ export class Editor
         }
     }
 
-    //
-    // Clear folders with children contain elements for any previous material
-    // and recreate top gui.
-    //
-    clearFolders()
-    {
-        Array.from(document.getElementsByClassName('lil-gui')).forEach(
-            function (element, index, array) {
-                if (element.className) {
-                    element.remove();
-                }
-            }
-        );
-
-        // Create new GUI.
-        this._gui = new GUI();
-    }
-
-    // Create the editor
-    initialize() 
-    {
-        this.clearFolders();
-        this._gui.title("Property Editor");
-        this._gui.close();
-
-        return this._gui;
-    }
-
     getGUI() 
     {
         return this._gui;