Abstracted behavior related to "orientable" entities

A lot of the stuff that ControllingSystem did to control the player character was moved into the new OrientingSystem. This is so that the player, or any player-like entities, can also be controlled by AI, with the underlying behavior being delegated in the same way as if the player were being controlled by the user.

Fixed the issue where, if the player were blocked while moving horizontally, they would remain blocked even if vertical movement were to remove the collision.

Fixed cases of the player animating incorrectly after performing certain movements.

3 files changed, 50 insertions, 36 deletions

@@ -1,24 +0,0 @@
-#ifndef DROPPABLE_H_5DB254EF
-#define DROPPABLE_H_5DB254EF
-
-#include "component.h"
-
-class DroppableComponent : public Component {
-public:
-
-  inline bool isDroppable() const
-  {
-    return droppable_;
-  }
-
-  inline void setDroppable(bool can)
-  {
-    droppable_ = can;
-  }
-
-private:
-
-  bool droppable_ = false;
-};
-
-#endif /* end of include guard: DROPPABLE_H_5DB254EF */
@@ -6,6 +6,18 @@
 class OrientableComponent : public Component {
 public:
 
+  enum class WalkState {
+    still,
+    left,
+    right
+  };
+
+  enum class DropState {
+    none,
+    ready,
+    active
+  };
+
   inline bool isFacingRight() const
   {
     return facingRight_;
@@ -16,9 +28,42 @@ public:
     facingRight_ = v;
   }
 
+  inline WalkState getWalkState() const
+  {
+    return walkState_;
+  }
+
+  inline void setWalkState(WalkState v)
+  {
+    walkState_ = v;
+  }
+
+  inline bool isJumping() const
+  {
+    return jumping_;
+  }
+
+  inline void setJumping(bool v)
+  {
+    jumping_ = v;
+  }
+
+  inline DropState getDropState() const
+  {
+    return dropState_;
+  }
+
+  inline void setDropState(DropState v)
+  {
+    dropState_ = v;
+  }
+
 private:
 
   bool facingRight_ = false;
+  WalkState walkState_ = WalkState::still;
+  bool jumping_ = false;
+  DropState dropState_ = DropState::none;
 };
 
 #endif /* end of include guard: ORIENTABLE_H_EDB6C4A1 */
@@ -11,13 +11,6 @@ public:
     freefalling
   };
 
-  enum class State {
-    grounded,
-    jumping,
-    falling,
-    dropping
-  };
-
   PonderableComponent(Type type) : type_(type)
   {
   }
@@ -67,14 +60,14 @@ public:
     accelY_ = v;
   }
 
-  inline State getState() const
+  inline bool isGrounded() const
   {
-    return state_;
+    return grounded_;
   }
 
-  inline void setState(State arg)
+  inline void setGrounded(bool v)
   {
-    state_ = arg;
+    grounded_ = v;
   }
 
 private:
@@ -84,7 +77,7 @@ private:
   double accelX_ = 0.0;
   double accelY_ = 0.0;
   Type type_ = Type::vacuumed;
-  State state_ = State::grounded;
+  bool grounded_ = false;
 };
 
 #endif /* end of include guard: TANGIBLE_H_746DB3EE */