From d37ff80541c0b31360ec51696b0d762a1b0bd345 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Fri, 18 Mar 2016 16:36:06 -0700 Subject: [PATCH 1/6] tank --- .../DomainContent/Home/fishTank/tank.js | 123 ++++++++-------- .../DomainContent/Home/fishTank/wrapper.js | 139 +++++++----------- 2 files changed, 112 insertions(+), 150 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/fishTank/tank.js b/unpublishedScripts/DomainContent/Home/fishTank/tank.js index e21f992ffa..c4bc311523 100644 --- a/unpublishedScripts/DomainContent/Home/fishTank/tank.js +++ b/unpublishedScripts/DomainContent/Home/fishTank/tank.js @@ -12,7 +12,7 @@ // (function() { - Script.include('../utils.js'); + Script.include('../../../../examples/libraries/virtualBaton.js'); //only one person should simulate the tank at a time -- we pass around a virtual baton @@ -32,30 +32,11 @@ blue: 255 } - var TANK_DIMENSIONS = { - x: 0.8212, - y: 0.8116, - z: 2.1404 - }; - - var LOWER_CORNER_VERTICAL_OFFSET = -TANK_DIMENSIONS.y / 2; - 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;; - var UPPER_CORNER_FORWARD_OFFSET = -TANK_DIMENSIONS.x; - var UPPER_CORNER_LATERAL_OFFSET = TANK_DIMENSIONS.z / 8; - - var upperCorner, lowerCorner; - function FishTank() { _this = this; } function startUpdate() { - upperCorner = getOffsetFromTankCenter(LOWER_CORNER_VERTICAL_OFFSET, LOWER_CORNER_FORWARD_OFFSET, LOWER_CORNER_LATERAL_OFFSET); - lowerCorner = getOffsetFromTankCenter(UPPER_CORNER_VERTICAL_OFFSET, UPPER_CORNER_FORWARD_OFFSET, UPPER_CORNER_LATERAL_OFFSET); - //when the baton is claimed; // print('trying to claim the object' + _entityID) iOwn = true; @@ -77,6 +58,26 @@ } + function getOffsetFromTankCenter(VERTICAL_OFFSET, FORWARD_OFFSET, LATERAL_OFFSET) { + + var tankProperties = Entities.getEntityProperties(_this.entityID); + print('GOT PROPERTIES FOR TANK!') + + var upVector = Quat.getUp(tankProperties.rotation); + var frontVector = Quat.getFront(tankProperties.rotation); + var rightVector = Quat.getRight(tankProperties.rotation); + + var upOffset = Vec3.multiply(upVector, VERTICAL_OFFSET); + var frontOffset = Vec3.multiply(frontVector, FORWARD_OFFSET); + var rightOffset = Vec3.multiply(rightVector, LATERAL_OFFSET); + + var finalOffset = Vec3.sum(tankProperties.position, upOffset); + finalOffset = Vec3.sum(finalOffset, frontOffset); + finalOffset = Vec3.sum(finalOffset, rightOffset); + return finalOffset + } + + FishTank.prototype = { fish: null, tankLocked: false, @@ -140,7 +141,6 @@ preload: function(entityID) { // print("preload"); - this.entityID = entityID; _entityID = entityID; this.initialize(entityID); @@ -192,12 +192,7 @@ }, color: INTERSECT_COLOR, position: position, - collisionless: true, - userData: JSON.stringify({ - 'hifiHomeKey': { - 'reset': true - } - }), + collisionless: true } _this.debugSphere = Entities.addEntity(sphereProperties); }, @@ -263,7 +258,8 @@ _this.overlayLineOn(pickRay.origin, Vec3.sum(pickRay.origin, Vec3.multiply(front, _this.overlayLineDistance)), INTERSECT_COLOR); }; - + // var brn = _this.userData['hifi-home-fishtank']['corners'].brn; + // var tfl = _this.userData['hifi-home-fishtank']['corners'].tfl; var innerContainer = _this.userData['hifi-home-fishtank'].innerContainer; var intersection = Entities.findRayIntersection(pickRay, true, [innerContainer], [_this.entityID]); @@ -346,9 +342,9 @@ var LIFETIME = 300; // Fish live for 5 minutes var NUM_FISH = 8; var TANK_DIMENSIONS = { - x: 1.3393, - y: 1.3515, - z: 3.5914 + x: 0.8212, + y: 0.8116, + z: 2.1404 }; var TANK_WIDTH = TANK_DIMENSIONS.z / 2; @@ -376,6 +372,16 @@ var THROTTLE_RATE = 100; 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 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"; // var FISH_MODEL_TWO_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/Fish-2.fbx"; @@ -383,8 +389,6 @@ var FISH_MODEL_TWO_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/goodfish5.fbx"; var fishLoaded = false; - var lowerCorner, upperCorner; - function randomVector(scale) { return { x: Math.random() * scale - scale / 2.0, @@ -403,6 +407,7 @@ return; } + if (THROTTLE === true) { sinceLastUpdate = sinceLastUpdate + deltaTime * 100; if (sinceLastUpdate > THROTTLE_RATE) { @@ -413,6 +418,8 @@ } + // print('has userdata fish??' + _this.userData['hifi-home-fishtank'].fishLoaded) + if (_this.userData['hifi-home-fishtank'].fishLoaded === false) { //no fish in the user data _this.tankLocked = true; @@ -421,7 +428,13 @@ var data = { fishLoaded: true, bubbleSystem: _this.userData['hifi-home-fishtank'].bubbleSystem, + // bubbleSound: _this.userData['hifi-home-fishtank'].bubbleSound, + // corners: { + // brn: _this.userData['hifi-home-fishtank'].lowerCorner, + // tfl: _this.userData['hifi-home-fishtank'].upperCorner + // }, innerContainer: _this.userData['hifi-home-fishtank'].innerContainer, + } setEntityCustomData(FISHTANK_USERDATA_KEY, _this.entityID, data); _this.userData['hifi-home-fishtank'].fishLoaded = true; @@ -438,6 +451,7 @@ } + var fish = _this.fish; // print('how many fish do i find?' + fish.length) @@ -458,6 +472,14 @@ z: 0 }; + + var userData = JSON.parse(_this.currentProperties.userData); + var innerContainer = userData['hifi-home-fishtank']['innerContainer']; + // var bounds = Entities.getEntityProperties(innerContainer, "boundingBox").boundingBox; + + 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); + // First pre-load an array with properties on all the other fish so our per-fish loop // isn't doing it. var flockProperties = []; @@ -498,7 +520,6 @@ z: 0 }; - var othersCounted = 0; for (var j = 0; j < fish.length; j++) { if (i != j) { @@ -529,6 +550,8 @@ //attractors //[position, radius, force] + + } if (_this.hasLookAttractor === true) { @@ -602,22 +625,21 @@ var STARTING_FRACTION = 0.25; function loadFish(howMany) { - print('LOADING FISH: ' + howMany) + // print('LOADING FISH: ' + howMany) var center = _this.currentProperties.position; - var lowerCorner = { + lowerCorner = { x: center.x - (_this.currentProperties.dimensions.z / 2), y: center.y, z: center.z - (_this.currentProperties.dimensions.z / 2) }; - var upperCorner = { + upperCorner = { x: center.x + (_this.currentProperties.dimensions.z / 2), y: center.y + _this.currentProperties.dimensions.y, z: center.z + (_this.currentProperties.dimensions.z / 2) }; - var fish = []; for (var i = 0; i < howMany; i++) { @@ -656,12 +678,7 @@ red: 0, green: 255, blue: 255 - }, - userData: JSON.stringify({ - 'hifiHomeKey': { - 'reset': true - } - }), + } }) ); @@ -676,24 +693,6 @@ }) - function getOffsetFromTankCenter(VERTICAL_OFFSET, FORWARD_OFFSET, LATERAL_OFFSET) { - - var tankProperties = Entities.getEntityProperties(_this.entityID); - - var upVector = Quat.getUp(tankProperties.rotation); - var frontVector = Quat.getFront(tankProperties.rotation); - var rightVector = Quat.getRight(tankProperties.rotation); - - var upOffset = Vec3.multiply(upVector, VERTICAL_OFFSET); - var frontOffset = Vec3.multiply(frontVector, FORWARD_OFFSET); - var rightOffset = Vec3.multiply(rightVector, LATERAL_OFFSET); - - var finalOffset = Vec3.sum(tankProperties.position, upOffset); - finalOffset = Vec3.sum(finalOffset, frontOffset); - finalOffset = Vec3.sum(finalOffset, rightOffset); - return finalOffset - } - function setEntityUserData(id, data) { var json = JSON.stringify(data) Entities.editEntity(id, { diff --git a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js index 9f0b42d95a..47c3515d73 100644 --- a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js @@ -1,22 +1,19 @@ // // createTank.js -// +// // // created by James b. Pollack @imgntn on 3/9/2016 -// Copyright 2016 High Fidelity, Inc. -// -// Adds a fish tank and base, decorations, particle bubble systems, and a bubble sound. Attaches a script that does fish swimming. -// +// Copyright 2016 High Fidelity, Inc. +// +// Adds a fish tank and base, decorations, particle bubble systems, and a bubble sound. Attaches a script that does fish swimming. +// // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // - - - var TANK_SCRIPT = Script.resolvePath('tank.js?' + Math.random()); FishTank = function(spawnPosition, spawnRotation) { - var fishTank, tankBase, bubbleSystem, secondBubbleSystem, thirdBubbleSystem, innerContainer, bubbleInjector, lowerCorner, upperCorner, urchin, treasure, rocks; + var fishTank, tankBase, bubbleSystem, secondBubbleSystem, thirdBubbleSystem, innerContainer, bubbleInjector, lowerCorner, upperCorner, anemone, treasure, rocks; var CLEANUP = true; var TANK_DIMENSIONS = { @@ -38,7 +35,17 @@ FishTank = function(spawnPosition, spawnRotation) { blue: 255 } - var TANK_POSITION = spawnPosition; + + 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_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/aquariumTank.fbx"; @@ -52,7 +59,7 @@ FishTank = function(spawnPosition, spawnRotation) { z: 2.1936 }; - var BASE_VERTICAL_OFFSET = 0.42; + var BASE_VERTICAL_OFFSET = 0.47; var BUBBLE_SYSTEM_FORWARD_OFFSET = TANK_DIMENSIONS.x + 0.06; var BUBBLE_SYSTEM_LATERAL_OFFSET = 0.025; @@ -68,14 +75,14 @@ FishTank = function(spawnPosition, spawnRotation) { var bubbleSound = SoundCache.getSound(BUBBLE_SOUND_URL); - var URCHIN_FORWARD_OFFSET = TANK_DIMENSIONS.x - 0.35; - var URCHIN_LATERAL_OFFSET = -0.05; - var URCHIN_VERTICAL_OFFSET = -0.12; + var ANEMONE_FORWARD_OFFSET = TANK_DIMENSIONS.x - 0.35; + var ANEMONE_LATERAL_OFFSET = -0.05; + var ANEMONE_VERTICAL_OFFSET = -0.12; - var URCHIN_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/Urchin.fbx'; - - var URCHIN_DIMENSIONS = { + var ANEMONE_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/anemone.fbx'; + var ANEMONE_ANIMATION_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/anemone.fbx'; + var ANEMONE_DIMENSIONS = { x: 0.4, y: 0.4, z: 0.4 @@ -105,11 +112,11 @@ FishTank = function(spawnPosition, spawnRotation) { z: 0.1020 } - var LOWER_CORNER_VERTICAL_OFFSET = -TANK_DIMENSIONS.y / 2; + 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;; + 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; @@ -120,17 +127,12 @@ FishTank = function(spawnPosition, spawnRotation) { modelURL: TANK_MODEL_URL, dimensions: TANK_DIMENSIONS, position: TANK_POSITION, - rotation: spawnRotation, color: DEBUG_COLOR, collisionless: true, script: TANK_SCRIPT, visible: true } - if (spawnRotation !== undefined) { - tankProperties.rotation = Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z) - } - fishTank = Entities.addEntity(tankProperties); } @@ -179,20 +181,13 @@ FishTank = function(spawnPosition, spawnRotation) { "alphaStart": 0.3, "alphaFinish": 0, "emitterShouldTrail": 0, - "textures": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/bubble-white.png", - userData: JSON.stringify({ - 'hifiHomeKey': { - 'reset': true - } - }), + "textures": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/bubble-white.png" }; bubbleProperties.type = "ParticleEffect"; bubbleProperties.parentID = fishTank; bubbleProperties.dimensions = BUBBLE_SYSTEM_DIMENSIONS; - - var finalOffset = getOffsetFromTankCenter(BUBBLE_SYSTEM_VERTICAL_OFFSET, BUBBLE_SYSTEM_FORWARD_OFFSET, BUBBLE_SYSTEM_LATERAL_OFFSET); bubbleProperties.position = finalOffset; @@ -253,12 +248,7 @@ FishTank = function(spawnPosition, spawnRotation) { position: tankProperties.position, visible: false, collisionless: true, - dynamic: false, - userData: JSON.stringify({ - 'hifiHomeKey': { - 'reset': true - } - }), + dynamic: false }; innerContainer = Entities.addEntity(containerProps); @@ -266,6 +256,7 @@ FishTank = function(spawnPosition, spawnRotation) { function createEntitiesAtCorners() { + var bounds = Entities.getEntityProperties(innerContainer, "boundingBox").boundingBox; var lowerProps = { name: 'hifi-home-fishtank-lower-corner', @@ -283,12 +274,7 @@ FishTank = function(spawnPosition, spawnRotation) { }, collisionless: true, position: getOffsetFromTankCenter(LOWER_CORNER_VERTICAL_OFFSET, LOWER_CORNER_FORWARD_OFFSET, LOWER_CORNER_LATERAL_OFFSET), - visible: true, - userData: JSON.stringify({ - 'hifiHomeKey': { - 'reset': true - } - }), + visible: false } var upperProps = { @@ -307,12 +293,7 @@ FishTank = function(spawnPosition, spawnRotation) { }, collisionless: true, position: getOffsetFromTankCenter(UPPER_CORNER_VERTICAL_OFFSET, UPPER_CORNER_FORWARD_OFFSET, UPPER_CORNER_LATERAL_OFFSET), - visible: true, - userData: JSON.stringify({ - 'hifiHomeKey': { - 'reset': true - } - }), + visible: false } lowerCorner = Entities.addEntity(lowerProps); @@ -329,36 +310,36 @@ FishTank = function(spawnPosition, spawnRotation) { parentID: fishTank, modelURL: ROCK_MODEL_URL, position: finalPosition, - dimensions: ROCK_DIMENSIONS, - userData: JSON.stringify({ - 'hifiHomeKey': { - 'reset': true - } - }), + dimensions: ROCK_DIMENSIONS } rocks = Entities.addEntity(properties); } function createUrchin() { - var finalPosition = getOffsetFromTankCenter(URCHIN_VERTICAL_OFFSET, URCHIN_FORWARD_OFFSET, URCHIN_LATERAL_OFFSET); + var finalPosition = getOffsetFromTankCenter(ANEMONE_VERTICAL_OFFSET, ANEMONE_FORWARD_OFFSET, ANEMONE_LATERAL_OFFSET); var properties = { - name: 'hifi-home-fishtank-urchin', + name: 'hifi-home-fishtank-anemone', type: 'Model', + animationURL: ANEMONE_ANIMATION_URL, + animationIsPlaying: true, + animationFPS: 15, + animationSettings: JSON.stringify({ + hold: false, + loop: true, + running: true, + startAutomatically: true + }), parentID: fishTank, - modelURL: URCHIN_MODEL_URL, + modelURL: ANEMONE_MODEL_URL, position: finalPosition, shapeType: 'Sphere', - dimensions: URCHIN_DIMENSIONS, - userData: JSON.stringify({ - 'hifiHomeKey': { - 'reset': true - } - }), + rotation: Quat.fromPitchYawRollDegrees(0, 90, 0), + dimensions: ANEMONE_DIMENSIONS } - urchin = Entities.addEntity(properties); + anemone = Entities.addEntity(properties); } @@ -372,12 +353,7 @@ FishTank = function(spawnPosition, spawnRotation) { modelURL: TREASURE_MODEL_URL, position: finalPosition, dimensions: TREASURE_DIMENSIONS, - rotation: Quat.fromPitchYawRollDegrees(10, -45, 10), - userData: JSON.stringify({ - 'hifiHomeKey': { - 'reset': true - } - }), + rotation: Quat.fromPitchYawRollDegrees(10, -45, 10) } treasure = Entities.addEntity(properties); @@ -396,12 +372,7 @@ FishTank = function(spawnPosition, spawnRotation) { y: TANK_POSITION.y - BASE_VERTICAL_OFFSET, z: TANK_POSITION.z }, - dimensions: TANK_BASE_DIMENSIONS, - userData: JSON.stringify({ - 'hifiHomeKey': { - 'reset': true - } - }), + dimensions: TANK_BASE_DIMENSIONS } tankBase = Entities.addEntity(properties); @@ -430,13 +401,13 @@ FishTank = function(spawnPosition, spawnRotation) { bubbleSystem: bubbleSystem, innerContainer: innerContainer, } + var resetKey = 'hifiHomeKey'; var resetData = { 'reset': true }; - Script.setTimeout(function() { setEntityCustomData(customKey, fishTank, data); setEntityCustomData(resetKey, fishTank, resetData); @@ -444,7 +415,6 @@ FishTank = function(spawnPosition, spawnRotation) { function cleanup() { - print('TANK CLEANUP!') Entities.deleteEntity(fishTank); Entities.deleteEntity(tankBase); Entities.deleteEntity(bubbleSystem); @@ -453,14 +423,10 @@ FishTank = function(spawnPosition, spawnRotation) { Entities.deleteEntity(innerContainer); Entities.deleteEntity(lowerCorner); Entities.deleteEntity(upperCorner); - Entities.deleteEntity(urchin); + Entities.deleteEntity(anemone); Entities.deleteEntity(rocks); - // bubbleInjector.stop(); - // bubbleInjector = null; } - - function setEntityUserData(id, data) { var json = JSON.stringify(data) Entities.editEntity(id, { @@ -502,7 +468,4 @@ FishTank = function(spawnPosition, spawnRotation) { return defaultValue; } } - - this.cleanup = cleanup; - print('CREATED FISH!'); } \ No newline at end of file From b112bb2080419f647dca4b75e8b9a7695b13f54c Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Fri, 18 Mar 2016 16:40:48 -0700 Subject: [PATCH 2/6] 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(); From 8ae246816572f794f93906a05df7655ea06c333f Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Fri, 18 Mar 2016 16:44:33 -0700 Subject: [PATCH 3/6] check --- unpublishedScripts/DomainContent/Home/reset.js | 1 - 1 file changed, 1 deletion(-) diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index 8f1f831712..c0316dac8a 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -112,7 +112,6 @@ createDynamicEntities: function() { - var fishTank = new FishTank({ x: 1098.9254, y: 460.5814, From 9433ea8f0677026cd56c586b8dabef45e1bcea3f Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Fri, 18 Mar 2016 16:46:23 -0700 Subject: [PATCH 4/6] syntax --- unpublishedScripts/DomainContent/Home/fishTank/tank.js | 1 - .../DomainContent/Home/growingPlant/growingPlantEntityScript.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/fishTank/tank.js b/unpublishedScripts/DomainContent/Home/fishTank/tank.js index c4bc311523..85939b34ac 100644 --- a/unpublishedScripts/DomainContent/Home/fishTank/tank.js +++ b/unpublishedScripts/DomainContent/Home/fishTank/tank.js @@ -61,7 +61,6 @@ function getOffsetFromTankCenter(VERTICAL_OFFSET, FORWARD_OFFSET, LATERAL_OFFSET) { var tankProperties = Entities.getEntityProperties(_this.entityID); - print('GOT PROPERTIES FOR TANK!') var upVector = Quat.getUp(tankProperties.rotation); var frontVector = Quat.getFront(tankProperties.rotation); diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js b/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js index c949bfa9d5..b4db722bf8 100644 --- a/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js +++ b/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js @@ -109,7 +109,7 @@ flower.userData = { 'hifiHomeKey': { 'reset': true - } + }, ProceduralEntity: { shaderUrl: _this.SHADER_URL, uniforms: { From 90dba7d472ebcda50a720384a05cd76e035014d0 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Fri, 18 Mar 2016 17:06:33 -0700 Subject: [PATCH 5/6] tank rotation --- unpublishedScripts/DomainContent/Home/fishTank/wrapper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js index 69e187a50a..65d9e04ec0 100644 --- a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js @@ -117,7 +117,7 @@ FishTank = function(spawnPosition, spawnRotation) { modelURL: TANK_MODEL_URL, dimensions: TANK_DIMENSIONS, position: TANK_POSITION, - rotation: spawnRotation, + rotation: Quat.fromPitchYawRollDegrees(spawnRotation.x,spawnRotation.y,spawnRotation.z), color: DEBUG_COLOR, collisionless: true, script: TANK_SCRIPT, From 87bdffa2738450980fe48e2f239b7f8b1deb0f3a Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Fri, 18 Mar 2016 17:28:48 -0700 Subject: [PATCH 6/6] visualize them --- unpublishedScripts/DomainContent/Home/fishTank/wrapper.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js index 65d9e04ec0..fa34af2179 100644 --- a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js @@ -265,7 +265,7 @@ FishTank = function(spawnPosition, spawnRotation) { }, collisionless: true, position: getOffsetFromTankCenter(LOWER_CORNER_VERTICAL_OFFSET, LOWER_CORNER_FORWARD_OFFSET, LOWER_CORNER_LATERAL_OFFSET), - visible: false + visible: true } var upperProps = { @@ -284,7 +284,7 @@ FishTank = function(spawnPosition, spawnRotation) { }, collisionless: true, position: getOffsetFromTankCenter(UPPER_CORNER_VERTICAL_OFFSET, UPPER_CORNER_FORWARD_OFFSET, UPPER_CORNER_LATERAL_OFFSET), - visible: false + visible: true } lowerCorner = Entities.addEntity(lowerProps);