From 258d6d391fa21e840dcac42ba2e9c1e5254ef63d Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Mon, 21 Mar 2016 10:08:19 -0700
Subject: [PATCH] no tank

---
 .../DomainContent/Home/fishTank/tank.js       | 35 ++++++++++++++-----
 .../DomainContent/Home/pingPongGun/wrapper.js |  5 +++
 .../DomainContent/Home/reset.js               | 18 +++++-----
 3 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/unpublishedScripts/DomainContent/Home/fishTank/tank.js b/unpublishedScripts/DomainContent/Home/fishTank/tank.js
index 85939b34ac..c8af0959fe 100644
--- a/unpublishedScripts/DomainContent/Home/fishTank/tank.js
+++ b/unpublishedScripts/DomainContent/Home/fishTank/tank.js
@@ -372,13 +372,13 @@
     var sinceLastUpdate = 0;
 
 
-var LOWER_CORNER_VERTICAL_OFFSET = (-TANK_DIMENSIONS.y / 2) + 0.3;
-var LOWER_CORNER_FORWARD_OFFSET = TANK_DIMENSIONS.x;
-var LOWER_CORNER_LATERAL_OFFSET = -TANK_DIMENSIONS.z / 8;
+    var LOWER_CORNER_VERTICAL_OFFSET = (-TANK_DIMENSIONS.y / 2) + 0.3;
+    var LOWER_CORNER_FORWARD_OFFSET = TANK_DIMENSIONS.x;
+    var LOWER_CORNER_LATERAL_OFFSET = -TANK_DIMENSIONS.z / 8;
 
-var UPPER_CORNER_VERTICAL_OFFSET = (TANK_DIMENSIONS.y / 2)-0.3;
-var UPPER_CORNER_FORWARD_OFFSET = -TANK_DIMENSIONS.x;
-var UPPER_CORNER_LATERAL_OFFSET = TANK_DIMENSIONS.z / 8;
+    var UPPER_CORNER_VERTICAL_OFFSET = (TANK_DIMENSIONS.y / 2) - 0.3;
+    var UPPER_CORNER_FORWARD_OFFSET = -TANK_DIMENSIONS.x;
+    var UPPER_CORNER_LATERAL_OFFSET = TANK_DIMENSIONS.z / 8;
 
 
     // var FISH_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/Fish-1.fbx";
@@ -478,7 +478,8 @@ var UPPER_CORNER_LATERAL_OFFSET = TANK_DIMENSIONS.z / 8;
 
         lowerCorner = getOffsetFromTankCenter(LOWER_CORNER_VERTICAL_OFFSET, LOWER_CORNER_FORWARD_OFFSET, LOWER_CORNER_LATERAL_OFFSET);
         upperCorner = getOffsetFromTankCenter(UPPER_CORNER_VERTICAL_OFFSET, UPPER_CORNER_FORWARD_OFFSET, UPPER_CORNER_LATERAL_OFFSET);
-
+        // print('LOADFISH LOWER' + JSON.stringify(lowerCorner));
+        // print('LOADFISH UPPER' + JSON.stringify(upperCorner));
         // First pre-load an array with properties  on all the other fish so our per-fish loop
         // isn't doing it. 
         var flockProperties = [];
@@ -625,7 +626,7 @@ var UPPER_CORNER_LATERAL_OFFSET = TANK_DIMENSIONS.z / 8;
 
     function loadFish(howMany) {
         // print('LOADING FISH: ' + howMany)
-
+        _this.currentProperties = Entities.getEntityProperties(_this.entityID);
         var center = _this.currentProperties.position;
 
         lowerCorner = {
@@ -639,6 +640,8 @@ var UPPER_CORNER_LATERAL_OFFSET = TANK_DIMENSIONS.z / 8;
             z: center.z + (_this.currentProperties.dimensions.z / 2)
         };
 
+        print('LOADFISH LOWER' + JSON.stringify(lowerCorner));
+        print('LOADFISH UPPER' + JSON.stringify(upperCorner));
         var fish = [];
 
         for (var i = 0; i < howMany; i++) {
@@ -735,5 +738,21 @@ var UPPER_CORNER_LATERAL_OFFSET = TANK_DIMENSIONS.z / 8;
         }
     }
 
+    function transformFishFromTankToWorldSpace(position, velocity) {
+
+        var Q = Entities.getEntityProperties(_this.entityID).rotation;
+        var tPosition = Vec3.multiplyQbyV(Q, position);
+        var tVelocity = Vec3.multiplyQbyV(Q, velocity);
+
+        var inverseQ = Quat.inverse(Q);
+        var finalPosition = Vec3.multiplyQbyV(inverseQ, tPosition);
+        var finalVelocity = Vec3.multiplyQbyV(inverseQ,tVelocity);
+
+        return {
+            position: finalPosition,
+            velocity: finalVelocity
+        };
+    }
+
     return new FishTank();
 });
\ No newline at end of file
diff --git a/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js b/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js
index 91bc4f789d..d8ccc6394c 100644
--- a/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js
+++ b/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js
@@ -28,6 +28,11 @@ _PingPongGun = function(spawnPosition, spawnRotation) {
       y: 0.3875,
       z: 0.9931
     },
+    gravity:{
+      x:0,
+      y:-3,
+      z:0
+    },
     rotation: Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z),
     dynamic: true,
     collisionSoundURL: COLLISION_SOUND_URL,
diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js
index c0316dac8a..b53225e4f3 100644
--- a/unpublishedScripts/DomainContent/Home/reset.js
+++ b/unpublishedScripts/DomainContent/Home/reset.js
@@ -112,15 +112,15 @@
 
         createDynamicEntities: function() {
 
-            var fishTank = new FishTank({
-                x: 1098.9254,
-                y: 460.5814,
-                z: -79.1103
-            }, {
-                x: 0,
-                y: 152,
-                z: 0
-            });
+            // var fishTank = new FishTank({
+            //     x: 1098.9254,
+            //     y: 460.5814,
+            //     z: -79.1103
+            // }, {
+            //     x: 0,
+            //     y: 0,
+            //     z: 0
+            // });
 
             var tiltMaze = new TiltMaze({
                 x: 1105.5768,