瀏覽代碼

New uglifyed version of babylon.js (grunt-contrib-uglify)

David Catuhe 11 年之前
父節點
當前提交
d9d35b8e1e
共有 4 個文件被更改,包括 27 次插入39 次删除
  1. 2 2
      Babylon/Cameras/babylon.touchCamera.js
  2. 6 5
      Babylon/Mesh/babylon.mesh.js
  3. 6 4
      Babylon/Mesh/babylon.mesh.ts
  4. 13 28
      babylon.1.12-beta.js

+ 2 - 2
Babylon/Cameras/babylon.touchCamera.js

@@ -99,7 +99,7 @@ var BABYLON = BABYLON || {};
         canvas.addEventListener("pointerout", this._onPointerUp);
         canvas.addEventListener("pointermove", this._onPointerMove);
 
-        Tools.RegisterTopRootEvents([
+        BABYLON.Tools.RegisterTopRootEvents([
             { name: "blur", handler: this._onLostFocus }
         ]);
     };
@@ -114,7 +114,7 @@ var BABYLON = BABYLON || {};
         canvas.removeEventListener("pointerout", this._onPointerUp);
         canvas.removeEventListener("pointermove", this._onPointerMove);
 
-        Tools.UnregisterTopRootEvents([
+        BABYLON.Tools.UnregisterTopRootEvents([
             { name: "blur", handler: this._onLostFocus }
         ]);
         

+ 6 - 5
Babylon/Mesh/babylon.mesh.js

@@ -933,6 +933,12 @@ var BABYLON;
             }
 
             impostor = impostor || BABYLON.PhysicsEngine.NoImpostor;
+
+            if (impostor === BABYLON.PhysicsEngine.NoImpostor) {
+                physicsEngine._unregisterMesh(this);
+                return;
+            }
+
             options.mass = options.mass || 0;
             options.friction = options.friction || 0.2;
             options.restitution = options.restitution || 0.9;
@@ -942,11 +948,6 @@ var BABYLON;
             this._physicsFriction = options.friction;
             this._physicRestitution = options.restitution;
 
-            if (impostor === BABYLON.PhysicsEngine.NoImpostor) {
-                physicsEngine._unregisterMesh(this);
-                return;
-            }
-
             physicsEngine._registerMesh(this, impostor, options);
         };
 

+ 6 - 4
Babylon/Mesh/babylon.mesh.ts

@@ -953,6 +953,12 @@
             }
 
             impostor = impostor || PhysicsEngine.NoImpostor;
+
+            if (impostor === BABYLON.PhysicsEngine.NoImpostor) {
+                physicsEngine._unregisterMesh(this);
+                return;
+            }
+
             options.mass = options.mass || 0;
             options.friction = options.friction || 0.2;
             options.restitution = options.restitution || 0.9;
@@ -962,10 +968,6 @@
             this._physicsFriction = options.friction;
             this._physicRestitution = options.restitution;
 
-            if (impostor === BABYLON.PhysicsEngine.NoImpostor) {
-                physicsEngine._unregisterMesh(this);
-                return;
-            }
 
             physicsEngine._registerMesh(this, impostor, options);
         }

文件差異過大導致無法顯示
+ 13 - 28
babylon.1.12-beta.js