Turtle shell interactions

feresr · May 18, 2020 · ed3cb8b · ed3cb8b
1 parent 3e6bf3c
commit ed3cb8b
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 34 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,21 @@ find_package(SDL2_image REQUIRED)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin")
 
-add_executable(smb src/Main.cpp src/Game.cpp src/ecs/ecs.cpp src/systems/RenderSystem.cpp src/systems/MapSystem.cpp src/systems/EditorSystem.cpp src/TextureManager.cpp src/systems/PhysicsSystem.cpp src/systems/AnimationSystem.cpp src/systems/PlayerSystem.cpp src/systems/TileSystem.cpp src/systems/CallbackSystem.cpp src/systems/EnemySystem.cpp)
+add_executable(smb
+        src/Main.cpp
+        src/Game.cpp
+        src/ecs/ecs.cpp
+        src/systems/RenderSystem.cpp
+        src/systems/MapSystem.cpp
+        src/systems/EditorSystem.cpp
+        src/TextureManager.cpp
+        src/systems/PhysicsSystem.cpp
+        src/systems/AnimationSystem.cpp
+        src/systems/PlayerSystem.cpp
+        src/systems/TileSystem.cpp
+        src/systems/CallbackSystem.cpp
+        src/systems/EnemySystem.cpp
+        src/AABB.cpp)
 
 set_property(TARGET smb PROPERTY CXX_STANDARD 17)
 set_target_properties(smb PROPERTIES OUTPUT_NAME smb-${CMAKE_BUILD_TYPE})

diff --git a/include/AABB.h b/include/AABB.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include "Components.h"
+
+bool AABBCollision(
+        TransformComponent* a,
+        TransformComponent* b
+);
diff --git a/include/Constants.h b/include/Constants.h
@@ -30,4 +30,4 @@ constexpr float MARIO_BOUNCE = 4.0f; // when jumping on top of enemies
 constexpr int TILE_ROUNDNESS = 4;
 
 constexpr float MUSHROOM_GROW_SPEED = .25f;
-constexpr float MUSHROOM_MOVE_SPEED = 1.0f;
+constexpr float MUSHROOM_MOVE_SPEED = 0.8f;
diff --git a/include/systems/EnemySystem.h b/include/systems/EnemySystem.h
@@ -2,6 +2,7 @@
 
 #include "ecs/ecs.h"
 #include <Components.h>
