fixed wrong motion state constants in phaser p2 body

georgiee · georgiee · commit 5b78c5c46e1a · 2014-03-19T22:56:26.000+01:00
diff --git a/src/physics/p2/Body.js b/src/physics/p2/Body.js
@@ -1232,20 +1232,20 @@ Object.defineProperty(Phaser.Physics.P2.Body.prototype, "static", {
     
     get: function () {
 
-        return (this.data.motionState === Phaser.Physics.P2.STATIC);
+        return (this.data.motionState === Phaser.Physics.P2.Body.STATIC);
 
     },
 
     set: function (value) {
 
-        if (value && this.data.motionState !== Phaser.Physics.P2.STATIC)
+        if (value && this.data.motionState !== Phaser.Physics.P2.Body.STATIC)
         {
-            this.data.motionState = Phaser.Physics.P2.STATIC;
+            this.data.motionState = Phaser.Physics.P2.Body.STATIC;
             this.mass = 0;
         }
-        else if (!value && this.data.motionState === Phaser.Physics.P2.STATIC)
+        else if (!value && this.data.motionState === Phaser.Physics.P2.Body.STATIC)
         {
-            this.data.motionState = Phaser.Physics.P2.DYNAMIC;
+            this.data.motionState = Phaser.Physics.P2.Body.DYNAMIC;
 
             if (this.mass === 0)
             {
@@ -1265,24 +1265,24 @@ Object.defineProperty(Phaser.Physics.P2.Body.prototype, "dynamic", {
     
     get: function () {
 
-        return (this.data.motionState === Phaser.Physics.P2.DYNAMIC);
+        return (this.data.motionState === Phaser.Physics.P2.Body.DYNAMIC);
 
     },
 
     set: function (value) {
 
-        if (value && this.data.motionState !== Phaser.Physics.P2.DYNAMIC)
+        if (value && this.data.motionState !== Phaser.Physics.P2.Body.DYNAMIC)
         {
-            this.data.motionState = Phaser.Physics.P2.DYNAMIC;
+            this.data.motionState = Phaser.Physics.P2.Body.DYNAMIC;
 
             if (this.mass === 0)
             {
                 this.mass = 1;
             }
         }
-        else if (!value && this.data.motionState === Phaser.Physics.P2.DYNAMIC)
+        else if (!value && this.data.motionState === Phaser.Physics.P2.Body.DYNAMIC)
         {
-            this.data.motionState = Phaser.Physics.P2.STATIC;
+            this.data.motionState = Phaser.Physics.P2.Body.STATIC;
             this.mass = 0;
         }
 
@@ -1298,20 +1298,20 @@ Object.defineProperty(Phaser.Physics.P2.Body.prototype, "kinematic", {
     
     get: function () {
 
-        return (this.data.motionState === Phaser.Physics.P2.KINEMATIC);
+        return (this.data.motionState === Phaser.Physics.P2.Body.KINEMATIC);
 
     },
 
     set: function (value) {
 
-        if (value && this.data.motionState !== Phaser.Physics.P2.KINEMATIC)
+        if (value && this.data.motionState !== Phaser.Physics.P2.Body.KINEMATIC)
         {
-            this.data.motionState = Phaser.Physics.P2.KINEMATIC;
+            this.data.motionState = Phaser.Physics.P2.Body.KINEMATIC;
             this.mass = 4;
         }
-        else if (!value && this.data.motionState === Phaser.Physics.P2.KINEMATIC)
+        else if (!value && this.data.motionState === Phaser.Physics.P2.Body.KINEMATIC)
         {
-            this.data.motionState = Phaser.Physics.P2.STATIC;
+            this.data.motionState = Phaser.Physics.P2.Body.STATIC;
             this.mass = 0;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1232,20 +1232,20 @@ Object.defineProperty(Phaser.Physics.P2.Body.prototype, "static", {`
`1232`	`1232`
`1233`	`1233`	`get: function () {`
`1234`	`1234`
`1235`		`- return (this.data.motionState === Phaser.Physics.P2.STATIC);`
	`1235`	`+ return (this.data.motionState === Phaser.Physics.P2.Body.STATIC);`
`1236`	`1236`
`1237`	`1237`	`},`
`1238`	`1238`
`1239`	`1239`	`set: function (value) {`
`1240`	`1240`
`1241`		`- if (value && this.data.motionState !== Phaser.Physics.P2.STATIC)`
	`1241`	`+ if (value && this.data.motionState !== Phaser.Physics.P2.Body.STATIC)`
`1242`	`1242`	`{`
`1243`		`- this.data.motionState = Phaser.Physics.P2.STATIC;`
	`1243`	`+ this.data.motionState = Phaser.Physics.P2.Body.STATIC;`
`1244`	`1244`	`this.mass = 0;`
`1245`	`1245`	`}`
`1246`		`- else if (!value && this.data.motionState === Phaser.Physics.P2.STATIC)`
	`1246`	`+ else if (!value && this.data.motionState === Phaser.Physics.P2.Body.STATIC)`
`1247`	`1247`	`{`
`1248`		`- this.data.motionState = Phaser.Physics.P2.DYNAMIC;`
	`1248`	`+ this.data.motionState = Phaser.Physics.P2.Body.DYNAMIC;`
`1249`	`1249`
`1250`	`1250`	`if (this.mass === 0)`
`1251`	`1251`	`{`
`@@ -1265,24 +1265,24 @@ Object.defineProperty(Phaser.Physics.P2.Body.prototype, "dynamic", {`
`1265`	`1265`
`1266`	`1266`	`get: function () {`
`1267`	`1267`
`1268`		`- return (this.data.motionState === Phaser.Physics.P2.DYNAMIC);`
	`1268`	`+ return (this.data.motionState === Phaser.Physics.P2.Body.DYNAMIC);`
`1269`	`1269`
`1270`	`1270`	`},`
`1271`	`1271`
`1272`	`1272`	`set: function (value) {`
`1273`	`1273`
`1274`		`- if (value && this.data.motionState !== Phaser.Physics.P2.DYNAMIC)`
	`1274`	`+ if (value && this.data.motionState !== Phaser.Physics.P2.Body.DYNAMIC)`
`1275`	`1275`	`{`
`1276`		`- this.data.motionState = Phaser.Physics.P2.DYNAMIC;`
	`1276`	`+ this.data.motionState = Phaser.Physics.P2.Body.DYNAMIC;`
`1277`	`1277`
`1278`	`1278`	`if (this.mass === 0)`
`1279`	`1279`	`{`
`1280`	`1280`	`this.mass = 1;`
`1281`	`1281`	`}`
`1282`	`1282`	`}`
`1283`		`- else if (!value && this.data.motionState === Phaser.Physics.P2.DYNAMIC)`
	`1283`	`+ else if (!value && this.data.motionState === Phaser.Physics.P2.Body.DYNAMIC)`
`1284`	`1284`	`{`
`1285`		`- this.data.motionState = Phaser.Physics.P2.STATIC;`
	`1285`	`+ this.data.motionState = Phaser.Physics.P2.Body.STATIC;`
`1286`	`1286`	`this.mass = 0;`
`1287`	`1287`	`}`
`1288`	`1288`
`@@ -1298,20 +1298,20 @@ Object.defineProperty(Phaser.Physics.P2.Body.prototype, "kinematic", {`
`1298`	`1298`
`1299`	`1299`	`get: function () {`
`1300`	`1300`
`1301`		`- return (this.data.motionState === Phaser.Physics.P2.KINEMATIC);`
	`1301`	`+ return (this.data.motionState === Phaser.Physics.P2.Body.KINEMATIC);`
`1302`	`1302`
`1303`	`1303`	`},`
`1304`	`1304`
`1305`	`1305`	`set: function (value) {`
`1306`	`1306`
`1307`		`- if (value && this.data.motionState !== Phaser.Physics.P2.KINEMATIC)`
	`1307`	`+ if (value && this.data.motionState !== Phaser.Physics.P2.Body.KINEMATIC)`
`1308`	`1308`	`{`
`1309`		`- this.data.motionState = Phaser.Physics.P2.KINEMATIC;`
	`1309`	`+ this.data.motionState = Phaser.Physics.P2.Body.KINEMATIC;`
`1310`	`1310`	`this.mass = 4;`
`1311`	`1311`	`}`
`1312`		`- else if (!value && this.data.motionState === Phaser.Physics.P2.KINEMATIC)`
	`1312`	`+ else if (!value && this.data.motionState === Phaser.Physics.P2.Body.KINEMATIC)`
`1313`	`1313`	`{`
`1314`		`- this.data.motionState = Phaser.Physics.P2.STATIC;`
	`1314`	`+ this.data.motionState = Phaser.Physics.P2.Body.STATIC;`
`1315`	`1315`	`this.mass = 0;`
`1316`	`1316`	`}`
`1317`	`1317`