Start of animation decompression

Author: Niko

decompile/General/AltMods/Mods6.c

@@ -0,0 +1,29 @@
+
+#ifdef USE_FASTANIM
+void FastAnim_Start(struct GameTracker* gGT)
+{	
+	for(int i = 0; i < gGT->numPlyrCurrGame; i++)
+	{
+		struct Driver* d = gGT->drivers[i];
+		
+		if(d == 0)
+			continue;
+		
+		struct Instance* inst = d->instSelf;
+		struct Model* m = inst->model;
+		
+		for(int j = 0; j < m->numHeaders; j++)
+		{
+			struct ModelHeader* h = &m->headers[j];
+			
+			for(int k = 0; k < h->numAnimations; k++)
+			{
+				struct ModelAnim* ma = h->ptrAnimations[k];
+				
+				void FastAnim_Decompress(struct ModelAnim* ma);
+				FastAnim_Decompress(ma);	
+			}			
+		}
+	}
+}
+#endif

decompile/General/AltMods/ModsA.c

@@ -0,0 +1,78 @@
+
+#ifdef USE_FASTANIM
+void FastAnim_Decompress(struct ModelAnim* ma)
+{
+	
+}
+#endif
+
+#if 0
+
+  // animation
+  ma = m->headers[0].ptrAnimations[curr->animIndex];
+  
+  // temporary solution, plays animations
+  // at 30fps while rest of the game is 60fps
+  int frameIndex = FPS_HALF(curr->animFrame);
+  
+  // cast
+  char* maByte = (char*)ma;
+  maByte = MODELANIM_GETFRAME(maByte);
+  maByte = &maByte[ma->frameSize * frameIndex];
+  
+  // frame data
+  mf = maByte;
+  
+  char* vertData = (char*)&mf[0] + mf->vertexOffset;
+
+	Decompressed
+	
+		//copy from vertex buffer to stack index
+		stack[stackIndex].X = ptrVerts[vertexIndex].X;
+		stack[stackIndex].Y = ptrVerts[vertexIndex].Y;
+		stack[stackIndex].Z = ptrVerts[vertexIndex].Z;
+
+	Compressed
+	
+		//store temporal vertex packed uint
+		u_int temporal = ma->ptrDeltaArray[vertexIndex];
+
+		//printf("temporal: %08x\n", temporal);
+
+		//extract data from packed uint
+		//deltaArray bits: 0bXXXXXXXZZZZZZZZYYYYYYYYAAABBBCCC
+
+		u_char XBits = (temporal >> 6) & 7;
+		u_char YBits = (temporal >> 3) & 7;
+		u_char ZBits = (temporal) & 7;
+
+		u_char bx = (temporal >> 0x19) << 1;
+		u_char by = (temporal << 7) >> 0x18;
+		u_char bz = (temporal << 0xf) >> 0x18;
+
+		// If reading a full 8 bits (7+1)
+		// reset accumulator, this is an 
+		// uncompressed 1-byte number
+		if (XBits == 7) x_alu = 0;
+		if (YBits == 7) y_alu = 0;
+		if (ZBits == 7) z_alu = 0;
+
+		// Read NumBits+1, where the first
+		// extra (+1) bit, determines negative
+
+		// convert XZY frame data
+		int newX = GetSignedBits(vertData, XBits + 1);
+		int newY = GetSignedBits(vertData, YBits + 1);
+		int newZ = GetSignedBits(vertData, ZBits + 1);
+
+		//calculate decompressed coord value
+		x_alu = (x_alu + (int)newX + bx);
+		y_alu = (y_alu + (int)newY + by);
+		z_alu = (z_alu + (int)newZ + bz);
+
+		//store values to stack index, axis swap is important
+		stack[stackIndex].X = x_alu;
+		stack[stackIndex].Y = z_alu;
+		stack[stackIndex].Z = y_alu;
+	
+#endif

decompile/General/LOAD/LOAD_44_TenStages.c

@@ -675,9 +675,6 @@ int DECOMP_LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigH
 			// Stage 7: Fill remaining heap
 			DECOMP_MainInit_PrimMem(gGT, 0);
 			#endif
-			
-			#ifdef USE_FASTANIM
-			#endif
 
 			if ((gGT->gameMode2 & LEV_SWAP) == 0)
 				break;

decompile/General/MAIN/MainInit_07_FinalizeInit.c

@@ -194,6 +194,13 @@ void DECOMP_MainInit_FinalizeInit(struct GameTracker *gGT)
 	OnlineInit_Drivers(gGT);
 #endif
 
+#ifdef USE_FASTANIM
+#ifndef REBUILD_PC
+	void FastAnim_Start(struct GameTracker* gGT);
+	FastAnim_Start(gGT);
+#endif
+#endif
+
     // assume 1P fov
     numPlyr = 1;
 

include/common.h

@@ -115,17 +115,17 @@ enum HotReloadSteps
 // Not PC
 #ifndef REBUILD_PC
 #include <gccHeaders.h>
+#include <ctr_gte.h>
+#endif
+
+// PC-only, always use this
+#ifdef REBUILD_PC
+#define USE_MOREPRIM
 #endif
 
 #include <macros.h>
 #include <ctr_math.h>
 
-
-// PC Only
-#ifndef REBUILD_PC
-#include <ctr_gte.h>
-#endif
-
 #include <prim.h>
 
 // =============================

rebuild_PS1/TEST_DrawInstances.c

@@ -239,15 +239,12 @@ void DrawOneInst(struct Instance* curr)
 			// at 30fps while rest of the game is 60fps
 			int frameIndex = FPS_HALF(curr->animFrame);
 
-			// cast
-			char* maByte = (char*)ma;
-			maByte = MODELANIM_GETFRAME(maByte);
-			maByte = &maByte[ma->frameSize * frameIndex];
-
-			// frame data
-			mf = maByte;
+			// Get first frame, then current frame
+			char* firstFrame = MODELANIM_GETFRAME(ma);
+			mf = &firstFrame[ma->frameSize * frameIndex];
 		}
 
+		// may be compressed vertData, or uncompresed
 		char* vertData = (char*)&mf[0] + mf->vertexOffset;
 
 		// 3FF is background, 0x0 is minimum depth
@@ -268,7 +265,6 @@ void DrawOneInst(struct Instance* curr)
 		int vertexIndex = 0;
 		//current strip length
 		int stripLength = 0;
-		CompVertex* ptrVerts = (CompVertex*)vertData;
 		u_int* pCmd = mh->ptrCommandList;
 
 		//a "shifting window", here we update the vertices and read triangle once it's ready
@@ -367,7 +363,9 @@ void DrawOneInst(struct Instance* curr)
 				}
 				else
 				{
-					//copy from vertex buffer to stack index
+					// Copy uncompressed vertices to scratchpad
+					CompVertex* ptrVerts = (CompVertex*)vertData;
+					
 					stack[stackIndex].X = ptrVerts[vertexIndex].X;
 					stack[stackIndex].Y = ptrVerts[vertexIndex].Y;
 					stack[stackIndex].Z = ptrVerts[vertexIndex].Z;