add loose support for 2018 and 2019

Author: PredatorCZ

classgen/hk_base.py

@@ -25,7 +25,9 @@
     'HK2014',
     'HK2015',
     'HK2016',
-    'HK2017'
+    'HK2017',
+    'HK2018',
+    'HK2019',
 ]
 BASE.pointer_x86 = True
 BASE.pointer_x64 = True

include/hklib/hk_base.hpp

@@ -1,5 +1,5 @@
 /*  Havok Format Library
-    Copyright(C) 2016-2023 Lukas Cone
+    Copyright(C) 2016-2025 Lukas Cone
 
     This program is free software : you can redistribute it and / or modify
     it under the terms of the GNU General Public License as published by
@@ -25,14 +25,14 @@
 #define DECLARE_HKCLASS(classname)                                             \
   static constexpr JenHash GetHash() { return JenHash(#classname); }
 
-MAKE_ENUM(ENUMSCOPE(hkToolset
-                    : uint8, hkToolset),
-          EMEMBER(HKUNKVER), EMEMBER(HK500), EMEMBER(HK510), EMEMBER(HK550),
-          EMEMBER(HK600), EMEMBER(HK610), EMEMBER(HK650), EMEMBER(HK660),
-          EMEMBER(HK700), EMEMBER(HK710), EMEMBER(HK2010_1), EMEMBER(HK2010_2),
+MAKE_ENUM(ENUMSCOPE(hkToolset : uint8, hkToolset), EMEMBER(HKUNKVER),
+          EMEMBER(HK500), EMEMBER(HK510), EMEMBER(HK550), EMEMBER(HK600),
+          EMEMBER(HK610), EMEMBER(HK650), EMEMBER(HK660), EMEMBER(HK700),
+          EMEMBER(HK710), EMEMBER(HK2010_1), EMEMBER(HK2010_2),
           EMEMBER(HK2011_1), EMEMBER(HK2011_2), EMEMBER(HK2011_3),
           EMEMBER(HK2012_1), EMEMBER(HK2012_2), EMEMBER(HK2013),
-          EMEMBER(HK2014), EMEMBER(HK2015), EMEMBER(HK2016), EMEMBER(HK2017));
+          EMEMBER(HK2014), EMEMBER(HK2015), EMEMBER(HK2016), EMEMBER(HK2017),
+          EMEMBER(HK2018), EMEMBER(HK2019));
 
 using XMLnode = pugi::xml_node;
 

source/format_new.cpp

@@ -60,6 +60,10 @@ ReadFunc Read<CompileFourCC("SDKV")> =
           return HK2016;
         case 2017:
           return HK2017;
+        case 2018:
+          return HK2018;
+        case 2019:
+          return HK2019;
         default:
           return HKUNKVER;
         }

source/packfile/hk_base.inl

@@ -7,8 +7,8 @@ enum Members {
   _count_,
 };
 static const std::set<ClassData<_count_>> LAYOUTS {
-  {{{{HK500, HK2017, 8, 0}}, 16}, {8, 0}, {0x0}},
-  {{{{HK500, HK2017, 4, 0}}, 8}, {4, 0}, {0x0}}
+  {{{{HK500, HK2019, 8, 0}}, 16}, {8, 0}, {0x0}},
+  {{{{HK500, HK2019, 4, 0}}, 8}, {4, 0}, {0x0}}
 };
 struct Interface {
   Interface(char *data_, LayoutLookup layout_): data{data_}, layout{GetLayout(LAYOUTS, {layout_, {LookupFlag::Ptr}})}, lookup{layout_} {}
@@ -63,9 +63,9 @@ enum Members {
 };
 static const std::set<ClassData<_count_>> LAYOUTS {
   {{{{HK500, HK2015, 8, 0}}, 16}, {8, 10, -1, 0}, {0x5}},
-  {{{{HK2016, HK2017, 8, 0}}, 24}, {16, 18, 8, 0}, {0x5}},
+  {{{{HK2016, HK2019, 8, 0}}, 24}, {16, 18, 8, 0}, {0x5}},
   {{{{HK500, HK2015, 4, 0}}, 8}, {4, 6, -1, 0}, {0x5}},
-  {{{{HK2016, HK2017, 4, 0}}, 12}, {8, 10, 4, 0}, {0x5}}
+  {{{{HK2016, HK2019, 4, 0}}, 12}, {8, 10, 4, 0}, {0x5}}
 };
 struct Interface {
   Interface(char *data_, LayoutLookup layout_): data{data_}, layout{GetLayout(LAYOUTS, {layout_, {LookupFlag::Ptr}})}, lookup{layout_} {}

source/packfile/hk_rootlevelcontainer.inl

@@ -9,9 +9,9 @@ enum Members {
 };
 static const std::set<ClassData<_count_>> LAYOUTS {
   {{{{HK500, HK660, 8, 0}}, 32}, {8, 0, 16}, {0x0}},
-  {{{{HK700, HK2017, 8, 0}}, 24}, {8, 0, 16}, {0x0}},
+  {{{{HK700, HK2019, 8, 0}}, 24}, {8, 0, 16}, {0x0}},
   {{{{HK500, HK660, 4, 0}}, 16}, {4, 0, 8}, {0x0}},
-  {{{{HK700, HK2017, 4, 0}}, 12}, {4, 0, 8}, {0x0}}
+  {{{{HK700, HK2019, 4, 0}}, 12}, {4, 0, 8}, {0x0}}
 };
 struct Interface {
   Interface(char *data_, LayoutLookup layout_): data{data_}, layout{GetLayout(LAYOUTS, {layout_, {LookupFlag::Ptr}})}, lookup{layout_} {}
@@ -79,9 +79,9 @@ enum Members {
 };
 static const std::set<ClassData<_count_>> LAYOUTS {
   {{{{HK500, HK660, 8, 0}}, 12}, {8, 0}, {0x2}},
-  {{{{HK700, HK2017, 8, 0}}, 16}, {8, 0}, {0x2}},
+  {{{{HK700, HK2019, 8, 0}}, 16}, {8, 0}, {0x2}},
   {{{{HK500, HK660, 4, 0}}, 8}, {4, 0}, {0x2}},
-  {{{{HK700, HK2017, 4, 0}}, 12}, {4, 0}, {0x2}}
+  {{{{HK700, HK2019, 4, 0}}, 12}, {4, 0}, {0x2}}
 };
 struct Interface {
   Interface(char *data_, LayoutLookup layout_): data{data_}, layout{GetLayout(LAYOUTS, {layout_, {LookupFlag::Ptr}})}, lookup{layout_} {}

source/packfile/hka_animated_reference_frame.inl

@@ -10,16 +10,16 @@ enum Members {
 static const std::set<ClassData<_count_>> LAYOUTS {
   {{{{HK500, HK2011_3, 8, 0}}, 16}, {0, -1}, {0x0}},
   {{{{HK2012_1, HK2015, 8, 0}}, 24}, {0, 16}, {0x0}},
-  {{{{HK2016, HK2017, 8, 0}}, 32}, {0, 24}, {0x0}},
+  {{{{HK2016, HK2019, 8, 0}}, 32}, {0, 24}, {0x0}},
   {{{{HK500, HK2011_3, 4, 0}}, 8}, {0, -1}, {0x0}},
   {{{{HK2012_1, HK2015, 4, 0}}, 12}, {0, 8}, {0x0}},
-  {{{{HK2016, HK2017, 4, 0}}, 16}, {0, 12}, {0x0}},
+  {{{{HK2016, HK2019, 4, 0}}, 16}, {0, 12}, {0x0}},
   {{{{HK500, HK2011_3, 8, 1}}, 16}, {0, -1}, {0x0}},
   {{{{HK2012_1, HK2015, 8, 1}}, 16}, {0, 12}, {0x0}},
-  {{{{HK2016, HK2017, 8, 1}}, 24}, {0, 20}, {0x0}},
+  {{{{HK2016, HK2019, 8, 1}}, 24}, {0, 20}, {0x0}},
   {{{{HK500, HK2011_3, 4, 1}}, 8}, {0, -1}, {0x0}},
   {{{{HK2012_1, HK2015, 4, 1}}, 12}, {0, 8}, {0x0}},
-  {{{{HK2016, HK2017, 4, 1}}, 16}, {0, 12}, {0x0}}
+  {{{{HK2016, HK2019, 4, 1}}, 16}, {0, 12}, {0x0}}
 };
 struct Interface {
   Interface(char *data_, LayoutLookup layout_): data{data_}, layout{GetLayout(LAYOUTS, {layout_, {LookupFlag::Ptr ,LookupFlag::Padding}})}, lookup{layout_} {}

source/packfile/hka_animated_reference_frame_default.inl

@@ -13,11 +13,11 @@ enum Members {
 };
 static const std::set<ClassData<_count_>> LAYOUTS {
   {{{{HK500, HK2011_3, 8, 0}}, 80}, {0, 48, 32, 64, 56, 16}, {0x88}},
-  {{{{HK2012_1, HK2017, 8, 0}}, 96}, {0, 64, 48, 80, 72, 32}, {0x88}},
-  {{{{HK500, HK2017, 4, 0}}, 64}, {0, 48, 32, 56, 52, 16}, {0x88}},
+  {{{{HK2012_1, HK2019, 8, 0}}, 96}, {0, 64, 48, 80, 72, 32}, {0x88}},
+  {{{{HK500, HK2019, 4, 0}}, 64}, {0, 48, 32, 56, 52, 16}, {0x88}},
   {{{{HK500, HK2015, 8, 1}}, 80}, {0, 48, 32, 64, 56, 16}, {0x88}},
-  {{{{HK2016, HK2017, 8, 1}}, 96}, {0, 64, 48, 80, 72, 32}, {0x88}},
-  {{{{HK500, HK2017, 4, 1}}, 64}, {0, 48, 32, 56, 52, 16}, {0x88}}
+  {{{{HK2016, HK2019, 8, 1}}, 96}, {0, 64, 48, 80, 72, 32}, {0x88}},
+  {{{{HK500, HK2019, 4, 1}}, 64}, {0, 48, 32, 56, 52, 16}, {0x88}}
 };
 struct Interface {
   Interface(char *data_, LayoutLookup layout_): data{data_}, layout{GetLayout(LAYOUTS, {layout_, {LookupFlag::Ptr ,LookupFlag::Padding}})}, lookup{layout_} {}

source/packfile/hka_animation.inl

@@ -8,8 +8,8 @@ enum Members {
   _count_,
 };
 static const std::set<ClassData<_count_>> LAYOUTS {
-  {{{{HK500, HK2017, 8, 0}}, 16}, {8, 0}, {0x8}},
-  {{{{HK500, HK2017, 4, 0}}, 8}, {4, 0}, {0x8}}
+  {{{{HK500, HK2019, 8, 0}}, 16}, {8, 0}, {0x8}},
+  {{{{HK500, HK2019, 4, 0}}, 8}, {4, 0}, {0x8}}
 };
 struct Interface {
   Interface(char *data_, LayoutLookup layout_): data{data_}, layout{GetLayout(LAYOUTS, {layout_, {LookupFlag::Ptr}})}, lookup{layout_} {}
@@ -50,9 +50,9 @@ enum Members {
   _count_,
 };
 static const std::set<ClassData<_count_>> LAYOUTS {
-  {{{{HK500, HK2017, 8, 0}}, 24}, {8, 0, 16}, {0x20}},
+  {{{{HK500, HK2019, 8, 0}}, 24}, {8, 0, 16}, {0x20}},
   {{{{HK500, HK660, 4, 0}}, 12}, {4, 0, 8}, {0x20}},
-  {{{{HK700, HK2017, 4, 0}}, 16}, {4, 0, 8}, {0x20}}
+  {{{{HK700, HK2019, 4, 0}}, 16}, {4, 0, 8}, {0x20}}
 };
 struct Interface {
   Interface(char *data_, LayoutLookup layout_): data{data_}, layout{GetLayout(LAYOUTS, {layout_, {LookupFlag::Ptr}})}, lookup{layout_} {}
@@ -114,18 +114,18 @@ enum Members {
 static const std::set<ClassData<_count_>> LAYOUTS {
   {{{{HK500, HK510, 8, 0}}, 56}, {16, 40, 0, 20, 32, 48, -1, 24}, {0x8882}},
   {{{{HK550, HK2015, 8, 0}}, 56}, {16, 40, 0, 20, 32, 48, 28, 24}, {0xa882}},
-  {{{{HK2016, HK2017, 8, 0}}, 64}, {24, 48, 0, 28, 40, 56, 36, 32}, {0xa882}},
+  {{{{HK2016, HK2019, 8, 0}}, 64}, {24, 48, 0, 28, 40, 56, 36, 32}, {0xa882}},
   {{{{HK500, HK510, 4, 0}}, 32}, {8, 24, 0, 12, 20, 28, -1, 16}, {0x8882}},
   {{{{HK550, HK660, 4, 0}}, 36}, {8, 28, 0, 12, 24, 32, 20, 16}, {0xa882}},
   {{{{HK700, HK2015, 4, 0}}, 40}, {8, 28, 0, 12, 24, 32, 20, 16}, {0xa882}},
-  {{{{HK2016, HK2017, 4, 0}}, 44}, {12, 32, 0, 16, 28, 36, 24, 20}, {0xa882}},
+  {{{{HK2016, HK2019, 4, 0}}, 44}, {12, 32, 0, 16, 28, 36, 24, 20}, {0xa882}},
   {{{{HK500, HK510, 8, 1}}, 48}, {12, 32, 0, 16, 24, 40, -1, 20}, {0x8882}},
   {{{{HK550, HK2015, 8, 1}}, 56}, {12, 40, 0, 16, 32, 48, 24, 20}, {0xa882}},
-  {{{{HK2016, HK2017, 8, 1}}, 64}, {20, 48, 0, 24, 40, 56, 32, 28}, {0xa882}},
+  {{{{HK2016, HK2019, 8, 1}}, 64}, {20, 48, 0, 24, 40, 56, 32, 28}, {0xa882}},
   {{{{HK500, HK510, 4, 1}}, 32}, {8, 24, 0, 12, 20, 28, -1, 16}, {0x8882}},
   {{{{HK550, HK660, 4, 1}}, 36}, {8, 28, 0, 12, 24, 32, 20, 16}, {0xa882}},
   {{{{HK700, HK2015, 4, 1}}, 40}, {8, 28, 0, 12, 24, 32, 20, 16}, {0xa882}},
-  {{{{HK2016, HK2017, 4, 1}}, 44}, {12, 32, 0, 16, 28, 36, 24, 20}, {0xa882}}
+  {{{{HK2016, HK2019, 4, 1}}, 44}, {12, 32, 0, 16, 28, 36, 24, 20}, {0xa882}}
 };
 struct Interface {
   Interface(char *data_, LayoutLookup layout_): data{data_}, layout{GetLayout(LAYOUTS, {layout_, {LookupFlag::Ptr ,LookupFlag::Padding}})}, lookup{layout_} {}

source/packfile/hka_animation_binding.inl

@@ -20,13 +20,13 @@ static const std::set<ClassData<_count_>> LAYOUTS {
   {{{{HK600, HK660, 8, 0}}, 48}, {8, -1, 44, 32, 40, -1, 24, -1, 0, 16}, {0x2200, 0x0}},
   {{{{HK700, HK2011_3, 8, 0}}, 72}, {24, 0, 64, 48, 56, -1, 40, -1, 16, 32}, {0x2200, 0x0}},
   {{{{HK2012_1, HK2015, 8, 0}}, 88}, {24, 0, 80, 48, 56, 72, 40, 64, 16, 32}, {0x2a00, 0x0}},
-  {{{{HK2016, HK2017, 8, 0}}, 96}, {32, 0, 88, 56, 64, 80, 48, 72, 24, 40}, {0x2a00, 0x0}},
+  {{{{HK2016, HK2019, 8, 0}}, 96}, {32, 0, 88, 56, 64, 80, 48, 72, 24, 40}, {0x2a00, 0x0}},
   {{{{HK500, HK510, 4, 0}}, 16}, {0, -1, 12, -1, -1, -1, 8, -1, -1, 4}, {0x2000, 0x0}},
   {{{{HK550, HK550, 4, 0}}, 24}, {0, -1, 20, 12, 16, -1, 8, -1, -1, 4}, {0x2200, 0x0}},
   {{{{HK600, HK660, 4, 0}}, 28}, {4, -1, 24, 16, 20, -1, 12, -1, 0, 8}, {0x2200, 0x0}},
   {{{{HK700, HK2011_3, 4, 0}}, 44}, {12, 0, 40, 28, 32, -1, 20, -1, 8, 16}, {0x2200, 0x0}},
   {{{{HK2012_1, HK2015, 4, 0}}, 56}, {12, 0, 52, 28, 32, 44, 20, 40, 8, 16}, {0x2a00, 0x0}},
-  {{{{HK2016, HK2017, 4, 0}}, 60}, {16, 0, 56, 32, 36, 48, 24, 44, 12, 20}, {0x2a00, 0x0}}
+  {{{{HK2016, HK2019, 4, 0}}, 60}, {16, 0, 56, 32, 36, 48, 24, 44, 12, 20}, {0x2a00, 0x0}}
 };
 struct Interface {
   Interface(char *data_, LayoutLookup layout_): data{data_}, layout{GetLayout(LAYOUTS, {layout_, {LookupFlag::Ptr}})}, lookup{layout_} {}

source/packfile/hka_animation_container.inl

@@ -18,10 +18,10 @@ enum Members {
 static const std::set<ClassData<_count_>> LAYOUTS {
   {{{{HK500, HK660, 8, 0}}, 76}, {16, 48, -1, 32, 24, 56, 40, 8, 72, 0, 64}, {0xaa00, 0x2}},
   {{{{HK700, HK2015, 8, 0}}, 96}, {32, 64, 0, 48, 40, 72, 56, 24, 88, 16, 80}, {0xaa00, 0x2}},
-  {{{{HK2016, HK2017, 8, 0}}, 104}, {40, 72, 0, 56, 48, 80, 64, 32, 96, 24, 88}, {0xaa00, 0x2}},
+  {{{{HK2016, HK2019, 8, 0}}, 104}, {40, 72, 0, 56, 48, 80, 64, 32, 96, 24, 88}, {0xaa00, 0x2}},
   {{{{HK500, HK660, 4, 0}}, 40}, {8, 24, -1, 16, 12, 28, 20, 4, 36, 0, 32}, {0xaa00, 0x2}},
   {{{{HK700, HK2015, 4, 0}}, 68}, {20, 44, 0, 32, 24, 48, 36, 12, 60, 8, 56}, {0xaa00, 0x2}},
-  {{{{HK2016, HK2017, 4, 0}}, 72}, {24, 48, 0, 36, 28, 52, 40, 16, 64, 12, 60}, {0xaa00, 0x2}}
+  {{{{HK2016, HK2019, 4, 0}}, 72}, {24, 48, 0, 36, 28, 52, 40, 16, 64, 12, 60}, {0xaa00, 0x2}}
 };
 struct Interface {
   Interface(char *data_, LayoutLookup layout_): data{data_}, layout{GetLayout(LAYOUTS, {layout_, {LookupFlag::Ptr}})}, lookup{layout_} {}