diff --git a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js index 1e67dd5d1c..4eb227e12f 100644 --- a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js @@ -13,7 +13,7 @@ var TANK_SCRIPT = Script.resolvePath('entityLocalFish.js'); FishTank = function(spawnPosition, spawnRotation) { - var fishTank, tankBase, bubbleSystem, secondBubbleSystem, thirdBubbleSystem, innerContainer, bubbleInjector, lowerCorner, upperCorner, anemone, treasure, rocks; + var fishTank, tankBase, bubbleSystem, secondBubbleSystem, thirdBubbleSystem, anemone, treasure, rocks; var CLEANUP = true; var TANK_DIMENSIONS = { @@ -22,11 +22,11 @@ FishTank = function(spawnPosition, spawnRotation) { 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; - var TANK_WIDTH = TANK_DIMENSIONS.z; - var TANK_HEIGHT = TANK_DIMENSIONS.y; + // 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; + // var TANK_WIDTH = TANK_DIMENSIONS.z; + // var TANK_HEIGHT = TANK_DIMENSIONS.y; var DEBUG_COLOR = { red: 255, @@ -101,14 +101,6 @@ FishTank = function(spawnPosition, spawnRotation) { z: 0.1020 } - 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; - function createFishTank() { var tankProperties = { name: 'hifi-home-fishtank', diff --git a/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js b/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js index 0265e490a5..b48e5fd86d 100644 --- a/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js +++ b/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js @@ -47,10 +47,6 @@ blue: 0 }; - var THROTTLE = true; - var THROTTLE_RATE = 1000; - var sinceLastUpdate = 0; - var _this; function Maze() { @@ -72,6 +68,14 @@ this.testBallDistance(); }, + clickReleaseOnEntity: function() { + this.testBallDistance(); + }, + + clickDownOnEntity: function() { + this.testBallDistance(); + }, + continueNearGrab: function() { this.testWinDistance(); this.testBallDistance(); @@ -232,19 +236,6 @@ }, - update: function(deltaTime) { - //anyone can clean up loose balls - if (THROTTLE === true) { - sinceLastUpdate = sinceLastUpdate + deltaTime * 100; - if (sinceLastUpdate > THROTTLE_RATE) { - sinceLastUpdate = 0; - } else { - return; - } - } - _this.testBallDistance(); - }, - unload: function() { Script.update.disconnect(_this.update); }