Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 02:03:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

utils

Browse source
This commit is contained in:
James B. Pollack 2016-03-17 10:45:52 -07:00
parent 9933690ed6
commit d9526b6506
4 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
unpublishedScripts/DomainContent/Home/fishTank/tank.js
View file

@ -12,7 +12,7 @@
// //
(function() { (function() {
Script.include('../utils.js');
Script.include('../../../../examples/libraries/virtualBaton.js'); Script.include('../../../../examples/libraries/virtualBaton.js');
//only one person should simulate the tank at a time -- we pass around a virtual baton //only one person should simulate the tank at a time -- we pass around a virtual baton
@ -306,16 +306,16 @@
}; };
// //
// flockOfFish.js // flockOfFish.js
// examples // examples
// //
// Philip Rosedale // Philip Rosedale
// Copyright 2016 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.
// Fish smimming around in a space in front of you // Fish smimming around in a space in front of you
// //
// 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 FISHTANK_USERDATA_KEY = 'hifi-home-fishtank' var FISHTANK_USERDATA_KEY = 'hifi-home-fishtank'
@ -453,8 +453,7 @@
if (bounds !== null) { if (bounds !== null) {
lowerCorner = bounds.brn; lowerCorner = bounds.brn;
upperCorner = bounds.tfl; upperCorner = bounds.tfl;
} } else {
else{
print('NO BOUNDS FOR TANK, returning!!') print('NO BOUNDS FOR TANK, returning!!')
return; return;
} }
@ -715,4 +714,4 @@
} }
return new FishTank(); return new FishTank();
}); });

4
unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js
View file

@ -12,8 +12,8 @@
(function() { (function() {
Script.include('../utils.js');
Script.include('utils.js');
var _this; var _this;
function GrowingPlant() { function GrowingPlant() {

2
unpublishedScripts/DomainContent/Home/growingPlant/waterCanEntityScript.js
View file

@ -12,7 +12,7 @@
(function() { (function() {
Script.include('../../../../libraries/utils.js'); Script.include('../utils.js');
var _this; var _this;
function WaterSpout() { function WaterSpout() {

2
unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js
View file

@ -11,7 +11,7 @@
/*global print, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, randFloat, randInt */ /*global print, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, randFloat, randInt */
(function() { (function() {
Script.include("utils.js"); Script.include("../utils.js");
var SHOOTING_SOUND_URL = 'http://hifi-public.s3.amazonaws.com/sounds/ping_pong_gun/pong_sound.wav'; var SHOOTING_SOUND_URL = 'http://hifi-public.s3.amazonaws.com/sounds/ping_pong_gun/pong_sound.wav';
var PING_PONG_BALL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_ball.fbx'; var PING_PONG_BALL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_ball.fbx';