Decompiled GetBoundsAccurate, GetBestFrame, Sync, TIME_Init, TIME_Reset;

TR5Main/Game/draw.cpp

@@ -24,6 +24,10 @@ int StormTimer;
 int dLightningRand;
 byte SkyStormColor[3];
 byte SkyStormColor2[3];
+short InterpolatedBounds[6];
+LARGE_INTEGER PerformanceCount;
+double LdFreq;
+double LdSync;
 
 int DrawPhaseGame()
 {
@@ -71,130 +75,37 @@ void UpdateStorm()
 	}
 }
 
-void DrawAnimatingItem(ITEM_INFO* item)
+short* GetBoundsAccurate(ITEM_INFO* item)
 {
-	/*OBJECT_INFO* obj;
+	int rate = 0;
-	CREATURE_INFO* creature;
+	short* framePtr[2];
-	int* bones;
-	int clip, i, poppush, frac, rate, bit;
-	short* frames[2];
-	short* extra_rotation;
-	short* rotation1, *rotation2;
-	short** mesh;
 	
-	creature = (CREATURE_INFO*)item->data;
+	int frac = GetFrame_D2(item, framePtr, &rate);
-	frac = GetFrame_D2(item, frames, &rate);
+	if (frac == 0)
-	obj = &Objects[item->objectNumber];
+		return framePtr[0];
-
+	else
-	//if (obj->shadowSize)
-	//	S_PrintShadow(obj->shadowSize, frames[0], item, NULL);
-
-	phd_PushMatrix();
-	phd_TranslateAbs(item->pos.xPos, item->pos.yPos, item->pos.zPos);
-	phd_RotYXZ(item->pos.yRot, item->pos.xRot, item->pos.zRot);
-
-	// checking objectMip there, deleted !
-
-	sub_42B4C0(item, frames[0]);
-	if (phd_ClipBoundingBox(frames[0]))
 	{
-		//CalculateObjectLighting(item, frames[0]);
+		for (int i = 0; i < 6; i++)
-
-		if (item->data == NULL)
-			extra_rotation = NullRotations;
-		else
-			extra_rotation = (short*)item->data;
-
-		mesh = &Meshes[Objects[item->objectNumber].meshIndex];
-		bones = &Bones[obj->boneIndex];
-		bit = 1;
-
-		if (!frac)
 		{
-			phd_TranslateRel((int)*(frames[0] + 6), (int)*(frames[0] + 7), (int)*(frames[0] + 8)); // can be [0][6] etc.. ?
+			InterpolatedBounds[i] = *(framePtr[0]) + ((*(framePtr[1]) - *(framePtr[0])) * frac) / rate;
-			rotation1 = (short*)(frames[0] + 9);
+			framePtr[0]++;
-			gar_RotYXZsuperpack(&rotation1, 0);
+			framePtr[1]++;
-
-			if (item->meshBits & bit)
-				phd_PutPolygons(*mesh);
-
-			for (i = (obj->nmeshes - 1); i > 0; i--, bones += 4, mesh += 2)
-			{
-				poppush = *bones;
-
-				if (poppush & 1)
-				{
-					phd_PopMatrix();
-					phd_PopDxMatrix();
-				}
-
-				if (poppush & 2)
-					phd_PushMatrix();
-
-				phd_TranslateRel(*(bones + 1), *(bones + 2), *(bones + 3));
-				gar_RotYXZsuperpack(&rotation1, 0);
-
-				if (extra_rotation && (poppush & (ROT_X | ROT_Y | ROT_Z)))
-				{
-					if (poppush & ROT_Y)
-						phd_RotY(*(extra_rotation++));
-					if (poppush & ROT_X)
-						phd_RotX(*(extra_rotation++));
-					if (poppush & ROT_Z)
-						phd_RotZ(*(extra_rotation++));
-				}
-
-				bit <<= 1;
-				if (item->meshBits & bit)
-					phd_PutPolygons(*mesh);
-			}
-		}
-		else
-		{
-			InitInterpolate(frac, rate);
-			phd_TranslateRel_ID((int)*(frames[0] + 6), (int)*(frames[0] + 7), (int)*(frames[0] + 8), (int)*(frames[1] + 6), (int)*(frames[1] + 7), (int)*(frames[1] + 8));
-			rotation1 = (short*)(frames[0] + 9);
-			rotation2 = (short*)(frames[1] + 9);
-			gar_RotYXZsuperpack_I(&rotation1, &rotation2, 0);
-
-			if (item->meshBits & bit)
-				phd_PutPolygons_I(*mesh);
-
-			for (i = (obj->nmeshes - 1); i > 0; i--, bones += 4, mesh += 2)
-			{
-				poppush = *bones;
-				if (poppush & 1)
-					phd_PopMatrix_I();
-
-				if (poppush & 2)
-					phd_PushMatrix_I();
-
-				phd_TranslateRel_I(*(bones + 1), *(bones + 2), *(bones + 3));
-				gar_RotYXZsuperpack_I(&rotation1, &rotation2, 0);
-
-				if (extra_rotation && (poppush & (ROT_X | ROT_Y | ROT_Z)))
-				{
-					if (poppush & ROT_Y)
-						phd_RotY_I(*(extra_rotation++));
-					if (poppush & ROT_X)
-						phd_RotX_I(*(extra_rotation++));
-					if (poppush & ROT_Z)
-						phd_RotZ_I(*(extra_rotation++));
-				}
-
-				bit <<= 1;
-				if (item->meshBits & bit)
-					phd_PutPolygons_I(*mesh);
-			}
 		}
+		return InterpolatedBounds;
 	}
+}
 
-	PhdRight = PhdWidth;
+short* GetBestFrame(ITEM_INFO* item)
-	PhdLeft = 0;
+{
-	PhdTop = 0;
+	int rate = 0;
-	PhdBottom = PhdHeight;
+	short* framePtr[2];
-	phd_PopMatrix();
+
-	phd_PopDxMatrix();*/
+	int frac = GetFrame_D2(item, framePtr, &rate);
+
+	if (frac <= (rate >> 1))
+		return framePtr[0];
+	else
+		return framePtr[1];
 }
 
 int GetFrame_D2(ITEM_INFO* item, short* framePtr[], int* rate)
