use seconds as world time unit

[blank.git] / src / ai / ai.cpp

diff --git a/src/ai/ai.cpp b/src/ai/ai.cpp
index e0fb9555adc0430d5f32daeeaa137b3771064588..7dfe0424c44a210cdf1f1619063a2d756da45f64 100644 (file)
--- a/src/ai/ai.cpp
+++ b/src/ai/ai.cpp
@@ -16,8 +16,8 @@ Chaser::Chaser(World &world, Entity &ctrl, Entity &tgt) noexcept
 : Controller(ctrl)
 , world(world)
 , tgt(tgt)
-, chase_speed(0.002f)
-, flee_speed(-0.005f)
+, chase_speed(2.0f)
+, flee_speed(-5.0f)
 , stop_dist(10)
 , flee_dist(5) {
        tgt.Ref();
@@ -28,8 +28,17 @@ Chaser::~Chaser() {
 }
 
 void Chaser::Update(int dt) {
+       if (Target().Dead()) {
+               Controlled().Kill();
+               return;
+       }
+
        glm::vec3 diff(Target().AbsoluteDifference(Controlled()));
        float dist = length(diff);
+       if (dist < std::numeric_limits<float>::epsilon()) {
+               Controlled().TargetVelocity(glm::vec3(0.0f));
+               return;
+       }
        glm::vec3 norm_diff(diff / dist);
 
        bool line_of_sight = true;
@@ -40,13 +49,13 @@ void Chaser::Update(int dt) {
        }
 
        if (!line_of_sight) {
-               Controlled().Velocity(glm::vec3(0.0f));
+               Controlled().TargetVelocity(glm::vec3(0.0f));
        } else if (dist > stop_dist) {
-               Controlled().Velocity(norm_diff * chase_speed);
+               Controlled().TargetVelocity(norm_diff * chase_speed);
        } else if (dist < flee_dist) {
-               Controlled().Velocity(norm_diff * flee_speed);
+               Controlled().TargetVelocity(norm_diff * flee_speed);
        } else {
-               Controlled().Velocity(glm::vec3(0.0f));
+               Controlled().TargetVelocity(glm::vec3(0.0f));
        }
 }
 
@@ -61,9 +70,16 @@ Controller::~Controller() {
 }
 
 
-RandomWalk::RandomWalk(Entity &e) noexcept
+RandomWalk::RandomWalk(Entity &e, std::uint64_t seed) noexcept
 : Controller(e)
-, time_left(0) {
+, random(seed)
+, start_vel(e.Velocity())
+, target_vel(start_vel)
+, start_rot(e.AngularVelocity())
+, target_rot(start_rot)
+, switch_time(0)
+, lerp_max(1.0f)
+, lerp_time(0.0f) {
 
 }
 
@@ -72,45 +88,36 @@ RandomWalk::~RandomWalk() {
 }
 
 void RandomWalk::Update(int dt) {
-       time_left -= dt;
-       if (time_left > 0) return;
-       time_left += 2500 + (rand() % 5000);
-
-       constexpr float move_vel = 0.0005f;
-
-       glm::vec3 new_vel = Controlled().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;
+       switch_time -= dt;
+       lerp_time -= dt;
+       if (switch_time < 0) {
+               switch_time += 2500 + (random.Next<unsigned short>() % 5000);
+               lerp_max = 1500 + (random.Next<unsigned short>() % 1000);
+               lerp_time = lerp_max;
+               Change();
+       } else if (lerp_time > 0) {
+               float a = std::min(lerp_time / lerp_max, 1.0f);
+               Controlled().TargetVelocity(mix(target_vel, start_vel, a));
+               Controlled().AngularVelocity(mix(target_rot, start_rot, a));
+       } else {
+               Controlled().TargetVelocity(target_vel);
+               Controlled().AngularVelocity(target_rot);
        }
+}
+
+void RandomWalk::Change() noexcept {
+       start_vel = target_vel;
+       start_rot = target_rot;
+
+       constexpr float base = 0.001f;
+
+       target_vel.x = base * (random.Next<short>() % 1024);
+       target_vel.y = base * (random.Next<short>() % 1024);
+       target_vel.z = base * (random.Next<short>() % 1024);
 
-       Controlled().Velocity(new_vel);
+       target_rot.x = base * (random.Next<short>() % 1024);
+       target_rot.y = base * (random.Next<short>() % 1024);
+       target_rot.z = base * (random.Next<short>() % 1024);
 }
 
 }