9 files changed, 210 insertions, 238 deletions

@@ -60,10 +60,7 @@ add_executable(Aromatherapy
   src/muxer.cpp
   src/entity_manager.cpp
   src/game.cpp
-  src/components/transformable.cpp
-  src/components/droppable.cpp
-  src/components/controllable.cpp
-  src/components/ponderable.cpp
+  src/animation.cpp
   src/components/animatable.cpp
   src/systems/rendering.cpp
   src/systems/controlling.cpp
@@ -1,71 +0,0 @@
-#include "controllable.h"
-
-int ControllableComponent::getLeftKey() const
-{
-  return leftKey;
-}
-
-void ControllableComponent::setLeftKey(int k)
-{
-  leftKey = k;
-}
-
-int ControllableComponent::getRightKey() const
-{
-  return rightKey;
-}
-
-void ControllableComponent::setRightKey(int k)
-{
-  rightKey = k;
-}
-
-int ControllableComponent::getJumpKey() const
-{
-  return jumpKey;
-}
-
-void ControllableComponent::setJumpKey(int k)
-{
-  jumpKey = k;
-}
-
-int ControllableComponent::getDropKey() const
-{
-  return dropKey;
-}
-
-void ControllableComponent::setDropKey(int k)
-{
-  dropKey = k;
-}
-
-bool ControllableComponent::isFrozen() const
-{
-  return frozen;
-}
-
-void ControllableComponent::setFrozen(bool f)
-{
-  frozen = f;
-}
-
-bool ControllableComponent::isHoldingLeft() const
-{
-  return holdingLeft;
-}
-
-void ControllableComponent::setHoldingLeft(bool f)
-{
-  holdingLeft = f;
-}
-
-bool ControllableComponent::isHoldingRight() const
-{
-  return holdingRight;
-}
-
-void ControllableComponent::setHoldingRight(bool f)
-{
-  holdingRight = f;
-}
@@ -5,32 +5,88 @@
 #include "renderer.h"
 
 class ControllableComponent : public Component {
-  public:
-    int getLeftKey() const;
-    void setLeftKey(int k);
-    int getRightKey() const;
-    void setRightKey(int k);
-    int getJumpKey() const;
-    void setJumpKey(int k);
-    int getDropKey() const;
-    void setDropKey(int k);
-
-    bool isFrozen() const;
-    void setFrozen(bool f);
-    bool isHoldingLeft() const;
-    void setHoldingLeft(bool f);
-    bool isHoldingRight() const;
-    void setHoldingRight(bool f);
-
-  private:
-    int leftKey = GLFW_KEY_LEFT;
-    int rightKey = GLFW_KEY_RIGHT;
-    int jumpKey = GLFW_KEY_UP;
-    int dropKey = GLFW_KEY_DOWN;
-
-    bool frozen = false;
-    bool holdingLeft = false;
-    bool holdingRight = false;
+public:
+
+  inline int getLeftKey() const
+  {
+    return leftKey_;
+  }
+
+  inline void setLeftKey(int k)
+  {
+    leftKey_ = k;
+  }
+
+  inline int getRightKey() const
+  {
+    return rightKey_;
+  }
+
+  inline void setRightKey(int k)
+  {
+    rightKey_ = k;
+  }
+
+  inline int getJumpKey() const
+  {
+    return jumpKey_;
+  }
+
+  inline void setJumpKey(int k)
+  {
+    jumpKey_ = k;
+  }
+
+  inline int getDropKey() const
+  {
+    return dropKey_;
+  }
+
+  inline void setDropKey(int k)
+  {
+    dropKey_ = k;
+  }
+
+  inline bool isFrozen() const
+  {
+    return frozen_;
+  }
+
+  inline void setFrozen(bool f)
+  {
+    frozen_ = f;
+  }
+
+  inline bool isHoldingLeft() const
+  {
+    return holdingLeft_;
+  }
+
+  inline void setHoldingLeft(bool f)
+  {
+    holdingLeft_ = f;
+  }
+
+  inline bool isHoldingRight() const
+  {
+    return holdingRight_;
+  }
+
+  inline void setHoldingRight(bool f)
+  {
+    holdingRight_ = f;
+  }
+
+private:
+
+  int leftKey_ = GLFW_KEY_LEFT;
+  int rightKey_ = GLFW_KEY_RIGHT;
+  int jumpKey_ = GLFW_KEY_UP;
+  int dropKey_ = GLFW_KEY_DOWN;
+
+  bool frozen_ = false;
+  bool holdingLeft_ = false;
+  bool holdingRight_ = false;
 };
 
 #endif /* end of include guard: CONTROLLABLE_H_4E0B85B4 */
@@ -1,11 +0,0 @@
-#include "droppable.h"
-
-void DroppableComponent::setDroppable(bool can)
-{
-  droppable = can;
-}
-
-bool DroppableComponent::isDroppable() const
-{
-  return droppable;
-}
@@ -4,12 +4,21 @@
 #include "component.h"
 
 class DroppableComponent : public Component {
-  public:
-    void setDroppable(bool can);
-    bool isDroppable() const;
+public:
 
-  private:
-    bool droppable = false;
+  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 */
@@ -1,41 +0,0 @@
-#include "ponderable.h"
-
-double PonderableComponent::getVelocityX() const
-{
-  return velocityX;
-}
-
-void PonderableComponent::setVelocityX(double v)
-{
-  velocityX = v;
-}
-
-double PonderableComponent::getVelocityY() const
-{
-  return velocityY;
-}
-
-void PonderableComponent::setVelocityY(double v)
-{
-  velocityY = v;
-}
-
-double PonderableComponent::getAccelX() const
-{
-  return accelX;
-}
-
-void PonderableComponent::setAccelX(double v)
-{
-  accelX = v;
-}
-
-double PonderableComponent::getAccelY() const
-{
-  return accelY;
-}
-
-void PonderableComponent::setAccelY(double v)
-{
-  accelY = v;
-}
@@ -4,21 +4,59 @@
 #include "component.h"
 
 class PonderableComponent : public Component {
-  public:
-    double getVelocityX() const;
-    void setVelocityX(double v);
-    double getVelocityY() const;
-    void setVelocityY(double v);
-    double getAccelX() const;
-    void setAccelX(double v);
-    double getAccelY() const;
-    void setAccelY(double v);
-
-  private:
-    double velocityX = 0.0;
-    double velocityY = 0.0;
-    double accelX = 0.0;
-    double accelY = 0.0;
+public:
+
+  inline double getVelocityX() const
+  {
+    return velX_;
+  }
+
+  inline void setVelocityX(double v)
+  {
+    velX_ = v;
+  }
+
+  inline double getVelocityY() const
+  {
+    return velY_;
+  }
+
+  inline void setVelocityY(double v)
+  {
+    velY_ = v;
+  }
+
+  inline double getAccelX() const
+  {
+    return accelX_;
+  }
+
+  inline void setAccelX(double v)
+  {
+    accelX_ = v;
+  }
+
+  inline double getAccelY() const
+  {
+    return accelY_;
+  }
+
+  inline void setAccelY(double v)
+  {
+    accelY_ = v;
+  }
+
+  inline state getState() const
+  {
+    return state_;
+  }
+
+private:
+
+  double velX_ = 0.0;
+  double velY_ = 0.0;
+  double accelX_ = 0.0;
+  double accelY_ = 0.0;
 };
 
 #endif /* end of include guard: TANGIBLE_H_746DB3EE */
@@ -1,47 +0,0 @@
-#include "transformable.h"
-
-TransformableComponent::TransformableComponent(double x, double y, int w, int h)
-  : x(x), y(y), w(w), h(h)
-{
-
-}
-
-double TransformableComponent::getX() const
-{
-  return x;
-}
-
-double TransformableComponent::getY() const
-{
-  return y;
-}
-
-int TransformableComponent::getW() const
-{
-  return w;
-}
-
-int TransformableComponent::getH() const
-{
-  return h;
-}
-
-void TransformableComponent::setX(double v)
-{
-  x = v;
-}
-
-void TransformableComponent::setY(double v)
-{
-  y = v;
-}
-
-void TransformableComponent::setW(int v)
-{
-  w = v;
-}
-
-void TransformableComponent::setH(int v)
-{
-  h = v;
-}
@@ -4,24 +4,66 @@
 #include "component.h"
 
 class TransformableComponent : public Component {
-  public:
-    TransformableComponent(double x, double y, int w, int h);
-
-    double getX() const;
-    double getY() const;
-    int getW() const;
-    int getH() const;
-
-    void setX(double v);
-    void setY(double v);
-    void setW(int v);
-    void setH(int v);
-
-  private:
-    double x;
-    double y;
-    int w;
-    int h;
+public:
+
+  TransformableComponent(
+    double x,
+    double y,
+    int w,
+    int h) :
+      x_(x),
+      y_(y),
+      w_(w),
+      h_(h)
+  {
+  }
+
+  inline double getX() const
+  {
+    return x_;
+  }
+
+  inline void setX(double v)
+  {
+    x_ = v;
+  }
+
+  inline double getY() const
+  {
+    return y_;
+  }
+
+  inline void setY(double v)
+  {
+    y_ = v;
+  }
+
+  inline int getW() const
+  {
+    return w_;
+  }
+
+  inline void setW(int v)
+  {
+    w_ = v;
+  }
+
+  inline int getH() const
+  {
+    return h_;
+  }
+
+  inline void setH(int v)
+  {
+    h_ = v;
+  }
+
+private:
+
+  double x_;
+  double y_;
+  int w_;
+  int h_;
 };
 
 #endif /* end of include guard: LOCATABLE_H_39E526CA */