From b112bb2080419f647dca4b75e8b9a7695b13f54c Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Fri, 18 Mar 2016 16:40:48 -0700 Subject: [PATCH] start pos --- .../DomainContent/Home/fishTank/wrapper.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js index 47c3515d73..69e187a50a 100644 --- a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js @@ -35,17 +35,7 @@ FishTank = function(spawnPosition, spawnRotation) { blue: 255 } - - var centerVertical = { - x: 0, - y: 1, - z: 0 - } - - var upCenter = Vec3.sum(centerVertical, MyAvatar.position); - var center = Vec3.sum(upCenter, Vec3.multiply(Quat.getFront(MyAvatar.orientation), 2)); - - var TANK_POSITION = center; + var TANK_POSITION = spawnPosition; var TANK_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/aquariumTank.fbx"; @@ -127,6 +117,7 @@ FishTank = function(spawnPosition, spawnRotation) { modelURL: TANK_MODEL_URL, dimensions: TANK_DIMENSIONS, position: TANK_POSITION, + rotation: spawnRotation, color: DEBUG_COLOR, collisionless: true, script: TANK_SCRIPT, @@ -316,7 +307,7 @@ FishTank = function(spawnPosition, spawnRotation) { rocks = Entities.addEntity(properties); } - function createUrchin() { + function createAnenome() { var finalPosition = getOffsetFromTankCenter(ANEMONE_VERTICAL_OFFSET, ANEMONE_FORWARD_OFFSET, ANEMONE_LATERAL_OFFSET); var properties = { @@ -386,7 +377,7 @@ FishTank = function(spawnPosition, spawnRotation) { createEntitiesAtCorners(); - createUrchin(); + createAnenome(); createRocks();