@@ -223,6 +134,57 @@ int GetFrame_D2(ITEM_INFO* item, short* framePtr[], int* rate)
 	return(interp);
 }
 
+bool TIME_Reset()
+{
+	LARGE_INTEGER fq;
+
+	QueryPerformanceCounter(&fq);
+
+	LdSync = (double)fq.LowPart + (double)fq.HighPart * (double)0xffffffff;
+	LdSync /= LdFreq;
+
+	return true;
+}
+
+bool TIME_Init()
+{
+	LARGE_INTEGER fq;
+
+	if (!QueryPerformanceFrequency(&fq))
+		return false;
+
+	LdFreq = (double)fq.LowPart + (double)fq.HighPart * (double)0xFFFFFFFF;
+	LdFreq /= 60.0;
+
+	TIME_Reset();
+
+	return true;
+}
+
+int Sync()
+{
+	int nFrames;
+	LARGE_INTEGER ct;
+	double dCounter;
+	
+	QueryPerformanceCounter(&ct);
+	
+	dCounter = (double)ct.LowPart + (double)ct.HighPart * (double)0xFFFFFFFF;
+	dCounter /= LdFreq;
+	
+	nFrames = long(dCounter) - long(LdSync);
+	
+	LdSync = dCounter;
+	
+	return nFrames;
+}
+
+void DrawAnimatingItem(ITEM_INFO* item)
+{
+	// TODO: to refactor
+	// Empty stub because actually we disable items draing when drawRoutine pointer is NULL in OBJECT_INFO
+}
+
 void _InitInterpolate(void)
 {
 }
