Merge branch 'master' of https://github.com/rfoligno/matter-js into rfoligno-master

liabru · liabru · commit 41b4b7f61069 · 2015-05-20T22:41:38.000+01:00
diff --git a/src/core/Sleeping.js b/src/core/Sleeping.js
@@ -27,7 +27,7 @@ var Sleeping = {};
                 motion = body.speed * body.speed + body.angularSpeed * body.angularSpeed;
 
             // wake up bodies if they have a force applied
-            if (body.force.x > 0 || body.force.y > 0) {
+            if (body.force.x !== 0 || body.force.y !== 0) {
                 Sleeping.set(body, false);
                 continue;
             }
@@ -84,7 +84,7 @@ var Sleeping = {};
             }
         }
     };
-
+  
     /**
      * Description
      * @method set

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ var Sleeping = {};`
`27`	`27`	`motion = body.speed * body.speed + body.angularSpeed * body.angularSpeed;`
`28`	`28`
`29`	`29`	`// wake up bodies if they have a force applied`
`30`		`- if (body.force.x > 0 \|\| body.force.y > 0) {`
	`30`	`+ if (body.force.x !== 0 \|\| body.force.y !== 0) {`
`31`	`31`	`Sleeping.set(body, false);`
`32`	`32`	`continue;`
`33`	`33`	`}`
`@@ -84,7 +84,7 @@ var Sleeping = {};`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`};`
`87`		`-`
	`87`	`+`
`88`	`88`	`/**`
`89`	`89`	`* Description`
`90`	`90`	`* @method set`