Release v1.12

PredatorCZ · Nov 22, 2020 · 4d42621 · 4d42621
1 parent c2f8279
commit 4d42621
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/3rd_party/HavokLib b/3rd_party/HavokLib
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+v1.12
+- Fixed specific crash when importing incomplete skeletons. (#18 )
+- Fixed wrong root motion rotation directions.
+- Added hkaLosslessCompressedAnimation custom class support (library feature).
+- Attempt to remove inter-frame gimbal lock issues.
 v1.11.1
 - Fixed crash for first-time users.
 v1.11

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.3)
 
-project(HavokMax VERSION 1.11.1)
+project(HavokMax VERSION 1.12)
 
 set (HavokLibLibraryPath ../HavokLib)
 

diff --git a/src/HavokImport.cpp b/src/HavokImport.cpp
@@ -228,10 +228,10 @@ void HavokImport::LoadRootMotion(const hkaAnimatedReferenceFrame *ani,
       Quat &cRotation = reinterpret_cast<Quat &>(trans.rotation.QConjugate());
       auto cTrans = reinterpret_cast<Point3 &>(trans.translation * objectScale);
       cMat.SetRotate(cRotation);
-      cMat.SetTrans(cTrans * corMat);
-      //cMat *= corMat;
+      cMat.SetTrans(cTrans);
+      auto trueTM = cMats[cTime++] * Inverse(corMat);
 
-      SetXFormPacket packet(cMats[cTime++] * cMat);
+      SetXFormPacket packet(trueTM * cMat * corMat);
 
       cnt->SetValue(SecToTicks(t), &packet);
     }
@@ -354,9 +354,9 @@ void HavokImport::LoadAnimation(const hkaAnimation *ani,
     }
 
     if (cnt->GetRotationController()->ClassID() !=
-        Class_ID(LININTERP_ROTATION_CLASS_ID, 0)) {
+        Class_ID(HYBRIDINTERP_ROTATION_CLASS_ID, 0)) {
       cnt->SetRotationController((Control *)CreateInstance(
-          CTRL_ROTATION_CLASS_ID, Class_ID(LININTERP_ROTATION_CLASS_ID, 0)));
+          CTRL_ROTATION_CLASS_ID, Class_ID(HYBRIDINTERP_ROTATION_CLASS_ID, 0)));
     }
 
     if (cnt->GetScaleController()->ClassID() !=
@@ -418,7 +418,7 @@ void HavokImport::LoadAnimation(const hkaAnimation *ani,
     AnimateOff();
 
     Control *rotControl = (Control *)CreateInstance(
-        CTRL_ROTATION_CLASS_ID, Class_ID(HYBRIDINTERP_ROTATION_CLASS_ID, 0));
+        CTRL_ROTATION_CLASS_ID, Class_ID(LININTERP_ROTATION_CLASS_ID, 0));
     rotControl->Copy(cnt->GetRotationController());
     cnt->GetRotationController()->Copy(rotControl);
   }