Browse Source

physics plugin fix for the new UMD

Raanan Weber 7 years ago
parent
commit
1d4c2dade7

+ 3 - 3
src/Physics/Plugins/babylon.cannonJSPlugin.ts

@@ -1,15 +1,15 @@
 module BABYLON {
-    declare var require: any;
+    //declare var require: any;
     declare var CANNON: any;
 
     export class CannonJSPlugin implements IPhysicsEnginePlugin {
 
-        public world: any; //this.BJSCANNON.World
+        public world: any;
         public name: string = "CannonJSPlugin";
         private _physicsMaterials = new Array();
         private _fixedTimeStep: number = 1 / 60;
         //See https://github.com/schteppe/CANNON.js/blob/gh-pages/demos/collisionFilter.html
-        public BJSCANNON = typeof CANNON !== 'undefined' ? CANNON : (typeof require !== 'undefined' ? require('cannon') : undefined);
+        public BJSCANNON = CANNON;
 
 
 

+ 1 - 2
src/Physics/Plugins/babylon.oimoJSPlugin.ts

@@ -1,5 +1,4 @@
 module BABYLON {
-    declare var require: any;
     declare var OIMO: any;
 
     export class OimoJSPlugin implements IPhysicsEnginePlugin {
@@ -10,7 +9,7 @@ module BABYLON {
 
 
         constructor(iterations?: number) {
-            this.BJSOIMO = typeof OIMO !== 'undefined' ? OIMO : (typeof require !== 'undefined' ? require('./Oimo') : undefined);
+            this.BJSOIMO = OIMO;
             this.world = new this.BJSOIMO.World({
                 iterations: iterations
             });