From f7b11291528fd3ac3bd60a3d8efcfe23b318b288 Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Wed, 23 Mar 2016 10:38:23 -0700
Subject: [PATCH] dont set at begin for tank

---
 .../DomainContent/Home/fishTank/tank.js       | 45 +++++++++++++++----
 .../DomainContent/Home/fishTank/wrapper.js    | 10 ++---
 .../DomainContent/Home/reset.js               |  6 ++-
 3 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/unpublishedScripts/DomainContent/Home/fishTank/tank.js b/unpublishedScripts/DomainContent/Home/fishTank/tank.js
index 137821b3ba..c0778a4413 100644
--- a/unpublishedScripts/DomainContent/Home/fishTank/tank.js
+++ b/unpublishedScripts/DomainContent/Home/fishTank/tank.js
@@ -42,6 +42,7 @@
         iOwn = true;
         connected = true;
         Script.update.connect(_this.update);
+        print('JBP connecting in startupdate')
     }
 
     function stopUpdateAndReclaim() {
@@ -107,10 +108,13 @@
             if (properties.hasOwnProperty('userData') === false || properties.userData.length === 0) {
                 _this.initTimeout = Script.setTimeout(function() {
                     if (properties.hasOwnProperty('userData')) {
-                        // print('has user data property')
+                         print('JBP has user data property')
                     }
                     if (properties.userData.length === 0) {
-                        // print('user data length is zero')
+                         print('JBP user data length is zero')
+                    }
+                    if(properties.userData===""){
+                        print('JBP user data is empty')
                     }
 
                     // print('try again in one second')
@@ -122,9 +126,10 @@
                 _this.userData = null;
                 try {
                     _this.userData = JSON.parse(properties.userData);
+                    print('JBP set userdata to parsed json')
                 } catch (err) {
-                    // print('error parsing json');
-                    // print('properties are:' + properties.userData);
+                     print('JBP error parsing json');
+                     print('JBP properties are:' + properties.userData);
                     return;
                 }
                 // print('after parse')
@@ -171,7 +176,7 @@
             // print('i am the owner!')
             //do stuff
             updateFish(deltaTime);
-            _this.seeIfOwnerIsLookingAtTheTank();
+           // _this.seeIfOwnerIsLookingAtTheTank();
         },
 
         debugSphereOn: function(position) {
@@ -339,7 +344,7 @@
     var FISHTANK_USERDATA_KEY = 'hifi-home-fishtank'
 
     var LIFETIME = 300; //  Fish live for 5 minutes 
-    var NUM_FISH = 8;
+    var NUM_FISH = 2;
     var TANK_DIMENSIONS = {
         x: 0.8212,
         y: 0.8116,
@@ -416,8 +421,7 @@
             }
         }
 
-
-        //  print('has userdata fish??' + _this.userData['hifi-home-fishtank'].fishLoaded)
+          print('jbp has userdata fish??' + JSON.stringify(_this.userData))
 
         if (_this.userData['hifi-home-fishtank'].fishLoaded === false) {
             //no fish in the user data
@@ -699,6 +703,31 @@
         Script.update.disconnect(_this.update);
     })
 
+    function keepFishInTank(fish,position,rotation){
+
+        // cast a ray from the fish
+        // see if it hits the tank wall
+        // see how far it is from the tank wall
+        // if less than a certain distance, then apply opposite vector
+            var keepAwayDistance = 0.15;
+        
+
+            var pickRay = {
+                origin: position,
+                direction: rotation
+            };
+
+            var innerContainer = _this.userData['hifi-home-fishtank'].innerContainer;
+
+            var intersection = Entities.findRayIntersection(pickRay, true, [innerContainer], [_this.entityID]);
+
+            if (intersection.intersects && intersection.entityID === innerContainer) {
+
+            }
+
+            return newVector
+    }
+
 
     function setEntityUserData(id, data) {
         var json = JSON.stringify(data)
diff --git a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js
index 07b6bb3243..8548a8ae0e 100644
--- a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js
+++ b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js
@@ -122,11 +122,11 @@ FishTank = function(spawnPosition, spawnRotation) {
             collisionless: true,
             script: TANK_SCRIPT,
             visible: true,
-            userData: JSON.stringify({
-                'hifiHomeKey': {
-                    'reset': true
-                }
-            }),
+            // userData: JSON.stringify({
+            //     'hifiHomeKey': {
+            //         'reset': true
+            //     }
+            // }),
         }
 
         fishTank = Entities.addEntity(tankProperties);
diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js
index b85d33cd26..4721555dad 100644
--- a/unpublishedScripts/DomainContent/Home/reset.js
+++ b/unpublishedScripts/DomainContent/Home/reset.js
@@ -128,6 +128,9 @@
                 z: 0
             });
 
+            //REMOVE BEFORE MERGE
+            return;
+
             var tiltMaze = new TiltMaze({
                 x: 1105.5768,
                 y: 460.3298,
@@ -181,7 +184,8 @@
 
 
         createKineticEntities: function() {
-
+            //REMOVE BEFORE MERGE
+            return;
             var fruitBowl = new FruitBowl({
                 x: 1105.3185,
                 y: 460.3221,