cleanup swimming code

Author: Try

game/graphics/mesh/animation.cpp

@@ -225,14 +225,15 @@ Animation::Sequence::Sequence(const zenkit::MdsAnimation& hdr, std::string_view
   data->lastFrame  = uint32_t(hdr.last_frame);
 
 
-  name = p.name;
+  name  = p.name;
   layer = p.layer;
-  data->fpsRate = p.fps;
+
+  data->fpsRate   = p.fps;
   data->numFrames = p.frame_count;
   data->nodeIndex = p.node_indices;
-  data->samples = p.samples;
+  data->samples   = p.samples;
 
-  setupMoveTr();
+  data->setupMoveTr();
   }
 
 bool Animation::Sequence::isFinished(uint64_t now, uint64_t sTime, uint16_t comboLen) const {
@@ -571,10 +572,6 @@ void Animation::Sequence::schemeName(char scheme[64]) const {
     }
   }
 
-void Animation::Sequence::setupMoveTr() {
-  data->setupMoveTr();
-  }
-
 void Animation::AnimData::setupMoveTr() {
   size_t sz = nodeIndex.size();
   if(sz==0)

game/graphics/mesh/animation.h

@@ -117,7 +117,6 @@ class Animation final {
       std::shared_ptr<AnimData>              data;
 
       private:
-        void                                 setupMoveTr();
         static void                          processEvent(const zenkit::MdsEventTag& e, EvCount& ev, uint64_t time);
         bool                                 extractFrames(uint64_t &frameA, uint64_t &frameB, bool &invert, uint64_t barrier, uint64_t sTime, uint64_t now) const;
       };

game/graphics/mesh/pose.cpp

@@ -394,8 +394,10 @@ bool Pose::updateFrame(const Animation::Sequence &s, BodyState bs, uint64_t sBle
     if(i==0) {
       if(bs==BS_CLIMB)
         smp.position.y = trY;
+      else if(bs==BS_SWIM || bs==BS_DIVE)
+        smp.position.y = trY;
       else if(s.isFly())
-        smp.position.y = d.translate.y;
+        smp.position.y = trY; //d.translate.y;
       }
 
     switch(hasSamples[idx]) {
@@ -790,8 +792,13 @@ const Tempest::Matrix4x4 Pose::rootNode() const {
   size_t id = 0;
   if(skeleton->rootNodes.size())
     id = skeleton->rootNodes[0];
-  auto& nodes = skeleton->nodes;
-  return hasSamples[id] ? mkMatrix(base[id]) : nodes[id].tr;
+
+  const auto& nodes = skeleton->nodes;
+  if(id>=nodes.size())
+    return Matrix4x4::mkIdentity();
+
+  auto ret = hasSamples[id] ? mkMatrix(base[id]) : nodes[id].tr;
+  return ret;
   }
 
 const Matrix4x4 Pose::rootBone() const {
@@ -897,12 +904,13 @@ Vec3 Pose::mkBaseTranslation() {
   auto  b0 = rootNode();
 
   float dx = b0.at(3,0);
-  //float dy = b0.at(3,1) - translateY();
   float dy = 0;
   float dz = b0.at(3,2);
 
-  if((flag&NoTranslation)==NoTranslation)
+  if((flag&NoTranslation)==NoTranslation) {
     dy = b0.at(3,1);
+    // dy = b0.at(3,1) - translateY();
+    }
 
   return Vec3(-dx,-dy,-dz);
   }

game/world/objects/npc.cpp

@@ -4593,12 +4593,6 @@ void Npc::updateAnimation(uint64_t dt, bool force) {
       pos = mkPositionMatrix();
       }
 
-    if(mvAlgo.isSwim()) {
-      float chest = mvAlgo.canFlyOverWater() ? 0 : (translateY()-visual.pose().rootNode().at(3,1));
-      float y     = pos.at(3,1);
-      pos.set(3,1,y+chest);
-      }
-
     visual.setObjMatrix(pos,false);
     durtyTranform = 0;
     }