From b633bc4a164ecfa44ce7b063b5bf2e676d2b4672 Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Sat, 21 Nov 2020 15:44:15 -0500
Subject: [PATCH] Excluding EntityShapeVisualizer from Children list

Excluding EntityShapeVisualizer from Children list
Now a name is given to the EntityShape of the EntityShapeVisualizer (used to display the zone)
so we can now exclude them from the children list when it's time to figure if there are children for an entity.
(This is a better approach than excluding al the local entities)
The name has been used because it gives better results than trying to use the id map that arrive always too late.
The name is unique for a session, it includes a UUID.
---
 .../system/create/modules/entityShapeVisualizer.js  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/scripts/system/create/modules/entityShapeVisualizer.js b/scripts/system/create/modules/entityShapeVisualizer.js
index dbf09a1cb7..45cf68fdb5 100644
--- a/scripts/system/create/modules/entityShapeVisualizer.js
+++ b/scripts/system/create/modules/entityShapeVisualizer.js
@@ -116,12 +116,14 @@ function deepCopy(v) {
     return JSON.parse(JSON.stringify(v));
 }
 
-function EntityShape(entityID) {
+function EntityShape(entityID, entityShapeVisualizerSessionName) {
     this.entityID = entityID;
+    this.entityShapeVisualizerSessionName = entityShapeVisualizerSessionName;
+
     var propertiesForType = getEntityShapePropertiesForType(Entities.getEntityProperties(entityID, REQUESTED_ENTITY_SHAPE_PROPERTIES));
 
     this.previousPropertiesForType = propertiesForType;
-
+    
     this.initialize(propertiesForType);
 }
 
@@ -130,6 +132,7 @@ EntityShape.prototype = {
         // Create new instance of JS object:
         var overlayProperties = deepCopy(properties);
 
+        overlayProperties.name = this.entityShapeVisualizerSessionName;
         overlayProperties.localPosition = Vec3.ZERO;
         overlayProperties.localRotation = Quat.IDENTITY;
         overlayProperties.canCastShadows = false;
@@ -172,11 +175,11 @@ EntityShape.prototype = {
     }
 };
 
-function EntityShapeVisualizer(visualizedTypes) {
+function EntityShapeVisualizer(visualizedTypes, entityShapeVisualizerSessionName) {
     this.acceptedEntities = [];
     this.ignoredEntities = [];
     this.entityShapes = {};
-
+    this.entityShapeVisualizerSessionName = entityShapeVisualizerSessionName;
     this.visualizedTypes = visualizedTypes;
 }
 
@@ -185,7 +188,7 @@ EntityShapeVisualizer.prototype = {
         if (this.entityShapes[entityID]) {
             return;
         }
-        this.entityShapes[entityID] = new EntityShape(entityID);
+        this.entityShapes[entityID] = new EntityShape(entityID, this.entityShapeVisualizerSessionName);
 
     },
     updateEntity: function(entityID) {