From 5654e3abed40e3e6839c33eb444ed10b244411e6 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 21 Apr 2015 13:23:00 -0700 Subject: [PATCH] Add zone overlay manager --- examples/edit.js | 6 ++++++ examples/libraries/lightOverlayManager.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/examples/edit.js b/examples/edit.js index 480b87d416..091de29374 100644 --- a/examples/edit.js +++ b/examples/edit.js @@ -13,6 +13,8 @@ HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; +Script.include(["libraries/overlays.js"]); + Script.include([ "libraries/stringHelpers.js", "libraries/dataviewHelpers.js", @@ -28,6 +30,7 @@ Script.include([ "libraries/gridTool.js", "libraries/entityList.js", "libraries/lightOverlayManager.js", + "libraries/zoneOverlayManager.js", ]); var selectionDisplay = SelectionDisplay; @@ -35,6 +38,8 @@ var selectionManager = SelectionManager; var entityPropertyDialogBox = EntityPropertyDialogBox; var lightOverlayManager = new LightOverlayManager(); +var zoneOverlayManager = new ZoneOverlayManager(); +zoneOverlayManager.setVisible(true); var cameraManager = new CameraManager(); @@ -47,6 +52,7 @@ var entityListTool = EntityListTool(); selectionManager.addEventListener(function() { selectionDisplay.updateHandles(); lightOverlayManager.updatePositions(); + zoneOverlayManager.updatePositions(); }); var windowDimensions = Controller.getViewportDimensions(); diff --git a/examples/libraries/lightOverlayManager.js b/examples/libraries/lightOverlayManager.js index 8032d77c49..a140461a27 100644 --- a/examples/libraries/lightOverlayManager.js +++ b/examples/libraries/lightOverlayManager.js @@ -122,7 +122,7 @@ LightOverlayManager = function() { Entities.clearingEntities.connect(clearEntities); // Add existing entities - var ids = Entities.findEntities(MyAvatar.position, 100); + var ids = Entities.findEntities(MyAvatar.position, 64000); for (var i = 0; i < ids.length; i++) { addEntity(ids[i]); }