From 522123e72dc046f96feca1f361159bd490bf0ea6 Mon Sep 17 00:00:00 2001
From: XProger <xproger@list.ru>
Date: Sun, 27 Jan 2019 00:25:40 +0300
Subject: [PATCH] fix enemies animation jitter

---
 src/controller.h |  2 ++
 src/enemy.h      | 55 ++++++++++++++++++------------------------------
 src/lara.h       |  5 -----
 src/utils.h      |  1 +
 4 files changed, 23 insertions(+), 40 deletions(-)

diff --git a/src/controller.h b/src/controller.h
index b2e6e23..5bc0915 100644
--- a/src/controller.h
+++ b/src/controller.h
@@ -831,7 +831,9 @@ struct Controller {
         const TR::Model *m = getModel();
         ASSERT(m->mCount <= MAX_SPHERES);
 
+        int jFrame = jointsFrame;
         updateJoints();
+        jointsFrame = jFrame;
 
         int count = 0;
         for (int i = 0; i < m->mCount; i++) {
diff --git a/src/enemy.h b/src/enemy.h
index a37263e..7a27b23 100644
--- a/src/enemy.h
+++ b/src/enemy.h
@@ -79,6 +79,7 @@ struct Enemy : Character {
     Enemy(IGame *game, int entity, float health, int radius, float length, float aggression) : Character(game, entity, health), ai(AI_RANDOM), mood(MOOD_SLEEP), wound(false), nextState(0), targetBox(TR::NO_BOX), thinkTime(1.0f / 30.0f), length(length), aggression(aggression), radius(radius), hitSound(-1), target(NULL), path(NULL) {
         targetDist   = +INF;
         targetInView = targetFromView = targetCanAttack = false;
+        waypoint     = pos;
     }
 
     virtual ~Enemy() {
@@ -227,22 +228,6 @@ struct Enemy : Character {
             animation.overrideMask &= ~(1 << chest);
     }
 
-    void getTargetInfo(int height, vec3 *pos, float *angleX, float *angleY, float *dist) {
-        vec3 p = waypoint;
-        p.y -= height;
-        if (pos) *pos = p;
-        vec3 a = p - this->pos;
-        if (dist) *dist = a.length();
-
-        if (angleX || angleY) {
-            a = a.normal();
-            vec3 b = getDir();
-            vec3 n = vec3(0, 1, 0);
-            if (angleX) *angleX = 0.0f;
-            if (angleY) *angleY = atan2f(b.cross(a).dot(n), a.dot(b));
-        }
-    }
-
     bool targetIsVisible(float maxDist) {
         if (targetInView && targetDist < maxDist && target->health > 0.0f) {
             TR::Location from, to;
@@ -264,28 +249,28 @@ struct Enemy : Character {
         Character::lookAt(targetInView ? target : NULL);
     }
 
-    int turn(float delta, float speed) {
-        float w = speed * Core::deltaTime;
-
-        updateTilt(delta, w, speed * 0.1f);
-
-        if (delta != 0.0f) {
-            decrease(delta, angle.y, w);
-            if (speed != 0.0f) {
-                velocity = velocity.rotateY(-w);
-                return speed < 0 ? LEFT : RIGHT;
-            }
-        }
-        return 0;
-    }
-
     void turn(bool tilt, float w) {
-        float angleY = 0.0f;
+        float speed = animation.getSpeed();
 
-        if (tilt)
-            getTargetInfo(0, NULL, NULL, &angleY, NULL);
+        if (!target || speed == 0.0f || w == 0.0f) {
+            angle.z = lerp(angle.z, 0.0f, 4.0f * Core::deltaTime);
+            return;
+        }
 
-        turn(angleY, w);
+        vec3  d = waypoint - pos;
+        float a = clampAngle(normalizeAngle(PIH - d.angleY() - angle.y));
+
+        w /= 30.0f;
+
+        float minDist = speed * PIH / w;
+
+        if ( (a > PIH || a < -PIH) && (SQR(d.x) + SQR(d.z) < SQR(minDist)) )
+            w *= 0.5f;
+
+        a = clamp(a, -w, w);
+
+        angle.y += a * 30.0f * Core::deltaTime;
+        angle.z = lerp(angle.z, tilt ? a * 2.0f : 0.0f, 4.0f * Core::deltaTime);
     }
 
     int lift(float delta, float speed) {
diff --git a/src/lara.h b/src/lara.h
index 2a49881..799801a 100644
--- a/src/lara.h
+++ b/src/lara.h
@@ -2962,11 +2962,6 @@ struct Lara : Character {
         //if (Input::state[pid][cStepRight]) input  = WALK  | RIGHT;
         //if (Input::state[pid][cStepLeft])  input  = WALK  | LEFT;
 
-    // scion debug (TODO: remove)
-        if (Input::down[ikU]) {
-            // 203 Water roll
-            animation.setAnim(ANIM_WADE_STAND);
-        }
 
         if (Input::down[ikP]) {
             switch (level->id) {
diff --git a/src/utils.h b/src/utils.h
index 7a0ba55..7b08e94 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -74,6 +74,7 @@
 #define EPS     FLT_EPSILON
 #define INF     INFINITY
 #define PI      3.14159265358979323846f
+#define PIH     (PI * 0.5f)
 #define PI2     (PI * 2.0f)
 #define DEG2RAD (PI / 180.0f)
 #define RAD2DEG (180.0f / PI)