fixed running too fast, jumping then jittering up and down. Had to di…

…sable the collider for a short period of time.
asalga · Nov 5, 2014 · 9bd50dd · 9bd50dd
1 parent 1a9847d
commit 9bd50dd
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 31 deletions.
diff --git a/BoundingBoxComponent.pde b/BoundingBoxComponent.pde
@@ -1,13 +1,14 @@
-////////////////////////
-// WrapAroundComponent
-////////////////////////
+/////////////////////////
+// BoundingBoxComponent
+/////////////////////////
 class BoundingBoxComponent extends Component {
 
   float x, y, w, h;
   float xOffest, yOffset;
   int mask;
   int type;
   HashMap<String, GameObject> colliders;
+  boolean collidable;
 
   BoundingBoxComponent() {
     super();
@@ -17,6 +18,7 @@ class BoundingBoxComponent extends Component {
     xOffest = yOffset = 0;
     mask = 0;
     colliders = new HashMap<String, GameObject>();
+    collidable = true;
   }
 
   void awake() {
@@ -46,7 +48,14 @@ class BoundingBoxComponent extends Component {
       pushStyle();
       strokeWeight(1);
       noFill();
-      stroke(255, 0, 0);
+
+      if(isCollisable()){
+        stroke(255, 0, 0);
+      }
+      else{
+       stroke(255, 255, 255); 
+      }
+
       rect(x, -y + yOffset*2, w, h);
       popStyle();
     }
@@ -59,6 +68,14 @@ class BoundingBoxComponent extends Component {
   void onCollision(GameObject other) {
   }
 
+  void setEnableCollisions(boolean b){
+    collidable = b;
+  }
+
+  boolean isCollisable(){
+    return collidable;
+  }
+
   void onCollisionEnter(GameObject other) {
     colliders.put("" + other.id, other);
   }

diff --git a/BoundingBoxYComponent.pde b/BoundingBoxYComponent.pde
@@ -63,7 +63,6 @@ class BoundingBoxYComponent extends BoundingBoxComponent {
 
     // STRUCTURE
     else if(other.hasTag("structure")){
-      mario.hitStructureY(other);
 
       PhysicsComponent phy = (PhysicsComponent)gameObject.getComponent("PhysicsComponent");
 
@@ -78,6 +77,9 @@ class BoundingBoxYComponent extends BoundingBoxComponent {
 
         mario._isJumping = false;
       }
+      else{
+        mario.hitStructureY(other);
+      }
     }
-  } 
+  }
 }
diff --git a/CollisionManager.pde b/CollisionManager.pde
@@ -99,6 +99,10 @@ class CollisionManager {
               continue;
             }
 
+            if(bb1.isCollisable() == false || bb2.isCollisable() == false){
+              continue;
+            }
+
             // Check the masks
             if ((bb1.type & bb2.mask) == 0) {
               numCollisionTestsSkipped++;

diff --git a/MarioControllerComponent.pde b/MarioControllerComponent.pde
@@ -3,12 +3,14 @@
 //////////////////////////
 class MarioControllerComponent extends Component {
 
-  final float walkForce = 20; //550
-  final float jumpForce = 650; //350
-  //BoundingBoxComponent boundingBox;
+  final float walkForce = 20;
+  final float jumpForce = 650;
 
   PhysicsComponent physics;
   AnimationComponent animation;
+  float jumpTimer = 0;
+
+  BoundingBoxComponent boundingBox;
 
   boolean canWalk;
 
@@ -33,12 +35,22 @@ class MarioControllerComponent extends Component {
     if(physics != null){
       physics.setHasFriction(true);
     }
+
+    boundingBox = (BoundingBoxComponent)gameObject.getComponent("BoundingBoxComponent");
   }
 
   void update(float dt) {
     // TODO: fix
     super.update(dt);
 
+    jumpTimer += dt;
+
+    // We want to re-enable the collider, but only after it left the
+    // possibility of touching any other colliders
+    if(jumpTimer > 0.04){
+      boundingBox.setEnableCollisions(true);
+    }
+
     _isInvinsible = Keyboard.isKeyDown(KEY_I);
 
     // We don't want the player to be able to walk after
@@ -70,25 +82,36 @@ class MarioControllerComponent extends Component {
   }
 
   void idle() {
-    animation.play("idle");
+    if(animation != null){
+      animation.play("idle");
+    }
   }
 
   void walkRight() {
     physics.applyForce(walkForce, 0);
-    animation.setFlipX(false);
-    animation.play("walk");
+
+    if(animation != null){
+      animation.setFlipX(false);
+      animation.play("walk");
+    }
   }
 
   void walkLeft() {
     physics.applyForce(-walkForce, 0);
-    animation.setFlipX(true);
-    animation.play("walk");
+
+    if(animation != null){
+      animation.setFlipX(true);
+      animation.play("walk");
+    }
   }
 
   void jump() {
     // If the player is told to jump but they already are touching
     // a structure at the top, ignore the call.
     BoundingBoxComponent boundingBox = (BoundingBoxComponent)gameObject.getComponent("BoundingBoxComponent");
+    boundingBox.setEnableCollisions(false);
+    jumpTimer = 0.0;
+
     HashMap<String, GameObject> colliders = boundingBox.colliders;
     for(String key : colliders.keySet()){
       GameObject go = colliders.get(key);
@@ -100,7 +123,10 @@ class MarioControllerComponent extends Component {
           controller.hit(gameObject);
 
           soundManager.playSound("jump");
-          animation.play("jump");
+
+          if(animation != null){
+            animation.play("jump");
+          }
         }
         return;
       }
@@ -117,7 +143,11 @@ class MarioControllerComponent extends Component {
       physics.setTouchingFloor(false);
       physics.applyJumpForce(jumpForce);
       soundManager.playSound("jump");
-      animation.play("jump");
+
+      if(animation!=null){
+        animation.play("jump");
+      }
+
       _isJumping = true;
 
       // assume we'll land on the floor.
@@ -136,7 +166,7 @@ class MarioControllerComponent extends Component {
 
   // Not moving in either x or y direction
   boolean isIdle() {
-    return  Keyboard.isKeyDown(KEY_LEFT) == false &&
+    return Keyboard.isKeyDown(KEY_LEFT) == false &&
       Keyboard.isKeyDown(KEY_RIGHT) == false &&
       canJump();
   }
@@ -171,24 +201,18 @@ class MarioControllerComponent extends Component {
     phy.setTouchingFloor(false);
     phy.velocity.y = 0;
 
-    animation.play("jump");
+    if(animation != null){
+      animation.play("jump");
+    }
   }
 
   void hitStructureY(GameObject structure){
-    // LANDED ON TOP
-    if(gameObject.position.y > structure.position.y){
-      dprintln("Landed on top");
-      _isJumping = false;
-    }
-    // PUNCHED
-    else{
-      if(getJumpState()){
-        dprintln("Punched strucure");
-        physics.setVelocityY(0);
+    if(getJumpState()){
+      dprintln("Punched strucure");
+      physics.setVelocityY(0);
 
-        StructureControllerComponent controller = (StructureControllerComponent)structure.getComponent("StructureControllerComponent");
-        controller.hit(gameObject);
-      }
+      StructureControllerComponent controller = (StructureControllerComponent)structure.getComponent("StructureControllerComponent");
+      controller.hit(gameObject);
     }
   }