From 3564b85b4e354272cea8a8217f9e27827a043d7a Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Mon, 16 Nov 2020 22:43:15 +0100
Subject: animation compression from PS2

---
 src/animation/AnimBlendHierarchy.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'src/animation/AnimBlendHierarchy.cpp')

diff --git a/src/animation/AnimBlendHierarchy.cpp b/src/animation/AnimBlendHierarchy.cpp
index feeaca3d..67b19019 100644
--- a/src/animation/AnimBlendHierarchy.cpp
+++ b/src/animation/AnimBlendHierarchy.cpp
@@ -30,15 +30,14 @@ void
 CAnimBlendHierarchy::CalcTotalTime(void)
 {
 	int i, j;
-	float totalTime = 0.0f;
+	totalLength = 0.0f;
 
 	for(i = 0; i < numSequences; i++){
 		float seqTime = 0.0f;
 		for(j = 0; j < sequences[i].numFrames; j++)
 			seqTime += sequences[i].GetKeyFrame(j)->deltaTime;
-		totalTime = Max(totalTime, seqTime);
+		totalLength = Max(totalLength, seqTime);
 	}
-	totalLength = totalTime;
 }
 
 void
@@ -61,6 +60,12 @@ CAnimBlendHierarchy::RemoveAnimSequences(void)
 void
 CAnimBlendHierarchy::Uncompress(void)
 {
+#ifdef ANIM_COMPRESSION
+	int i;
+	assert(compressed);
+	for(i = 0; i < numSequences; i++)
+		sequences[i].Uncompress();
+#endif
 	if(totalLength == 0.0f)
 		CalcTotalTime();
 	compressed = 0;
@@ -69,6 +74,11 @@ CAnimBlendHierarchy::Uncompress(void)
 void
 CAnimBlendHierarchy::RemoveUncompressedData(void)
 {
-	// useless
+#ifdef ANIM_COMPRESSION
+	int i;
+	assert(!compressed);
+	for(i = 0; i < numSequences; i++)
+		sequences[i].RemoveUncompressedData();
+#endif
 	compressed = 1;
 }
-- 
cgit v1.2.3


From 83bbb631d1105502fb3c5b3af90578226ba35583 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Tue, 1 Dec 2020 17:42:18 +0100
Subject: some more GTA_VERSIONs and CGame tidy-up (not much actual memory
 moving yet)

---
 src/animation/AnimBlendHierarchy.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/animation/AnimBlendHierarchy.cpp')

diff --git a/src/animation/AnimBlendHierarchy.cpp b/src/animation/AnimBlendHierarchy.cpp
index 67b19019..c7800de5 100644
--- a/src/animation/AnimBlendHierarchy.cpp
+++ b/src/animation/AnimBlendHierarchy.cpp
@@ -82,3 +82,14 @@ CAnimBlendHierarchy::RemoveUncompressedData(void)
 #endif
 	compressed = 1;
 }
+
+#ifdef USE_CUSTOM_ALLOCATOR
+void
+CAnimBlendHierarchy::MoveMemory(bool onlyone)
+{
+	int i;
+	for(i = 0; i < numSequences; i++)
+		if(sequences[i].MoveMemory() && onlyone)
+			return;
+}
+#endif
-- 
cgit v1.2.3