瀏覽代碼

Fixed bugs with camera exportation

David Catuhe 9 年之前
父節點
當前提交
b76817dcc7

文件差異過大導致無法顯示
+ 1 - 1
dist/preview release/babylon.core.js


文件差異過大導致無法顯示
+ 3420 - 3420
dist/preview release/babylon.d.ts


文件差異過大導致無法顯示
+ 10 - 10
dist/preview release/babylon.js


+ 12 - 2
dist/preview release/babylon.max.js

@@ -13051,8 +13051,10 @@ var BABYLON;
             ]);
         };
         ArcRotateCameraKeyboardMoveInput.prototype.detachControl = function (element) {
-            element.removeEventListener("keydown", this._onKeyDown);
-            element.removeEventListener("keyup", this._onKeyUp);
+            if (element) {
+                element.removeEventListener("keydown", this._onKeyDown);
+                element.removeEventListener("keyup", this._onKeyUp);
+            }
             BABYLON.Tools.UnregisterTopRootEvents([
                 { name: "blur", handler: this._onLostFocus }
             ]);
@@ -48703,6 +48705,14 @@ var BABYLON;
             if (scene.actionManager) {
                 serializationObject.actions = scene.actionManager.serialize("scene");
             }
+            // Audio
+            serializationObject.sounds = [];
+            for (index = 0; index < scene.soundTracks.length; index++) {
+                var soundtrack = scene.soundTracks[index];
+                for (var soundId = 0; soundId < soundtrack.soundCollection.length; soundId++) {
+                    serializationObject.sounds.push(soundtrack.soundCollection[soundId].serialize());
+                }
+            }
             return serializationObject;
         };
         SceneSerializer.SerializeMesh = function (toSerialize /* Mesh || Mesh[] */, withParents, withChildren) {

文件差異過大導致無法顯示
+ 10 - 10
dist/preview release/babylon.noworker.js


+ 4 - 2
src/Cameras/Inputs/babylon.arcrotatecamera.input.keyboard.js

@@ -59,8 +59,10 @@ var BABYLON;
             ]);
         };
         ArcRotateCameraKeyboardMoveInput.prototype.detachControl = function (element) {
-            element.removeEventListener("keydown", this._onKeyDown);
-            element.removeEventListener("keyup", this._onKeyUp);
+            if (element) {
+                element.removeEventListener("keydown", this._onKeyDown);
+                element.removeEventListener("keyup", this._onKeyUp);
+            }
             BABYLON.Tools.UnregisterTopRootEvents([
                 { name: "blur", handler: this._onLostFocus }
             ]);

+ 4 - 2
src/Cameras/Inputs/babylon.arcrotatecamera.input.keyboard.ts

@@ -74,8 +74,10 @@ module BABYLON {
         }
 
         public detachControl(element: HTMLElement) {
-            element.removeEventListener("keydown", this._onKeyDown);
-            element.removeEventListener("keyup", this._onKeyUp);
+            if (element) {
+                element.removeEventListener("keydown", this._onKeyDown);
+                element.removeEventListener("keyup", this._onKeyUp);
+            }
 
             Tools.UnregisterTopRootEvents([
                 { name: "blur", handler: this._onLostFocus }

+ 1 - 1
src/Tools/babylon.sceneSerializer.js

@@ -334,6 +334,6 @@ var BABYLON;
             return serializationObject;
         };
         return SceneSerializer;
-    }());
+    })();
     BABYLON.SceneSerializer = SceneSerializer;
 })(BABYLON || (BABYLON = {}));

+ 0 - 1
src/Tools/babylon.sceneSerializer.ts

@@ -388,4 +388,3 @@
         }
     }
 }
-