Merge pull request #806 from AleziaKurdis/CreateApp_renderWithZoneMan…

…ager Create app: RenderWithZones Manager
overte-org · Feb 26, 2024 · 6631128 · 6631128
2 parents c19142c + e367e2c
commit 6631128
Show file tree

Hide file tree

Showing 6 changed files with 882 additions and 2 deletions.
diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js
@@ -4,7 +4,7 @@
 //  Persist toolbar by HRS 6/11/15.
 //  Copyright 2014 High Fidelity, Inc.
 //  Copyright 2020 Vircadia contributors.
-//  Copyright 2022-2023 Overte e.V.
+//  Copyright 2022-2024 Overte e.V.
 //
 //  This script allows you to edit entities with a new UI/UX for mouse and trackpad based editing
 //
@@ -38,6 +38,7 @@
         "entitySelectionTool/entitySelectionTool.js",
         "audioFeedback/audioFeedback.js",
         "modules/brokenURLReport.js",
+        "modules/renderWithZonesManager.js",
         "editModes/editModes.js",
         "editModes/editVoxels.js"
     ]);

diff --git a/scripts/system/create/entityList/entityList.js b/scripts/system/create/entityList/entityList.js
@@ -4,7 +4,7 @@
 //
 //  Copyright 2014 High Fidelity, Inc.
 //  Copyright 2020 Vircadia contributors.
-//  Copyright 2023 Overte e.V.
+//  Copyright 2023-2024 Overte e.V.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -422,6 +422,8 @@ var EntityListTool = function(shouldUseEditTabletApp, selectionManager) {
             that.createApp.alignGridToAvatar();
         } else if (data.type === 'brokenURLReport') {
             brokenURLReport(that.selectionManager.selections);
+        } else if (data.type === 'renderWithZonesManager') {
+            renderWithZonesManager(that.selectionManager.selections);
         } else if (data.type === 'toggleGridVisibility') {
             that.createApp.toggleGridVisibility();
         } else if (data.type === 'toggleSnapToGrid') {

diff --git a/scripts/system/create/entityList/html/entityList.html b/scripts/system/create/entityList/html/entityList.html
@@ -4,6 +4,7 @@
 //  Created by Ryan Huffman on 19 Nov 2014
 //  Copyright 2014 High Fidelity, Inc.
 //  Copyright 2020 Vircadia contributors.
+//  Copyright 2024 Overte e.V.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -316,6 +317,12 @@
                     <div class = "menu-item-shortcut"></div>
                 </div>
             </button>
+            <button class="menu-button" id="renderWithZonesManager" >
+                <div class = "menu-item">
+                    <div class = "menu-item-caption">RenderWithZones Manager</div>
+                    <div class = "menu-item-shortcut"></div>
+                </div>
+            </button>
         </div>
         <div id="menuBackgroundOverlay" ></div>
     </body>

diff --git a/scripts/system/create/entityList/html/js/entityList.js b/scripts/system/create/entityList/html/js/entityList.js
@@ -3,6 +3,7 @@
 //  Created by Ryan Huffman on 19 Nov 2014
 //  Copyright 2014 High Fidelity, Inc.
 //  Copyright 2020 Vircadia contributors.
+//  Copyright 2024 Overte e.V.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -273,6 +274,7 @@ let elEntityTable,
     elAlignGridToSelection,
     elAlignGridToAvatar,
     elBrokenURLReport,
+    elRenderWithZonesManager,
     elFilterTypeMultiselectBox,
     elFilterTypeText,
     elFilterTypeOptions,
@@ -361,6 +363,7 @@ function loaded() {
         elAlignGridToSelection = document.getElementById("alignGridToSelection");
         elAlignGridToAvatar = document.getElementById("alignGridToAvatar");
         elBrokenURLReport = document.getElementById("brokenURLReport");
+        elRenderWithZonesManager = document.getElementById("renderWithZonesManager");
         elFilterTypeMultiselectBox = document.getElementById("filter-type-multiselect-box");
         elFilterTypeText = document.getElementById("filter-type-text");
         elFilterTypeOptions = document.getElementById("filter-type-options");
@@ -603,6 +606,10 @@ function loaded() {
             EventBridge.emitWebEvent(JSON.stringify({ type: "brokenURLReport" }));
             closeAllEntityListMenu();
         };
+        elRenderWithZonesManager.onclick = function () {
+            EventBridge.emitWebEvent(JSON.stringify({ type: "renderWithZonesManager" }));
+            closeAllEntityListMenu();
+        };        
         elToggleSpaceMode.onclick = function() {
             EventBridge.emitWebEvent(JSON.stringify({ type: "toggleSpaceMode" }));
         };