X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fai%2Fai.cpp;h=8cd4f1411abb1b9b21be99edb5e679a947c1c4e9;hb=cda510e480aba3702e95059163378822ccac8d17;hp=fd03ebb4fec74e0cf3309f41e9ba44bee6546f1c;hpb=e872614d387c4bfc3afb04bcc7cba3d9b8f3954b;p=blank.git diff --git a/src/ai/ai.cpp b/src/ai/ai.cpp index fd03ebb..8cd4f14 100644 --- a/src/ai/ai.cpp +++ b/src/ai/ai.cpp @@ -20,16 +20,20 @@ Chaser::Chaser(World &world, Entity &ctrl, Entity &tgt) noexcept , flee_speed(-0.005f) , stop_dist(10) , flee_dist(5) { - + tgt.Ref(); } Chaser::~Chaser() { - + tgt.UnRef(); } void Chaser::Update(int dt) { glm::vec3 diff(Target().AbsoluteDifference(Controlled())); float dist = length(diff); + if (dist < std::numeric_limits::epsilon()) { + Controlled().Velocity(glm::vec3(0.0f)); + return; + } glm::vec3 norm_diff(diff / dist); bool line_of_sight = true; @@ -53,16 +57,17 @@ void Chaser::Update(int dt) { Controller::Controller(Entity &e) noexcept : entity(e) { - + entity.Ref(); } Controller::~Controller() { - + entity.UnRef(); } -RandomWalk::RandomWalk(Entity &e) noexcept +RandomWalk::RandomWalk(Entity &e, std::uint64_t seed) noexcept : Controller(e) +, random(seed) , time_left(0) { } @@ -74,13 +79,13 @@ RandomWalk::~RandomWalk() { void RandomWalk::Update(int dt) { time_left -= dt; if (time_left > 0) return; - time_left += 2500 + (rand() % 5000); + time_left += 2500 + (random.Next() % 5000); constexpr float move_vel = 0.0005f; glm::vec3 new_vel = Controlled().Velocity(); - switch (rand() % 9) { + switch (random.Next() % 9) { case 0: new_vel.x = -move_vel; break;