Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:21:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rotate tank things and add some mouse callbacks to tilt maze

Browse source
This commit is contained in:
James B. Pollack 2016-03-30 09:51:59 -07:00
parent 8e1fec2943
commit 096bb4e340
2 changed files with 14 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
unpublishedScripts/DomainContent/Home/fishTank/wrapper.js
View file

@ -13,7 +13,7 @@
var TANK_SCRIPT = Script.resolvePath('entityLocalFish.js'); var TANK_SCRIPT = Script.resolvePath('entityLocalFish.js');
FishTank = function(spawnPosition, spawnRotation) { 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 CLEANUP = true;
var TANK_DIMENSIONS = { var TANK_DIMENSIONS = {
@ -22,11 +22,11 @@ FishTank = function(spawnPosition, spawnRotation) {
z: 2.1404 z: 2.1404
}; };
var INNER_TANK_SCALE = 0.7; // var INNER_TANK_SCALE = 0.7;
var INNER_TANK_DIMENSIONS = Vec3.multiply(INNER_TANK_SCALE, TANK_DIMENSIONS); // var INNER_TANK_DIMENSIONS = Vec3.multiply(INNER_TANK_SCALE, TANK_DIMENSIONS);
INNER_TANK_DIMENSIONS.y = INNER_TANK_DIMENSIONS.y - 0.4; // INNER_TANK_DIMENSIONS.y = INNER_TANK_DIMENSIONS.y - 0.4;
var TANK_WIDTH = TANK_DIMENSIONS.z; // var TANK_WIDTH = TANK_DIMENSIONS.z;
var TANK_HEIGHT = TANK_DIMENSIONS.y; // var TANK_HEIGHT = TANK_DIMENSIONS.y;
var DEBUG_COLOR = { var DEBUG_COLOR = {
red: 255, red: 255,
@ -101,14 +101,6 @@ FishTank = function(spawnPosition, spawnRotation) {
z: 0.1020 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() { function createFishTank() {
var tankProperties = { var tankProperties = {
name: 'hifi-home-fishtank', name: 'hifi-home-fishtank',

25
unpublishedScripts/DomainContent/Home/tiltMaze/maze.js
View file

@ -47,10 +47,6 @@
blue: 0 blue: 0
}; };
var THROTTLE = true;
var THROTTLE_RATE = 1000;
var sinceLastUpdate = 0;
var _this; var _this;
function Maze() { function Maze() {
@ -72,6 +68,14 @@
this.testBallDistance(); this.testBallDistance();
}, },
clickReleaseOnEntity: function() {
this.testBallDistance();
},
clickDownOnEntity: function() {
this.testBallDistance();
},
continueNearGrab: function() { continueNearGrab: function() {
this.testWinDistance(); this.testWinDistance();
this.testBallDistance(); 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() { unload: function() {
Script.update.disconnect(_this.update); Script.update.disconnect(_this.update);
} }