diff --git a/assets/textures/actors/kaijuturtle.json b/assets/textures/actors/kaijuturtle.json index 243fc86..ca6b372 100644 --- a/assets/textures/actors/kaijuturtle.json +++ b/assets/textures/actors/kaijuturtle.json @@ -1,6 +1,6 @@ { "frames": [ { - "filename": "Kaiju-Turtle 0.aseprite", + "filename": "0", "frame": { "x": 0, "y": 0, "w": 32, "h": 32 }, "rotated": false, "trimmed": false, @@ -9,7 +9,7 @@ "duration": 100 }, { - "filename": "Kaiju-Turtle 1.aseprite", + "filename": "1", "frame": { "x": 32, "y": 0, "w": 32, "h": 32 }, "rotated": false, "trimmed": false, @@ -18,7 +18,7 @@ "duration": 100 }, { - "filename": "Kaiju-Turtle 2.aseprite", + "filename": "2", "frame": { "x": 64, "y": 0, "w": 32, "h": 32 }, "rotated": false, "trimmed": false, @@ -27,7 +27,7 @@ "duration": 100 }, { - "filename": "Kaiju-Turtle 3.aseprite", + "filename": "3", "frame": { "x": 0, "y": 32, "w": 32, "h": 32 }, "rotated": false, "trimmed": false, @@ -36,7 +36,7 @@ "duration": 100 }, { - "filename": "Kaiju-Turtle 4.aseprite", + "filename": "4", "frame": { "x": 32, "y": 32, "w": 32, "h": 32 }, "rotated": false, "trimmed": false, diff --git a/src/ecs/KeyboardController.h b/src/ecs/KeyboardController.h index e82a6e6..db7b6a4 100644 --- a/src/ecs/KeyboardController.h +++ b/src/ecs/KeyboardController.h @@ -42,25 +42,25 @@ public: { switch (Game::event.key.keysym.sym) { - case SDLK_UP: + case SDLK_w: if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ // if(transform->position.y>0){ // ====== Get Player.yTile and scan column up ScreenTilesHeight/2 on Player.xTile-1, Player.xTile, and Player.xTile+1 return first hit that is > 0 for each row. // transform->tilePos.x transform->velocity.y = -1; // if(Game::playerIsGrounded){ - sprite->Play("Walk"); + sprite->Play("move-n"); // } sprite->spriteFlip = SDL_FLIP_NONE; // } } break; - case SDLK_DOWN: + case SDLK_s: if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ if(transform->position.yvelocity.y = 1; // if(Game::playerIsGrounded){ - sprite->Play("Walk"); + sprite->Play("move-s"); // } int *borders; borders = Game::predictCollisions(); @@ -68,12 +68,12 @@ public: } } break; - case SDLK_LEFT: + case SDLK_a: if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ if(transform->position.x>Game::levelMap.x){ transform->velocity.x = -1; // if(Game::playerIsGrounded){ - sprite->Play("Walk"); + sprite->Play("move-w"); // } sprite->spriteFlip = SDL_FLIP_NONE; } @@ -112,7 +112,7 @@ public: }*/ } break; - case SDLK_RIGHT: + case SDLK_d: if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ // &entity->getComponent().setLastSafePos(Vector2D(transform->position.x,transform->position.y)); // playerCtrl->lastSafePosition.x = transform->position.x; @@ -124,7 +124,7 @@ public: if(transform->position.xvelocity.x = 1; // if(Game::playerIsGrounded){ - sprite->Play("Walk"); + sprite->Play("move-w"); // } sprite->spriteFlip = SDL_FLIP_HORIZONTAL; } @@ -167,7 +167,7 @@ public: } // transform->lastSafePos = Vector2D(transform->position.x,transform->position.y); Game::gravityOnPlayer = true; - sprite->Play("Jump"); + // sprite->Play("Jump"); transform->velocity.y = -2; } } @@ -189,10 +189,10 @@ public: { switch (Game::event.key.keysym.sym) { - case SDLK_LEFT: + case SDLK_a: if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ transform->velocity.x = 0; - sprite->Play("Idle"); + sprite->Play("move-w"); Game::playerIsGrounded = false; // if (!Game::gravityOnPlayer){ // Game::gravityOnPlayer = true; @@ -200,29 +200,29 @@ public: // } } break; - case SDLK_RIGHT: + case SDLK_d: if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ transform->velocity.x = 0; - sprite->Play("Idle"); + sprite->Play("move-w"); // if (!Game::gravityOnPlayer){ // Game::gravityOnPlayer = true; // } } break; - case SDLK_UP: + case SDLK_w: if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ transform->velocity.y = 0; - sprite->Play("Idle"); + sprite->Play("move-n"); // if (!Game::gravityOnPlayer){ // Game::gravityOnPlayer = true; // // sprite->Play("Fall"); // } } break; - case SDLK_DOWN: + case SDLK_s: if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ transform->velocity.y = 0; - sprite->Play("Idle"); + sprite->Play("move-s"); // if (!Game::gravityOnPlayer){ // Game::gravityOnPlayer = true; // } @@ -249,13 +249,13 @@ public: // break; case SDLK_k: break; - case SDLK_j: - if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ - transform->velocity.y = 0; - sprite->Play("Fall"); - Game::gravityOnPlayer = true; - } - break; + // case SDLK_j: + // if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ + // transform->velocity.y = 0; + // sprite->Play("Fall"); + // Game::gravityOnPlayer = true; + // } + // break; case SDLK_u: break; case SDLK_i: diff --git a/src/ecs/SpriteComponent.h b/src/ecs/SpriteComponent.h index d1a3713..2390a0d 100644 --- a/src/ecs/SpriteComponent.h +++ b/src/ecs/SpriteComponent.h @@ -27,10 +27,10 @@ private: TransformComponent *transform; SDL_Texture *texture; SDL_Rect srcRect, destRect; - char letter; + int frames = 0; int speed = 100; - int letterWidth, letterHeight; + int scale = 1; public: @@ -99,15 +99,15 @@ public: Play(name); } - Animation idle = Animation(0,3,100); - animations.emplace("Idle", idle); - Animation walk = Animation(1,3,100); - animations.emplace("Walk", walk); - Animation jump = Animation(2,1,100); - animations.emplace("Jump", jump); - Animation fall = Animation(3,1,100); - animations.emplace("Fall",fall); - Play("Idle"); + Animation moveN = Animation(0,1,100); + animations.emplace("move-n", moveN); + Animation moveW = Animation(2,1,100); + animations.emplace("move-w", moveW); + Animation moveS = Animation(5,1,100); + animations.emplace("move-s", moveS); + //Animation fall = Animation(3,1,100); + //animations.emplace("Fall",fall); + Play("move-n"); } setTex(id); } diff --git a/src/game/Game.cpp b/src/game/Game.cpp index 686ed59..083ccbf 100644 --- a/src/game/Game.cpp +++ b/src/game/Game.cpp @@ -220,8 +220,8 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g //ecs implementation // player.addComponent(860*globalScale,640*globalScale,22,42,globalScale); - player.addComponent(150*gScale,100*gScale,22,42,globalScale,3); // 180,120 - player.addComponent("player", SpriteComponent::spriteAnimation, "assets/textures/actors/firefighter.json"); + player.addComponent(150*gScale,100*gScale,32,32,globalScale,3); // 180,120 + player.addComponent("player", SpriteComponent::spriteAnimation, "assets/textures/actors/kaijuturtle.json"); // player.addComponent(0.0,0.0,false,false,Vector2D().Zero()); player.addComponent("player",16*globalScale,32*globalScale, true, 2*globalScale,10*globalScale, "collider");