4 files changed, 90 insertions, 49 deletions

@@ -1,27 +0,0 @@
-#include "animatable.h"
-
-AnimatableComponent::AnimatableComponent(const char* filename, int frame_width, int frame_height, int frames_across)
-  : texture(filename), frame_width(frame_width), frame_height(frame_height), frames_across(frames_across)
-{
-  
-}
-
-int AnimatableComponent::getFrame() const
-{
-  return frame;
-}
-
-void AnimatableComponent::setFrame(int frame)
-{
-  this->frame = frame;
-}
-
-const Texture& AnimatableComponent::getTexture() const
-{
-  return texture;
-}
-
-Rectangle AnimatableComponent::getFrameRect() const
-{
-  return {frame_width * (frame % frames_across), frame_height * (frame / frames_across), frame_width, frame_height};
-}
@@ -2,30 +2,61 @@
 #define SPRITE_RENDERABLE_H_D3AACBBF
 
 #include "component.h"
-#include "renderer.h"
-#include "direction.h"
+#include "animation.h"
+#include <string>
 
 class AnimatableComponent : public Component {
-  public:
-    AnimatableComponent(const char* filename, int frame_width, int frame_height, int frames_across);
-    
-    int getFrame() const;
-    void setFrame(int frame);
-    
-    const Texture& getTexture() const;
-    Rectangle getFrameRect() const;
-    
-    void setDirection(Direction dir) {};
-    void setWalking(bool w) {};
-    void setJumping(bool w) {};
-    void setCrouching(bool w) {};
-    
-  private:
-    Texture texture;
-    int frame_width;
-    int frame_height;
-    int frames_across;
-    int frame = 0;
+public:
+
+  AnimatableComponent(
+    AnimationSet animationSet,
+    std::string animation) :
+      animationSet_(std::move(animationSet)),
+      animation_(std::move(animation))
+  {
+  }
+
+  inline size_t getFrame() const
+  {
+    return frame_;
+  }
+
+  inline void setFrame(size_t v)
+  {
+    frame_ = v;
+  }
+
+  inline size_t getCountdown() const
+  {
+    return countdown_;
+  }
+
+  inline void setCountdown(size_t v)
+  {
+    countdown_ = v;
+  }
+
+  inline const AnimationSet& getAnimationSet() const
+  {
+    return animationSet_;
+  }
+
+  inline const Animation& getAnimation() const
+  {
+    return animationSet_.getAnimation(animation_);
+  }
+
+  inline void setAnimation(std::string animation)
+  {
+    animation_ = std::move(animation);
+  }
+
+private:
+
+  AnimationSet animationSet_;
+  std::string animation_;
+  size_t frame_ = 0;
+  size_t countdown_ = 0;
 };
 
 #endif /* end of include guard: SPRITE_RENDERABLE_H_D3AACBBF */
@@ -0,0 +1,24 @@
+#ifndef ORIENTABLE_H_EDB6C4A1
+#define ORIENTABLE_H_EDB6C4A1
+
+#include "component.h"
+
+class OrientableComponent : public Component {
+public:
+
+  inline bool isFacingRight() const
+  {
+    return facingRight_;
+  }
+
+  inline void setFacingRight(bool v)
+  {
+    facingRight_ = v;
+  }
+
+private:
+
+  bool facingRight_ = false;
+};
+
+#endif /* end of include guard: ORIENTABLE_H_EDB6C4A1 */
@@ -6,6 +6,13 @@
 class PonderableComponent : public Component {
 public:
 
+  enum class state {
+    grounded,
+    jumping,
+    falling,
+    dropping
+  };
+
   inline double getVelocityX() const
   {
     return velX_;
@@ -51,12 +58,18 @@ public:
     return state_;
   }
 
+  inline void setState(state arg)
+  {
+    state_ = arg;
+  }
+
 private:
 
   double velX_ = 0.0;
   double velY_ = 0.0;
   double accelX_ = 0.0;
   double accelY_ = 0.0;
+  state state_ = state::grounded;
 };
 
 #endif /* end of include guard: TANGIBLE_H_746DB3EE */