AnimTex variable rework

Author: Niko

decompile/General/CTR/CTR_04_CycleTex_LEV.c

@@ -2,27 +2,33 @@
 
 void DECOMP_CTR_CycleTex_LEV(struct AnimTex* animtex, int timer)
 {
-	int frameIndex;
+	int frameCurr;
 	struct AnimTex* curAnimTex = animtex;
 
 	#ifdef USE_NEWLEV
 	if(animtex == 0) return;
 	#endif
 
-	// iterate over All AnimTex's in a row,
-	// last one loops back to the beginning, could've also just been a null terminator
-	while (*(int*)curAnimTex != (int)animtex)// I feel like this should just be a do/while with `(int)curAnimText != (int)animtex`, but idk
+	// Termination is determined by pointer to First AnimTex
+	while (*(int*)curAnimTex != (int)animtex)
 	{
-		frameIndex = FPS_HALF(timer) + curAnimTex->frameDuration >> 
-						((int)curAnimTex->shiftFactor & 0x1fU);
-						
-		frameIndex = frameIndex % curAnimTex->numFrames;
-		curAnimTex->frameIndex = frameIndex;
+		// which texture to draw this frame
+		frameCurr = FPS_HALF(timer) + curAnimTex->frameOffset; 
+		
+		// allow frames to skip updating (like 60fps hacks)
+		frameCurr = frameCurr >> curAnimTex->frameSkip;
+		
+		// loop back to index[0] after finished cycle
+		frameCurr = frameCurr % curAnimTex->numFrames;
+		
+		// save result
+		curAnimTex->frameCurr = frameCurr;
 
 		struct IconGroup4** ptrArray = ANIMTEX_GETARRAY(curAnimTex);
 
 		// Save new frame
-		curAnimTex->ptrActiveTex = (int*)ptrArray[frameIndex]; //why is this line slightly different than CTR_CycleTex_Model.c?
+		// For levels, this is just a pointer
+		curAnimTex->ptrActiveTex = (int*)ptrArray[frameCurr];
 
 		// Go to next AnimTex, which comes after this AnimTex's ptrarray
 		curAnimTex = (struct AnimTex*)&ptrArray[curAnimTex->numFrames];

decompile/General/CTR/CTR_05_CycleTex_Model.c

@@ -2,23 +2,33 @@
 
 void DECOMP_CTR_CycleTex_Model(struct AnimTex* animtex, int timer)
 {
-	int frameIndex;
+	int frameCurr;
 	struct AnimTex* curAnimTex = animtex;
-
-	// iterate over All AnimTex's in a row,
-	// last one loops back to the beginning, could've also just been a null terminator
-	while (*(int*)curAnimTex != (int)animtex)// I feel like this should just be a do/while with `(int)curAnimText != (int)animtex`, but idk
+	
+	#ifdef USE_NEWLEV
+	if(animtex == 0) return;
+	#endif
+	
+	// Termination is determined by pointer to First AnimTex
+	while (*(int*)curAnimTex != (int)animtex)
 	{
-		frameIndex = FPS_HALF(timer) + curAnimTex->frameDuration >> 
-						((int)curAnimTex->shiftFactor & 0x1fU);
-						
-		frameIndex = frameIndex % curAnimTex->numFrames;
-		curAnimTex->frameIndex = frameIndex;
+		// which texture to draw this frame
+		frameCurr = FPS_HALF(timer) + curAnimTex->frameOffset; 
+		
+		// allow frames to skip updating (like 60fps hacks)
+		frameCurr = frameCurr >> curAnimTex->frameSkip;
+		
+		// loop back to index[0] after finished cycle
+		frameCurr = frameCurr % curAnimTex->numFrames;
+		
+		// save result
+		curAnimTex->frameCurr = frameCurr;
 
 		struct IconGroup4** ptrArray = ANIMTEX_GETARRAY(curAnimTex);
 
 		// Save new frame
-		*curAnimTex->ptrActiveTex = (int)ptrArray[frameIndex]; //why is this line slightly different than CTR_CycleTex_LEV.c?
+		// For Model, this is a pointer to a pointer
+		*curAnimTex->ptrActiveTex = (int)ptrArray[frameCurr];
 
 		// Go to next AnimTex, which comes after this AnimTex's ptrarray
 		curAnimTex = (struct AnimTex*)&ptrArray[curAnimTex->numFrames];

include/namespace_Level.h

@@ -129,13 +129,13 @@ struct AnimTex
 	short numFrames;
 
 	// 0x6
-	short frameDuration;
+	short frameOffset;
 
 	// 0x8
-	short shiftFactor;
+	short frameSkip;
 
 	// 0xA
-	u_short frameIndex;
+	short frameCurr;
 
 	// 0xC
 	// size = numFrames

mods/Levels/Legacy/RoadToRainbow/src/Lev221.c

@@ -159,9 +159,6 @@ struct LevelFile file =
 	{
 		.ptrActiveTex = LEV_OFFSETOF(turbo_pad[0]),
 		.numFrames = 10,
-		.frameDuration = 0,
-		.shiftFactor = 0,
-		.frameIndex = 0,
 	},
 
 	.TPA_ptrarray =

mods/Levels/Legacy/TileTrauma/src/Lev221.c

@@ -279,9 +279,6 @@ struct LevelFile file =
 	{
 		.ptrActiveTex = LEV_OFFSETOF(turbo_pad[0]),
 		.numFrames = 10,
-		.frameDuration = 0,
-		.shiftFactor = 0,
-		.frameIndex = 0,
 	},
 
 	.TPA_ptrarray =
@@ -302,9 +299,6 @@ struct LevelFile file =
 	{
 		.ptrActiveTex = LEV_OFFSETOF(super_turbo_pad[0]),
 		.numFrames = 10,
-		.frameDuration = 0,
-		.shiftFactor = 0,
-		.frameIndex = 0,
 	},
 
 	.STPA_ptrarray =

mods/Levels/PS1_TrackROM/src/cycle_tex.c

@@ -2,26 +2,34 @@
 
 void CTR_CycleTex_LEV(struct AnimTex* animtex, int timer)
 {
-	int frameIndex;
+	int frameCurr;
 	struct AnimTex* curAnimTex = animtex;
-
-	if(animtex == NULL) { return; }
-
-	// iterate over All AnimTex's in a row,
-	// last one loops back to the beginning, could've also just been a null terminator
-	while (*(int*)curAnimTex != (int)animtex)// I feel like this should just be a do/while with `(int)curAnimText != (int)animtex`, but idk
+	
+	#ifdef USE_NEWLEV
+	if(animtex == 0) return;
+	#endif
+	
+	// Termination is determined by pointer to First AnimTex
+	while (*(int*)curAnimTex != (int)animtex)
 	{
-		frameIndex = FPS_HALF(timer) + curAnimTex->frameDuration >>
-						((int)curAnimTex->shiftFactor & 0x1fU);
-
-		frameIndex = frameIndex % curAnimTex->numFrames;
-		curAnimTex->frameIndex = frameIndex;
-
+		// which texture to draw this frame
+		frameCurr = FPS_HALF(timer) + curAnimTex->frameOffset; 
+		
+		// allow frames to skip updating (like 60fps hacks)
+		frameCurr = frameCurr >> curAnimTex->frameSkip;
+		
+		// loop back to index[0] after finished cycle
+		frameCurr = frameCurr % curAnimTex->numFrames;
+		
+		// save result
+		curAnimTex->frameCurr = frameCurr;
+		
 		struct IconGroup4** ptrArray = ANIMTEX_GETARRAY(curAnimTex);
-
+		
 		// Save new frame
-		curAnimTex->ptrActiveTex = (int*)ptrArray[frameIndex]; //why is this line slightly different than CTR_CycleTex_Model.c?
-
+		// For levels, this is just a pointer
+		curAnimTex->ptrActiveTex = (int*)ptrArray[frameCurr];
+		
 		// Go to next AnimTex, which comes after this AnimTex's ptrarray
 		curAnimTex = (struct AnimTex*)&ptrArray[curAnimTex->numFrames];
 	}