From 269afb9a49faa13263548d70c273b8567023ab4d Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Tue, 7 Aug 2018 11:19:22 -0700 Subject: [PATCH] remove tablet material entities code remove create --- .../controllerModules/inEditMode.js | 19 +++++-------------- scripts/system/libraries/entityList.js | 9 --------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/scripts/system/controllers/controllerModules/inEditMode.js b/scripts/system/controllers/controllerModules/inEditMode.js index 3e53d5af12..d590545532 100644 --- a/scripts/system/controllers/controllerModules/inEditMode.js +++ b/scripts/system/controllers/controllerModules/inEditMode.js @@ -19,7 +19,6 @@ Script.include("/~/system/libraries/utils.js"); (function () { var MARGIN = 25; - var TABLET_MATERIAL_ENTITY_NAME = 'Tablet-Material-Entity'; function InEditMode(hand) { this.hand = hand; this.triggerClicked = false; @@ -77,13 +76,11 @@ Script.include("/~/system/libraries/utils.js"); } } if (this.selectedTarget.type === Picks.INTERSECTED_ENTITY) { - if (!this.isTabletMaterialEntity(this.selectedTarget.objectID)) { - Messages.sendLocalMessage("entityToolUpdates", JSON.stringify({ - method: "selectEntity", - entityID: this.selectedTarget.objectID, - hand: hand - })); - } + Messages.sendLocalMessage("entityToolUpdates", JSON.stringify({ + method: "selectEntity", + entityID: this.selectedTarget.objectID, + hand: hand + })); } else if (this.selectedTarget.type === Picks.INTERSECTED_OVERLAY) { Messages.sendLocalMessage("entityToolUpdates", JSON.stringify({ method: "selectOverlay", @@ -98,12 +95,6 @@ Script.include("/~/system/libraries/utils.js"); this.sendPointingAtData(controllerData); }; - - this.isTabletMaterialEntity = function(entityID) { - return ((entityID === HMD.homeButtonHighlightMaterialID) || - (entityID === HMD.homeButtonUnhighlightMaterialID)); - }; - this.sendPointingAtData = function(controllerData) { var rayPick = controllerData.rayPicks[this.hand]; var hudRayPick = controllerData.hudRayPicks[this.hand]; diff --git a/scripts/system/libraries/entityList.js b/scripts/system/libraries/entityList.js index 24b90e3a44..fb876302dd 100644 --- a/scripts/system/libraries/entityList.js +++ b/scripts/system/libraries/entityList.js @@ -111,11 +111,6 @@ EntityListTool = function(shouldUseEditTabletApp) { return value !== undefined ? value : ""; } - function filterEntity(entityID) { - return ((entityID === HMD.homeButtonHighlightMaterialID) || - (entityID === HMD.homeButtonUnhighlightMaterialID)); - } - that.sendUpdate = function() { var entities = []; @@ -126,10 +121,6 @@ EntityListTool = function(shouldUseEditTabletApp) { ids = Entities.findEntities(MyAvatar.position, searchRadius); } - ids = ids.filter(function(id) { - return !filterEntity(id); - }); - var cameraPosition = Camera.position; for (var i = 0; i < ids.length; i++) { var id = ids[i];