Added input system

1 files changed, 12 insertions, 31 deletions

@@ -9,15 +9,15 @@
 #include "camera_system.h"
 #include "animation_system.h"
 #include "character_system.h"
+#include "input_system.h"
 
-void loop(Renderer& renderer, Mixer& mixer) {
+void loop(Renderer& renderer) {
   Game game;
   game.emplaceSystem<TransformSystem>();
-  game.emplaceSystem<CameraSystem>();
-  game.emplaceSystem<AnimationSystem>();
+  game.emplaceSystem<InputSystem>();
   game.emplaceSystem<CharacterSystem>();
-
-  Input keystate;
+  game.emplaceSystem<AnimationSystem>();
+  game.emplaceSystem<CameraSystem>();
 
   auto map = std::make_unique<Map>("../res/map1.tmx", renderer);
   game.setMap(std::move(map));
@@ -25,6 +25,8 @@ void loop(Renderer& renderer, Mixer& mixer) {
   int lucasSprite = game.emplaceSprite();
   game.getSystem<TransformSystem>().initSprite(lucasSprite, {32, 32});
   game.getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/lucas_anim.txt", renderer);
+  game.getSprite(lucasSprite).controllable = true;
+  game.getSystem<CharacterSystem>().initSprite(lucasSprite);
 
   int kumaSprite = game.emplaceSprite();
   game.getSystem<TransformSystem>().initSprite(kumaSprite, {32, 32});
@@ -46,8 +48,6 @@ void loop(Renderer& renderer, Mixer& mixer) {
 
   renderer.render(game);
 
-  Timer inputTimer(33);
-
   size_t lastTime = SDL_GetTicks();
 
   for (;;) {
@@ -55,33 +55,15 @@ void loop(Renderer& renderer, Mixer& mixer) {
     size_t frameTime = currentTime - lastTime;
     lastTime = currentTime;
 
-    SDL_Event e;
-    while (SDL_PollEvent(&e)) {
-      if (e.type == SDL_QUIT || (e.type == SDL_KEYDOWN && e.key.keysym.sym == SDLK_ESCAPE)) {
-        return;
-      } else if (e.type == SDL_KEYDOWN && (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT)) {
-        game.getSystem<CharacterSystem>().beginCrouch(lucasSprite);
-      } else if (e.type == SDL_KEYUP && (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT)) {
-        game.getSystem<CharacterSystem>().endCrouch(lucasSprite);
-      }
-    }
-
-    const Uint8* state = SDL_GetKeyboardState(NULL);
-    keystate.left = state[SDL_SCANCODE_LEFT];
-    keystate.right = state[SDL_SCANCODE_RIGHT];
-    keystate.up = state[SDL_SCANCODE_UP];
-    keystate.down = state[SDL_SCANCODE_DOWN];
-
-    inputTimer.accumulate(frameTime);
-    while (inputTimer.step()) {
-      game.getSystem<CharacterSystem>().moveSprite(lucasSprite, mixer, keystate);
-    }
-
     for (System& system : game.systems()) {
       system.tick(frameTime);
     }
 
     renderer.render(game);
+
+    if (game.shouldQuit()) {
+      return;
+    }
   }
 }
 
@@ -89,9 +71,8 @@ int main(int, char**) {
   try
   {
     Renderer renderer;
-    Mixer mixer;
 
-    loop(renderer, mixer);
+    loop(renderer);
   } catch (const sdl_error& ex)
   {
     std::cout << "SDL error (" << ex.what() << ")" << std::endl;