From 249d88b619aa1bf26ac33bda3e15990e7e0a60ae Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Mon, 7 Mar 2016 19:59:27 -0800
Subject: [PATCH] add base to fishtank

---
 .../Home/fishTank/createFishTank.js           | 64 +++++++++++++++----
 1 file changed, 50 insertions(+), 14 deletions(-)

diff --git a/unpublishedScripts/DomainContent/Home/fishTank/createFishTank.js b/unpublishedScripts/DomainContent/Home/fishTank/createFishTank.js
index 465e411c8b..56a6f3d745 100644
--- a/unpublishedScripts/DomainContent/Home/fishTank/createFishTank.js
+++ b/unpublishedScripts/DomainContent/Home/fishTank/createFishTank.js
@@ -1,12 +1,19 @@
-var fishTank, bubbleSystem, secondBubbleSystem, innerContainer, bubbleInjector, lowerCorner, upperCorner, urchin, rocks;
+var fishTank, tankBase, bubbleSystem, secondBubbleSystem, innerContainer, bubbleInjector, lowerCorner, upperCorner, urchin, rocks;
 
 var CLEANUP = true;
+// var TANK_DIMENSIONS = {
+//     x: 1.3393,
+//     y: 1.3515,
+//     z: 3.5914
+// };
+
 var TANK_DIMENSIONS = {
-    x: 1.3393,
-    y: 1.3515,
-    z: 3.5914
+    x: 0.8212,
+    y: 0.8116,
+    z: 2.1404
 };
 
+
 var INNER_TANK_SCALE = 0.7;
 var INNER_TANK_DIMENSIONS = Vec3.multiply(INNER_TANK_SCALE, TANK_DIMENSIONS);
 INNER_TANK_DIMENSIONS.y = INNER_TANK_DIMENSIONS.y - 0.4;
@@ -25,12 +32,24 @@ var TANK_POSITION = center;
 
 var TANK_SCRIPT = Script.resolvePath('tank.js?' + Math.random())
 
-var TANK_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/aquarium-6.fbx";
+var TANK_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/aquariumTank.fbx";
 
-var BUBBLE_SYSTEM_FORWARD_OFFSET = TANK_DIMENSIONS.x;
+var TANK_BASE_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/aquariumBase.fbx';
+
+var TANK_BASE_COLLISION_HULL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/aquariumBase.obj'
+
+var TANK_BASE_DIMENSIONS = {
+    x: 0.8599,
+    y: 1.8450,
+    z: 2.1936
+};
+
+var BASE_VERTICAL_OFFSET=0.42;
+
+var BUBBLE_SYSTEM_FORWARD_OFFSET = TANK_DIMENSIONS.x+0.06;
 //depth of tank
-var BUBBLE_SYSTEM_LATERAL_OFFSET = 0.15;
-var BUBBLE_SYSTEM_VERTICAL_OFFSET = -0.5;
+var BUBBLE_SYSTEM_LATERAL_OFFSET = 0.025;
+var BUBBLE_SYSTEM_VERTICAL_OFFSET = -0.25;
 
 var BUBBLE_SYSTEM_DIMENSIONS = {
     x: TANK_DIMENSIONS.x / 8,
@@ -44,7 +63,7 @@ var bubbleSound = SoundCache.getSound(BUBBLE_SOUND_URL);
 var URCHIN_FORWARD_OFFSET = -TANK_DIMENSIONS.x;
 //depth of tank
 var URCHIN_LATERAL_OFFSET = -0.15;
-var URCHIN_VERTICAL_OFFSET = -0.37;
+var URCHIN_VERTICAL_OFFSET = -0.17;
 
 var URCHIN_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/Urchin.fbx';
 
@@ -54,7 +73,7 @@ var URCHIN_DIMENSIONS = {
     z: 0.35
 }
 
-var ROCKS_FORWARD_OFFSET = (TANK_DIMENSIONS.x / 2) - 0.75;
+var ROCKS_FORWARD_OFFSET = 0;
 //depth of tank
 var ROCKS_LATERAL_OFFSET = 0.0;
 var ROCKS_VERTICAL_OFFSET = (-TANK_DIMENSIONS.y / 2) + 0.25;
@@ -62,9 +81,9 @@ var ROCKS_VERTICAL_OFFSET = (-TANK_DIMENSIONS.y / 2) + 0.25;
 var ROCK_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/Aquarium-Rocks-2.fbx';
 
 var ROCK_DIMENSIONS = {
-    x: 0.88,
+    x: 0.707,
     y: 0.33,
-    z: 2.9
+    z: 1.64
 }
 
 function createFishTank() {
@@ -344,6 +363,23 @@ function createUrchin() {
 
 }
 
+function createTankBase() {
+    var properties = {
+        name: 'hifi-home-fishtank-base',
+        type: 'Model',
+        modelURL: TANK_BASE_MODEL_URL,
+        parentID: fishTank,
+        shapeType: 'compound',
+        compoundShapeURL: TANK_BASE_COLLISION_HULL,
+        position: {
+            x:TANK_POSITION.x,
+            y:TANK_POSITION.y-BASE_VERTICAL_OFFSET,
+            z:TANK_POSITION.z
+        }
+    }
+    tankBase = Entities.addEntity(properties);
+}
+
 
 createFishTank();
 
@@ -355,12 +391,11 @@ createSecondBubbleSystem();
 
 createEntitiesAtCorners();
 
-
-
 createUrchin();
 
 createRocks();
 
+createTankBase();
 var customKey = 'hifi-home-fishtank';
 
 
@@ -391,6 +426,7 @@ Script.setTimeout(function() {
 
 function cleanup() {
     Entities.deleteEntity(fishTank);
+    Entities.deleteEntity(tankBase);
     Entities.deleteEntity(bubbleSystem);
     Entities.deleteEntity(secondBubbleSystem);
     Entities.deleteEntity(innerContainer);