瀏覽代碼

Merge pull request #984 from RaananW/getOptionsFix

fixing missing get options
David Catuhe 9 年之前
父節點
當前提交
affeec25bd
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 3 3
      src/Physics/Plugins/babylon.cannonJSPlugin.js
  2. 3 3
      src/Physics/Plugins/babylon.cannonJSPlugin.ts

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

@@ -63,13 +63,13 @@ var BABYLON;
                     this.removePhysicsBody(impostor);
                     this.removePhysicsBody(impostor);
                 }
                 }
                 //create the body and material
                 //create the body and material
-                var material = this._addMaterial(impostor.getOptions().friction, impostor.getOptions().restitution);
+                var material = this._addMaterial(impostor.getParam("friction"), impostor.getParam("restitution"));
                 var bodyCreationObject = {
                 var bodyCreationObject = {
-                    mass: impostor.getOptions().mass,
+                    mass: impostor.getParam("mass"),
                     material: material
                     material: material
                 };
                 };
                 // A simple extend, in case native options were used.
                 // A simple extend, in case native options were used.
-                var nativeOptions = impostor.getOptions().nativeOptions;
+                var nativeOptions = impostor.getParam("nativeOptions");
                 for (var key in nativeOptions) {
                 for (var key in nativeOptions) {
                     if (nativeOptions.hasOwnProperty(key)) {
                     if (nativeOptions.hasOwnProperty(key)) {
                         bodyCreationObject[key] = nativeOptions[key];
                         bodyCreationObject[key] = nativeOptions[key];

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

@@ -68,14 +68,14 @@
                 }
                 }
                 
                 
                 //create the body and material
                 //create the body and material
-                var material = this._addMaterial(impostor.getOptions().friction, impostor.getOptions().restitution);
+                var material = this._addMaterial(impostor.getParam("friction"), impostor.getParam("restitution"));
 
 
                 var bodyCreationObject = {
                 var bodyCreationObject = {
-                    mass: impostor.getOptions().mass,
+                    mass: impostor.getParam("mass"),
                     material: material
                     material: material
                 };
                 };
                 // A simple extend, in case native options were used.
                 // A simple extend, in case native options were used.
-                var nativeOptions = impostor.getOptions().nativeOptions;
+                var nativeOptions = impostor.getParam("nativeOptions");
                 for (var key in nativeOptions) {
                 for (var key in nativeOptions) {
                     if (nativeOptions.hasOwnProperty(key)) {
                     if (nativeOptions.hasOwnProperty(key)) {
                         bodyCreationObject[key] = nativeOptions[key];
                         bodyCreationObject[key] = nativeOptions[key];