Merge pull request #592 from pawurb/smoothier_collisions

Gravity collision detected only on top.
craftyjs · Nov 13, 2013 · afabe59 · afabe59
2 parents cbf5c0d + 90e153d
commit afabe59
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/2D.js b/src/2D.js
@@ -1045,6 +1045,7 @@ Crafty.c("Gravity", {
      */
     gravity: function (comp) {
         if (comp) this._anti = comp;
+        if(isNaN(this._jumpSpeed)) this._jumpSpeed = 0; //set to 0 if Twoway component is not present
 
         this.bind("EnterFrame", this._enterFrame);
 
@@ -1108,8 +1109,10 @@ Crafty.c("Gravity", {
             }
         }
 
-        if (hit) { //stop falling if found
-            if (this._falling) this.stopFalling(hit);
+        if (hit) { //stop falling if found and player is moving down
+            if (this._falling && ((this._gy > this._jumpSpeed) || !this._up)){
+              this.stopFalling(hit);
+            } 
         } else {
             this._falling = true; //keep falling otherwise
         }

diff --git a/src/controls.js b/src/controls.js
@@ -908,12 +908,16 @@ Crafty.c("Twoway", {
         });
 
         if (speed) this._speed = speed;
-        if (arguments.length < 2) jump = this._speed * 2;
+        if (arguments.length < 2){
+          this._jumpSpeed = this._speed * 2;
+        } else{
+          this._jumpSpeed = jump;
+        }
 
         this.bind("EnterFrame", function () {
             if (this.disableControls) return;
             if (this._up) {
-                this.y -= jump;
+                this.y -= this._jumpSpeed;
                 this._falling = true;
             }
         }).bind("KeyDown", function (e) {