Release v1.4

PredatorCZ · May 1, 2020 · 6c2de49 · 6c2de49
1 parent d37c547
commit 6c2de49
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/3rd_party/RevilLib b/3rd_party/RevilLib
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.3)
 
-project(RevilMax VERSION 1.3)
+project(RevilMax VERSION 1.4)
 
 set (RevilLibLibraryPath ../RevilLib_${CMAKE_GENERATOR_PLATFORM})
 

diff --git a/src/REEngineImport.cpp b/src/REEngineImport.cpp
@@ -73,7 +73,7 @@ ClassDesc2 *GetREEngineImportDesc() { return &REEngineImportDesc; }
 //--- HavokImp -------------------------------------------------------
 REEngineImport::REEngineImport() {}
 
-int REEngineImport::ExtCount() { return 6; }
+int REEngineImport::ExtCount() { return 8; }
 
 const TCHAR *REEngineImport::Ext(int n) {
   switch (n) {
@@ -89,6 +89,10 @@ const TCHAR *REEngineImport::Ext(int n) {
     return _T("motlist.99");
   case 5:
     return _T("mot.78");
+  case 6:
+    return _T("motlist.60");
+  case 7:
+    return _T("mot.43");
   default:
     return nullptr;
   }
@@ -316,7 +320,7 @@ int REEngineImport::DoImport(const TCHAR *fileName,
     if (flags[IDC_RD_ANISEL_checked]) {
       cMotion = motionList->At(IDC_CB_MOTION_index);
 
-      if (!skel) {
+      if (!skel && skelList->Size()) {
         skel = skelList->At(IDC_CB_MOTION_index);
       }
     } else {
@@ -326,11 +330,16 @@ int REEngineImport::DoImport(const TCHAR *fileName,
       printline("Sequencer not found, dumping animation ranges:");
 
       for (auto &m : *motionList) {
-        uni::Skeleton *_skel = skel ? skel : skelList->At(i);
+        if (skelList->Size()) {
+          uni::Skeleton *_skel = skel ? skel : skelList->At(i);
+
+          LoadSkeleton(_skel, lastTime);
+        }
 
-        LoadSkeleton(_skel, lastTime);
         TimeValue nextTime = LoadMotion(&m, lastTime);
-        printer << std::to_string(motionNames[i]) << ": " << lastTime << ", " << nextTime >> 1;
+        printer << std::to_string(motionNames[i]) << ": " << lastTime << ", "
+                << nextTime >>
+            1;
         lastTime = nextTime;
         i++;
       }
@@ -351,7 +360,10 @@ int REEngineImport::DoImport(const TCHAR *fileName,
     return TRUE;
   }
 
-  LoadSkeleton(skel);
+  if (skel) {
+    LoadSkeleton(skel);
+  }
+
   LoadMotion(cMotion);
 
   setlocale(LC_NUMERIC, oldLocale);
+1 −1		3rd_party/PreCore
+6 −2		README.md
+63 −4		src/reng/codecs.cpp
+14 −11		src/reng/motion_43.cpp
+17 −14		src/reng/motion_43.hpp
+104 −0		src/reng/motion_65.cpp
+65 −0		src/reng/motion_65.hpp
+5 −6		src/reng/motion_78.cpp
+4 −19		src/reng/motion_78.hpp
+17 −16		src/reng/motion_list_60.cpp
+10 −11		src/reng/motion_list_60.hpp
+83 −0		src/reng/motion_list_85.cpp
+49 −0		src/reng/motion_list_85.hpp
+26 −19		src/reng/motion_list_99.cpp
+2 −2		src/reng/motion_list_99.hpp
+7 −4		src/reng/registry.cpp