cleanup

unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js

@@ -9,10 +9,10 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 
-
+Script.include('utils.js');
 
 (function() {
-    Script.include('../../../../libraries/utils.js');
+    
 
     var _this;
 

unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js

@@ -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 */
 (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 PING_PONG_BALL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_ball.fbx';

unpublishedScripts/DomainContent/Home/reset.js

@@ -37,6 +37,12 @@
 
     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 = {
         tidying: false,
 
@@ -174,11 +180,7 @@
 
         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({
                 x: 1105.3185,
@@ -252,6 +254,10 @@
             kineticEntities.forEach(function(kineticEntity) {
                 kineticEntity.cleanup();
             })
+        },
+        unload: function() {
+            this.cleanupDynamicEntities();
+            this.cleanupKineticEntities();
         }
 
     }

unpublishedScripts/DomainContent/Home/tiltMaze/maze.js

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