+#include "AABB.h"
 
 class EnemySystem : public System {
 

diff --git a/include/systems/PlayerSystem.h b/include/systems/PlayerSystem.h
@@ -4,6 +4,7 @@
 #include "Components.h"
 #include "Constants.h"
 #include "TextureManager.h"
+#include "AABB.h"
 
 class PlayerSystem : public System {
 

diff --git a/src/AABB.cpp b/src/AABB.cpp
@@ -0,0 +1,12 @@
+#include "AABB.h"
+
+
+bool AABBCollision(
+        TransformComponent* a,
+        TransformComponent* b
+) {
+    return a->x <= b->x + b->w &&
+           a->x + a->w >= b->x &&
+           a->y <= b->y + b->h &&
+           a->y + a->h >= b->y;
+}
diff --git a/src/systems/EnemySystem.cpp b/src/systems/EnemySystem.cpp
@@ -4,7 +4,37 @@ void EnemySystem::onAddedToWorld(World* world) {
     System::onAddedToWorld(world);
 }
 
+void turtleShellInteractions(World* world, Entity* shell) {
+    if (shell->hasAny<LeftCollisionComponent, RightCollisionComponent>()) {
+        for (auto other : world->find<EnemyComponent, KineticComponent>()) {
+            if (shell == other) continue;
+            if (AABBCollision(shell->get<TransformComponent>(), other->get<TransformComponent>())) {
+                other->remove<SolidComponent>();
+                other->assign<TileComponent>();
+                other->get<TextureComponent>()->flipV = true;
+                other->get<KineticComponent>()->speedY = -8;
+                shell->remove<LeftCollisionComponent>();
+                shell->remove<RightCollisionComponent>();
+            }
+        }
+
+        if (shell->has<LeftCollisionComponent>()) {
+            shell->get<KineticComponent>()->accX = 3.0f;
+            shell->get<KineticComponent>()->speedX = 3.0f;
+        }
+        if (shell->has<RightCollisionComponent>()) {
+            shell->get<KineticComponent>()->accX = -3.0f;
+            shell->get<KineticComponent>()->speedX = -3.0f;
+        }
+    }
+}
+
 void EnemySystem::tick(World* world) {
+    for (auto shell : world->find<EnemyComponent, KineticComponent>()) {
+        if (shell->get<EnemyComponent>()->type == Enemy::Type::TURTLE_SHELL) {
+            turtleShellInteractions(world, shell);
+        }
+    }
 
     for (auto enemy : world->find<EnemyComponent, TransformComponent, CrushedComponent>()) {
         auto enemyTransform = enemy->get<TransformComponent>();
@@ -58,20 +88,6 @@ void EnemySystem::tick(World* world) {
         }
     }
 
-
-    for (auto shell : world->find<EnemyComponent, KineticComponent>()) {
-        if (shell->get<EnemyComponent>()->type == Enemy::Type::TURTLE_SHELL) {
-            if (shell->has<LeftCollisionComponent>()) {
-                shell->get<KineticComponent>()->accX = 3.0f;
-                shell->get<KineticComponent>()->speedX = 3.0f;
-            }
-            if (shell->has<RightCollisionComponent>()) {
-                shell->get<KineticComponent>()->accX = -3.0f;
-                shell->get<KineticComponent>()->speedX = -3.0f;
-            }
-        }
-    }
-
     //WALKABLE
     auto entities = world->find<WalkComponent, LeftCollisionComponent>();
     for (auto entity : entities) {

diff --git a/src/systems/PhysicsSystem.cpp b/src/systems/PhysicsSystem.cpp
@@ -27,8 +27,7 @@ Direction checkCollisionY(Entity* solid, TransformComponent* transform, KineticC
             if (distanceTop < distanceBottom) {
                 transform->setBottom(solidTransform->top());
                 solid->assign<TopCollisionComponent>();
-                kinetic->accY = std::min(0.0f, kinetic->accY);
-                kinetic->speedY = std::min(0.0f, kinetic->speedY);
+
                 direction = Direction::BOTTOM;
             }
         }
@@ -45,8 +44,7 @@ Direction checkCollisionY(Entity* solid, TransformComponent* transform, KineticC
             if (distanceTop > distanceBottom) {
                 transform->setTop(solidTransform->bottom());
                 solid->assign<BottomCollisionComponent>();
-                kinetic->accY = std::max(0.0f, kinetic->accY);
-                kinetic->speedY = std::max(0.0f, kinetic->speedY);
+
                 direction = Direction::TOP;
             }
         }
@@ -76,8 +74,7 @@ Direction checkCollisionX(Entity* solid, TransformComponent* transform, KineticC
                 //item about to get inside the block
                 transform->setLeft(solidTransform->right());
             }
-            kinetic->accX = std::max(0.0f, kinetic->accX);
-            kinetic->speedX = std::max(0.0f, kinetic->speedX);
+
             solid->assign<RightCollisionComponent>();
             direction = Direction::LEFT;
         } else {
@@ -87,8 +84,7 @@ Direction checkCollisionX(Entity* solid, TransformComponent* transform, KineticC
             } else {
                 transform->setRight(solidTransform->left());
             }
-            kinetic->accX = std::min(0.0f, kinetic->accX);
-            kinetic->speedX = std::min(0.0f, kinetic->speedX);
+
             solid->assign<LeftCollisionComponent>();
             direction = Direction::RIGHT;
         }
@@ -158,9 +154,13 @@ void PhysicsSystem::tick(World* world) {
                 if (!(tile->get<SolidComponent>())) continue;
                 switch (checkCollisionY(tile, transform, kinetic)) {
                     case Direction::TOP:
+                        kinetic->accY = std::max(0.0f, kinetic->accY);
+                        kinetic->speedY = std::max(0.0f, kinetic->speedY);
                         entity->assign<TopCollisionComponent>();
                         break;
                     case Direction::BOTTOM:
+                        kinetic->accY = std::min(0.0f, kinetic->accY);
+                        kinetic->speedY = std::min(0.0f, kinetic->speedY);
                         entity->assign<BottomCollisionComponent>();
                         break;
                     default:
@@ -172,9 +172,13 @@ void PhysicsSystem::tick(World* world) {
                 if (!(tile->get<SolidComponent>())) continue;
                 switch (checkCollisionX(tile, transform, kinetic)) {
                     case Direction::LEFT:
+                        kinetic->accX = std::max(0.0f, kinetic->accX);
+                        kinetic->speedX = std::max(0.0f, kinetic->speedX);
                         entity->assign<LeftCollisionComponent>();
                         break;
                     case Direction::RIGHT:
+                        kinetic->accX = std::min(0.0f, kinetic->accX);
+                        kinetic->speedX = std::min(0.0f, kinetic->speedX);
                         entity->assign<RightCollisionComponent>();
                         break;
                     default:

diff --git a/src/systems/PlayerSystem.cpp b/src/systems/PlayerSystem.cpp
@@ -12,16 +12,6 @@ const int SUPER_MARIO_COLLIDER_HEIGHT = (TILE_SIZE * 2) - 4;
 
 constexpr int RUNNING_ANIMATION_SPEED = 5;
 
-bool AABBCollision(
-        TransformComponent* a,
-        TransformComponent* b
-) {
-    return a->x <= b->x + b->w &&
-           a->x + a->w >= b->x &&
-           a->y <= b->y + b->h &&
-           a->y + a->h >= b->y;
-}
-
 void createDebris(World* world, TransformComponent* brickTransform) {
     auto debris1 = world->create();
     debris1->assign<GravityComponent>();