@@ -349,5 +311,7 @@ void _phd_PopMatrix_I(void)
 
 void Inject_Draw()
 {
-	//INJECT(0x0042B900, DrawAnimatingItem);
+	/*INJECT(GetBoundsAccurate, 0x0042CF80);
+	INJECT(GetBestFrame, 0x0042D020);
+	INJECT(Sync, 0x004D1A40);*/
 }

TR5Main/Game/draw.h

@@ -2,10 +2,10 @@
 
 #include "..\Global\global.h"
 
-#define GetBoundsAccurate ((short* (__cdecl*)(ITEM_INFO*)) 0x0042CF80)
+//#define GetBoundsAccurate ((short* (__cdecl*)(ITEM_INFO*)) 0x0042CF80)
-#define GetBestFrame ((short* (__cdecl*)(ITEM_INFO*)) 0x0042D020)
+//#define GetBestFrame ((short* (__cdecl*)(ITEM_INFO*)) 0x0042D020)
 #define CalcLaraMatrices ((void (__cdecl*)(int)) 0x0041E120)
-#define Sync ((int (__cdecl*)()) 0x004D1A40)
+//#define Sync ((int (__cdecl*)()) 0x004D1A40)
 #define IsRoomOutside ((int (__cdecl*)(int, int, int)) 0x00418E90) 
 #define sub_42B4C0 ((void (__cdecl*)(ITEM_INFO*,short*)) 0x0042B4C0)
 
@@ -54,9 +54,14 @@ extern byte SkyStormColor[3];
 extern byte SkyStormColor2[3];
 
 int DrawPhaseGame();
-void DrawAnimatingItem(ITEM_INFO* item);
 int GetFrame_D2(ITEM_INFO* item, short* framePtr[], int* rate);
 void UpdateStorm();
+short* GetBoundsAccurate(ITEM_INFO* item);
+short* GetBestFrame(ITEM_INFO* item);
+int Sync();
+bool TIME_Init();
+bool TIME_Reset();
+void DrawAnimatingItem(ITEM_INFO* item);
 
 /* phd function (DX11 version) */
 // TODO: phd_XX function after this lign is used with DX11 one, when it's finished, delete the #define one and delete this sign: "_" at the beginning of the new function. (delete the unused if needed)

TR5Main/Game/healt.cpp

@@ -2,6 +2,7 @@
 #include "draw.h"
 #include "pickup.h"
 #include "lara.h"
+#include "camera.h"
 
 short PickupX;
 short PickupY;

TR5Main/Objects/TR3/tr3_sophia.cpp

@@ -1108,7 +1108,7 @@ void LondonBossControl(short item_number)
 
 void S_DrawLondonBoss(ITEM_INFO* item)
 {
-	DrawAnimatingItem(item);
+	//DrawAnimatingItem(item);
 
 	if (bossdata.explode_count)
 	{

TR5Main/Objects/TR3/tr3_tony.cpp

@@ -654,7 +654,7 @@ void TonyControl(short itemNum)
 
 void DrawTony(ITEM_INFO* item)
 {
-	DrawAnimatingItem(item);
+	//DrawAnimatingItem(item);
 
 	// TODO: psx draw (need to be rewrited !)
 	//if (bossdata.explode_count && item->hitPoints <= 0)

TR5Main/Objects/Vehicles/kayak.cpp

@@ -1186,7 +1186,7 @@ void InitialiseKayak(short item_number)
 void DrawKayak(ITEM_INFO* kayak)
 {
 	kayak->pos.yPos += KAYAK_DRAW_SHIFT;
-	DrawAnimatingItem(kayak);
+	//DrawAnimatingItem(kayak);
 	kayak->pos.yPos -= KAYAK_DRAW_SHIFT;
 }
 

TR5Main/Specific/init.h

@@ -2,7 +2,7 @@
 
 #include "..\Global\global.h"
 
-#define TIME_Init ((void (__cdecl*)(void)) 0x004D19D0)
+//#define TIME_Init ((void (__cdecl*)(void)) 0x004D19D0)
 #define SOUND_Init ((int (__cdecl*)(void)) 0x004790A0)
 
 #define LoadSettings ((int (__cdecl*)(void)) 0x004BDE20)