From 47471e837ff72a9c30812aa972d848bc85afea15 Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Mon, 12 Oct 2015 16:31:36 -0700
Subject: [PATCH] reset targets once they have stopped moving

---
 examples/toys/ping_pong_gun/createTargets.js | 15 ++++++++++++---
 unpublishedScripts/hiddenEntityReset.js      | 19 ++++++++++---------
 unpublishedScripts/masterReset.js            | 18 +++++++++---------
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/examples/toys/ping_pong_gun/createTargets.js b/examples/toys/ping_pong_gun/createTargets.js
index 22329f90f0..013150b241 100644
--- a/examples/toys/ping_pong_gun/createTargets.js
+++ b/examples/toys/ping_pong_gun/createTargets.js
@@ -16,8 +16,9 @@ var scriptURL = Script.resolvePath('wallTarget.js');
 
 var MODEL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target.fbx';
 var COLLISION_HULL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/target_collision_hull.obj';
+var MINIMUM_MOVE_LENGTH = 0.05;
+var RESET_DISTANCE = 0.5;
 
-var RESET_DISTANCE = 1;
 var TARGET_USER_DATA_KEY = 'hifi-ping_pong_target';
 var NUMBER_OF_TARGETS = 6;
 var TARGETS_PER_ROW = 3;
@@ -60,6 +61,8 @@ var targets = [];
 
 var originalPositions = [];
 
+var lastPositions = [];
+
 function addTargets() {
     var i;
     var row = -1;
@@ -77,6 +80,7 @@ function addTargets() {
         position.y = startPosition.y - (row * VERTICAL_SPACING);
 
         originalPositions.push(position);
+        lastPositions.push(position);
 
         var targetProperties = {
             name: 'Target',
@@ -103,7 +107,11 @@ function testTargetDistanceFromStart() {
         var distance = Vec3.subtract(originalPosition, currentPosition);
         var length = Vec3.length(distance);
 
-        if (length > RESET_DISTANCE) {
+        var moving = Vec3.length(Vec3.subtract(currentPosition, lastPositions[index]));
+
+        lastPositions[index] = currentPosition;
+
+        if (length > RESET_DISTANCE && moving<MINIMUM_MOVE_LENGTH) {
 
             Entities.deleteEntity(target);
 
@@ -121,6 +129,7 @@ function testTargetDistanceFromStart() {
             };
 
             targets[index] = Entities.addEntity(targetProperties);
+
         }
     });
 }
@@ -142,7 +151,7 @@ function deleteTargets() {
 }
 
 Entities.deletingEntity.connect(deleteEntity);
-var distanceCheckInterval = Script.setInterval(testTargetDistanceFromStart, 1000);
+var distanceCheckInterval = Script.setInterval(testTargetDistanceFromStart, 500);
 
 addTargets();
 
diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index 0a678d668e..5eff989701 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -421,6 +421,8 @@
 
       var originalPositions = [];
 
+      var lastPositions = [];
+
       function addTargets() {
         var i;
         var row = -1;
@@ -468,7 +470,11 @@
           var distance = Vec3.subtract(originalPosition, currentPosition);
           var length = Vec3.length(distance);
 
-          if (length > RESET_DISTANCE) {
+          var moving = Vec3.length(Vec3.subtract(currentPosition, lastPositions[index]));
+
+          lastPositions[index] = currentPosition;
+
+          if (length > RESET_DISTANCE && moving < MINIMUM_MOVE_LENGTH) {
 
             Entities.deleteEntity(target);
 
@@ -482,15 +488,10 @@
               compoundShapeURL: COLLISION_HULL_URL,
               position: originalPositions[index],
               rotation: rotation,
-              script: targetsScriptURL,
-              userData: JSON.stringify({
-                resetMe: {
-                  resetMe: true
-                }
-              })
+              script: scriptURL
             };
-            var target = Entities.addEntity(targetProperties);
-            targets[index] = target;
+
+            targets[index] = Entities.addEntity(targetProperties);
 
           }
         });
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index d9199a124d..e4db5fbf55 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -393,6 +393,7 @@ MasterReset = function() {
     var targets = [];
 
     var originalPositions = [];
+    var lastPositions = [];
 
     function addTargets() {
       var i;
@@ -441,7 +442,11 @@ MasterReset = function() {
         var distance = Vec3.subtract(originalPosition, currentPosition);
         var length = Vec3.length(distance);
 
-        if (length > RESET_DISTANCE) {
+        var moving = Vec3.length(Vec3.subtract(currentPosition, lastPositions[index]));
+
+        lastPositions[index] = currentPosition;
+
+        if (length > RESET_DISTANCE && moving < MINIMUM_MOVE_LENGTH) {
 
           Entities.deleteEntity(target);
 
@@ -455,15 +460,10 @@ MasterReset = function() {
             compoundShapeURL: COLLISION_HULL_URL,
             position: originalPositions[index],
             rotation: rotation,
-            script: targetsScriptURL,
-            userData: JSON.stringify({
-              resetMe: {
-                resetMe: true
-              }
-            })
+            script: scriptURL
           };
-          var target = Entities.addEntity(targetProperties);
-          targets[index] = target;
+
+          targets[index] = Entities.addEntity(targetProperties);
 
         }
       });