mirror of
https://github.com/overte-org/overte.git
synced 2025-08-10 04:12:46 +02:00
tidy
This commit is contained in:
parent
8877a6c570
commit
432810704e
4 changed files with 10 additions and 5 deletions
|
@ -11,6 +11,8 @@
|
||||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
// 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) {
|
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, urchin, treasure, rocks;
|
||||||
var CLEANUP = true;
|
var CLEANUP = true;
|
||||||
|
@ -36,7 +38,7 @@ FishTank = function(spawnPosition, spawnRotation) {
|
||||||
|
|
||||||
var TANK_POSITION = spawnPosition;
|
var TANK_POSITION = spawnPosition;
|
||||||
|
|
||||||
var TANK_SCRIPT = Script.resolvePath('fishTank/tank.js?' + Math.random())
|
|
||||||
|
|
||||||
var TANK_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/aquariumTank.fbx";
|
var TANK_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/aquariumTank.fbx";
|
||||||
|
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
// This entity script handles the logic for growing a plant when it has water poured on it
|
// This entity script handles the logic for growing a plant when it has water poured on it
|
||||||
// Distributed under the Apache License, Version 2.0.
|
// Distributed under the Apache License, Version 2.0.
|
||||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||||
var PLANT_SCRIPT_URL = Script.resolvePath("growingPlant/growingPlantEntityScript.js?v1" + Math.random().toFixed(2));
|
var PLANT_SCRIPT_URL = Script.resolvePath("growingPlantEntityScript.js?v1" + Math.random().toFixed(2));
|
||||||
var WATER_CAN_SCRIPT_URL = Script.resolvePath("growingPlant/waterCanEntityScript.js?v2" + Math.random().toFixed());
|
var WATER_CAN_SCRIPT_URL = Script.resolvePath("waterCanEntityScript.js?v2" + Math.random().toFixed());
|
||||||
Plant = function(spawnPosition, spawnRotation) {
|
Plant = function(spawnPosition, spawnRotation) {
|
||||||
var orientation = Camera.getOrientation();
|
var orientation = Camera.getOrientation();
|
||||||
orientation = Quat.safeEulerAngles(orientation);
|
orientation = Quat.safeEulerAngles(orientation);
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
|
|
||||||
Script.include('../../../../libraries/utils.js');
|
Script.include('../utils.js');
|
||||||
|
|
||||||
var SCALE = 0.5;
|
var SCALE = 0.5;
|
||||||
var VICTORY_SOUND;
|
var VICTORY_SOUND;
|
||||||
|
|
|
@ -9,13 +9,16 @@
|
||||||
// Distributed under the Apache License, Version 2.0.
|
// Distributed under the Apache License, Version 2.0.
|
||||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||||
//
|
//
|
||||||
|
|
||||||
|
var MAZE_SCRIPT = Script.resolvePath('tiltMaze/maze.js?' + Math.random());
|
||||||
|
|
||||||
TiltMaze = function(spawnPosition, spawnRotation) {
|
TiltMaze = function(spawnPosition, spawnRotation) {
|
||||||
|
|
||||||
var ball, ballSpawningAnchor, ballDetector, tiltMaze, lightAtTheEnd;
|
var ball, ballSpawningAnchor, ballDetector, tiltMaze, lightAtTheEnd;
|
||||||
|
|
||||||
var MAZE_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/tiltMaze/newmaze_tex-4.fbx";
|
var MAZE_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/tiltMaze/newmaze_tex-4.fbx";
|
||||||
var MAZE_COLLISION_HULL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/tiltMaze/newmaze_tex-3.obj";
|
var MAZE_COLLISION_HULL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/tiltMaze/newmaze_tex-3.obj";
|
||||||
var MAZE_SCRIPT = Script.resolvePath('tiltMaze/maze.js?' + Math.random());
|
|
||||||
|
|
||||||
var SCALE = 0.5;
|
var SCALE = 0.5;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue