From 745729c1935276e6f49d108a0a465214aa93c3cb Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Tue, 4 Aug 2015 18:30:29 +0200 Subject: [PATCH] move RandomWalk into new "ai" module --- src/ai/RandomWalk.cpp | 57 +++++++++++++++++++ src/{app => ai}/RandomWalk.hpp | 0 src/app/Application.hpp | 2 +- src/app/{controller.cpp => FPSController.cpp} | 51 ----------------- 4 files changed, 58 insertions(+), 52 deletions(-) create mode 100644 src/ai/RandomWalk.cpp rename src/{app => ai}/RandomWalk.hpp (100%) rename src/app/{controller.cpp => FPSController.cpp} (51%) diff --git a/src/ai/RandomWalk.cpp b/src/ai/RandomWalk.cpp new file mode 100644 index 0000000..32fc29f --- /dev/null +++ b/src/ai/RandomWalk.cpp @@ -0,0 +1,57 @@ +#include "RandomWalk.hpp" + +#include "../world/Entity.hpp" + + +namespace blank { + +RandomWalk::RandomWalk(Entity &e) noexcept +: entity(e) +, time_left(0) { + +} + + +void RandomWalk::Update(int dt) noexcept { + time_left -= dt; + if (time_left > 0) return; + time_left += 2500 + (rand() % 5000); + + constexpr float move_vel = 0.0005f; + + glm::vec3 new_vel = entity.Velocity(); + + switch (rand() % 9) { + case 0: + new_vel.x = -move_vel; + break; + case 1: + new_vel.x = 0.0f; + break; + case 2: + new_vel.x = move_vel; + break; + case 3: + new_vel.y = -move_vel; + break; + case 4: + new_vel.y = 0.0f; + break; + case 5: + new_vel.y = move_vel; + break; + case 6: + new_vel.z = -move_vel; + break; + case 7: + new_vel.z = 0.0f; + break; + case 8: + new_vel.z = move_vel; + break; + } + + entity.Velocity(new_vel); +} + +} diff --git a/src/app/RandomWalk.hpp b/src/ai/RandomWalk.hpp similarity index 100% rename from src/app/RandomWalk.hpp rename to src/ai/RandomWalk.hpp diff --git a/src/app/Application.hpp b/src/app/Application.hpp index 5909e3b..9644794 100644 --- a/src/app/Application.hpp +++ b/src/app/Application.hpp @@ -3,7 +3,7 @@ #include "Assets.hpp" #include "FrameCounter.hpp" -#include "RandomWalk.hpp" +#include "../ai/RandomWalk.hpp" #include "../audio/Audio.hpp" #include "../graphics/Viewport.hpp" #include "../ui/Interface.hpp" diff --git a/src/app/controller.cpp b/src/app/FPSController.cpp similarity index 51% rename from src/app/controller.cpp rename to src/app/FPSController.cpp index 9cf2d6c..9c7820c 100644 --- a/src/app/controller.cpp +++ b/src/app/FPSController.cpp @@ -1,5 +1,4 @@ #include "FPSController.hpp" -#include "RandomWalk.hpp" #include #include @@ -47,54 +46,4 @@ void FPSController::Update(int dt) noexcept { entity.Velocity(glm::rotateY(velocity, yaw)); } - -RandomWalk::RandomWalk(Entity &e) noexcept -: entity(e) -, time_left(0) { - -} - - -void RandomWalk::Update(int dt) noexcept { - time_left -= dt; - if (time_left > 0) return; - time_left += 2500 + (rand() % 5000); - - constexpr float move_vel = 0.0005f; - - glm::vec3 new_vel = entity.Velocity(); - - switch (rand() % 9) { - case 0: - new_vel.x = -move_vel; - break; - case 1: - new_vel.x = 0.0f; - break; - case 2: - new_vel.x = move_vel; - break; - case 3: - new_vel.y = -move_vel; - break; - case 4: - new_vel.y = 0.0f; - break; - case 5: - new_vel.y = move_vel; - break; - case 6: - new_vel.z = -move_vel; - break; - case 7: - new_vel.z = 0.0f; - break; - case 8: - new_vel.z = move_vel; - break; - } - - entity.Velocity(new_vel); -} - } -- 2.39.2