Browse Source

Check during workerCollision set

Setting workerCollisions to true will also check if Worker support
exists in the browser and will set legacy (and false) if not.
Raanan Weber 10 years ago
parent
commit
3e411f7984
2 changed files with 4 additions and 1 deletions
  1. 1 1
      Babylon/babylon.scene.js
  2. 3 0
      Babylon/babylon.scene.ts

+ 1 - 1
Babylon/babylon.scene.js

@@ -185,6 +185,7 @@ var BABYLON;
                 return this._workerCollisions;
             },
             set: function (enabled) {
+                enabled = (enabled && !!Worker);
                 this._workerCollisions = enabled;
                 if (this.collisionCoordinator) {
                     this.collisionCoordinator.destroy();
@@ -1731,4 +1732,3 @@ var BABYLON;
     })();
     BABYLON.Scene = Scene;
 })(BABYLON || (BABYLON = {}));
-//# sourceMappingURL=babylon.scene.js.map

+ 3 - 0
Babylon/babylon.scene.ts

@@ -302,6 +302,9 @@
         }
 
         public set workerCollisions(enabled: boolean) {
+        
+            enabled = (enabled && !!Worker)
+        
             this._workerCollisions = enabled;
             if (this.collisionCoordinator) {
                 this.collisionCoordinator.destroy();