From ddae2d4f749a8aa1cd30bbcb75145367908dbb47 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Thu, 25 Feb 2016 15:00:54 -0800 Subject: [PATCH] only erase stroke map on release and preload --- examples/homeContent/whiteboardV2/eraserEntityScript.js | 9 ++++++--- examples/homeContent/whiteboardV2/whiteboardSpawner.js | 2 -- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/homeContent/whiteboardV2/eraserEntityScript.js b/examples/homeContent/whiteboardV2/eraserEntityScript.js index 66399a9b8e..c78707e129 100644 --- a/examples/homeContent/whiteboardV2/eraserEntityScript.js +++ b/examples/homeContent/whiteboardV2/eraserEntityScript.js @@ -24,6 +24,7 @@ _this.ERASER_TRIGGER_THRESHOLD = 0.2; _this.STROKE_NAME = "hifi-marker-stroke"; _this.ERASER_TO_STROKE_SEARCH_RADIUS = 0.7; + _this.strokeMap = []; }; Eraser.prototype = { @@ -35,10 +36,10 @@ var eraserPosition = Entities.getEntityProperties(_this.entityID, "position").position; var strokeIDs = Entities.findEntities(eraserPosition, _this.ERASER_TO_STROKE_SEARCH_RADIUS); // Create a map of stroke entities and their positions - _this.strokeMap = []; + strokeIDs.forEach(function(strokeID) { var strokeProps = Entities.getEntityProperties(strokeID, ["position", "name"]); - if (strokeProps.name === _this.STROKE_NAME) { + if (strokeProps.name === _this.STROKE_NAME) { _this.strokeMap.push({ strokeID: strokeID, strokePosition: strokeProps.position @@ -53,7 +54,9 @@ } else {} }, - releaseEquip: function() {}, + releaseEquip: function() { + _this.strokeMap = []; + }, continueHolding: function() { diff --git a/examples/homeContent/whiteboardV2/whiteboardSpawner.js b/examples/homeContent/whiteboardV2/whiteboardSpawner.js index 3fcf93e628..8402b241ed 100644 --- a/examples/homeContent/whiteboardV2/whiteboardSpawner.js +++ b/examples/homeContent/whiteboardV2/whiteboardSpawner.js @@ -149,8 +149,6 @@ function createMarkers() { blue: 200 }); - - markerPosition = Vec3.sum(markerPosition, Vec3.multiply(-0.2, Quat.getFront(markerRotation))); createMarker(modelURLS[1], markerPosition, { red: 200,