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

cleanup

Browse source
This commit is contained in:
James B. Pollack 2016-03-17 09:42:17 -07:00
parent 16f2ef48fe
commit b080dd8c64
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,10 +9,10 @@
// 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
Script.include('utils.js');
(function() { (function() {
Script.include('../../../../libraries/utils.js');
var _this; var _this;

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';

16
unpublishedScripts/DomainContent/Home/reset.js
View file

@ -37,6 +37,12 @@
Script.include(kineticPath); Script.include(kineticPath);
var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
x: 0,
y: 0.5,
z: 0
}), Vec3.multiply(1, Quat.getFront(Camera.getOrientation())));
Reset.prototype = { Reset.prototype = {
tidying: false, tidying: false,
@ -174,11 +180,7 @@
createKineticEntities: function() { createKineticEntities: function() {
var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
x: 0,
y: 0.5,
z: 0
}), Vec3.multiply(1, Quat.getFront(Camera.getOrientation())));
var fruitBowl = new FruitBowl({ var fruitBowl = new FruitBowl({
x: 1105.3185, x: 1105.3185,
@ -252,6 +254,10 @@
kineticEntities.forEach(function(kineticEntity) { kineticEntities.forEach(function(kineticEntity) {
kineticEntity.cleanup(); kineticEntity.cleanup();
}) })
},
unload: function() {
this.cleanupDynamicEntities();
this.cleanupKineticEntities();
} }
} }

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

@ -13,7 +13,7 @@
(function() { (function() {
Script.include('../utils.js'); // Script.include('../utils.js');
var SCALE = 0.5; var SCALE = 0.5;
var VICTORY_SOUND; var VICTORY_SOUND;