1 files changed, 13 insertions, 116 deletions

@@ -1,14 +1,8 @@
 #include "controlling.h"
 #include "game.h"
 #include "components/controllable.h"
-#include "components/ponderable.h"
-#include "components/animatable.h"
-#include "components/droppable.h"
 #include "components/orientable.h"
-#include "systems/animating.h"
-#include "direction.h"
-#include "muxer.h"
-#include "consts.h"
+#include "systems/orienting.h"
 
 void ControllingSystem::tick(double)
 {
@@ -19,9 +13,6 @@ void ControllingSystem::tick(double)
 
     auto entities = game_.getEntityManager().getEntitiesWithComponents<
       ControllableComponent,
-      PonderableComponent,
-      AnimatableComponent,
-      DroppableComponent,
       OrientableComponent>();
 
     for (auto entity : entities)
@@ -29,6 +20,8 @@ void ControllingSystem::tick(double)
       auto& controllable = game_.getEntityManager().
         getComponent<ControllableComponent>(entity);
 
+      auto& orienting = game_.getSystemManager().getSystem<OrientingSystem>();
+
       if (action == GLFW_PRESS)
       {
         if (key == controllable.getLeftKey())
@@ -37,7 +30,7 @@ void ControllingSystem::tick(double)
 
           if (!controllable.isFrozen())
           {
-            walkLeft(entity);
+            orienting.moveLeft(entity);
           }
         } else if (key == controllable.getRightKey())
         {
@@ -45,19 +38,19 @@ void ControllingSystem::tick(double)
 
           if (!controllable.isFrozen())
           {
-            walkRight(entity);
+            orienting.moveRight(entity);
           }
         } else if (key == controllable.getJumpKey())
         {
           if (!controllable.isFrozen())
           {
-            jump(entity);
+            orienting.jump(entity);
           }
         } else if (key == controllable.getDropKey())
         {
           if (!controllable.isFrozen())
           {
-            drop(entity, true);
+            orienting.drop(entity);
           }
         }
       } else if (action == GLFW_RELEASE)
@@ -70,9 +63,9 @@ void ControllingSystem::tick(double)
           {
             if (controllable.isHoldingRight())
             {
-              walkRight(entity);
+              orienting.moveRight(entity);
             } else {
-              stopWalking(entity);
+              orienting.stopWalking(entity);
             }
           }
         } else if (key == controllable.getRightKey())
@@ -83,22 +76,22 @@ void ControllingSystem::tick(double)
           {
             if (controllable.isHoldingLeft())
             {
-              walkLeft(entity);
+              orienting.moveLeft(entity);
             } else {
-              stopWalking(entity);
+              orienting.stopWalking(entity);
             }
           }
         } else if (key == controllable.getDropKey())
         {
           if (!controllable.isFrozen())
           {
-            drop(entity, false);
+            orienting.stopDropping(entity);
           }
         } else if (key == controllable.getJumpKey())
         {
           if (!controllable.isFrozen())
           {
-            stopJumping(entity);
+            orienting.stopJumping(entity);
           }
         }
       }
@@ -112,99 +105,3 @@ void ControllingSystem::input(int key, int action)
 {
   actions_.push(std::make_pair(key, action));
 }
-
-void ControllingSystem::walkLeft(id_type entity)
-{
-  auto& ponderable = game_.getEntityManager().getComponent<PonderableComponent>(entity);
-  auto& orientable = game_.getEntityManager().getComponent<OrientableComponent>(entity);
-
-  orientable.setFacingRight(false);
-  ponderable.setVelocityX(-90);
-
-  auto& animating = game_.getSystemManager().getSystem<AnimatingSystem>();
-
-  if (ponderable.getState() == PonderableComponent::State::grounded)
-  {
-    animating.startAnimation(entity, "walkingLeft");
-  } else {
-    animating.startAnimation(entity, "stillLeft");
-  }
-}
-
-void ControllingSystem::walkRight(id_type entity)
-{
-  auto& ponderable = game_.getEntityManager().getComponent<PonderableComponent>(entity);
-  auto& orientable = game_.getEntityManager().getComponent<OrientableComponent>(entity);
-
-  orientable.setFacingRight(true);
-  ponderable.setVelocityX(90);
-
-  auto& animating = game_.getSystemManager().getSystem<AnimatingSystem>();
-
-  if (ponderable.getState() == PonderableComponent::State::grounded)
-  {
-    animating.startAnimation(entity, "walkingRight");
-  } else {
-    animating.startAnimation(entity, "stillRight");
-  }
-}
-
-void ControllingSystem::stopWalking(id_type entity)
-{
-  auto& ponderable = game_.getEntityManager().getComponent<PonderableComponent>(entity);
-  auto& orientable = game_.getEntityManager().getComponent<OrientableComponent>(entity);
-
-  ponderable.setVelocityX(0);
-
-  if (ponderable.getState() == PonderableComponent::State::grounded)
-  {
-    auto& animating = game_.getSystemManager().getSystem<AnimatingSystem>();
-
-    if (orientable.isFacingRight())
-    {
-      animating.startAnimation(entity, "stillRight");
-    } else {
-      animating.startAnimation(entity, "stillLeft");
-    }
-  }
-}
-
-void ControllingSystem::jump(id_type entity)
-{
-  auto& ponderable = game_.getEntityManager().getComponent<PonderableComponent>(entity);
-
-  if (ponderable.getState() == PonderableComponent::State::grounded)
-  {
-    playSound("res/Randomize87.wav", 0.25);
-
-    ponderable.setVelocityY(JUMP_VELOCITY(TILE_HEIGHT*4.5, 0.3));
-    ponderable.setAccelY(JUMP_GRAVITY(TILE_HEIGHT*4.5, 0.3));
-    ponderable.setState(PonderableComponent::State::jumping);
-  }
-}
-
-void ControllingSystem::stopJumping(id_type entity)
-{
-  auto& ponderable = game_.getEntityManager().getComponent<PonderableComponent>(entity);
-
-  if (ponderable.getState() == PonderableComponent::State::jumping)
-  {
-    ponderable.setAccelY(JUMP_GRAVITY(TILE_HEIGHT*3.5, 0.233));
-    ponderable.setState(PonderableComponent::State::falling);
-  }
-}
-
-void ControllingSystem::drop(id_type entity, bool start)
-{
-  auto& droppable = game_.getEntityManager().getComponent<DroppableComponent>(entity);
-  auto& ponderable = game_.getEntityManager().getComponent<PonderableComponent>(entity);
-
-  if (start && (ponderable.getState() == PonderableComponent::State::grounded))
-  {
-    ponderable.setState(PonderableComponent::State::dropping);
-  } else if ((!start) && (ponderable.getState() == PonderableComponent::State::dropping))
-  {
-    ponderable.setState(PonderableComponent::State::grounded);
-  }
-  droppable.setDroppable(start);
-}