8 files changed, 220 insertions, 2 deletions

diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 09759c28..4fefe9a9 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -96,6 +96,11 @@ int32 &JoyButtonJustClicked = *(int32*)0x628D10;
 bool &holdingScrollBar = *(bool*)0x628D59;
 //int32 *pControlTemp = 0;
 
+#ifndef MASTER
+bool CMenuManager::m_PrefsMarketing = false;
+bool CMenuManager::m_PrefsDisableTutorials = false;
+#endif // !MASTER
+
 // 0x5F311C
 const char* FrontendFilenames[][2] = {
 	{"fe2_mainpanel_ul", "" },
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index b7215fa4..30e4f652 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -497,6 +497,12 @@ public:
 	static int32 &sthWithButtons;
 	static int32 &sthWithButtons2;
 
+#ifndef MASTER

+	static bool m_PrefsMarketing;

+	static bool m_PrefsDisableTutorials;

+#endif // !MASTER

+
+
 public:
 	static void BuildStatLine(char *text, void *stat, uint8 aFloat, void *stat2);
 	static void CentreMousePointer();
diff --git a/src/core/Timer.cpp b/src/core/Timer.cpp
index a46e1d8b..18d6b6a3 100644
--- a/src/core/Timer.cpp
+++ b/src/core/Timer.cpp
@@ -214,6 +214,11 @@ void CTimer::EndUserPause(void)
 	m_UserPause = false;
 }
 
+uint32 CTimer::GetCyclesPerFrame()
+{
+	return 20;
+}
+
 #if 1
 STARTPATCHES	
 	InjectHook(0x4ACE60, CTimer::Initialise, PATCH_JUMP);
diff --git a/src/core/Timer.h b/src/core/Timer.h
index ef525be7..2498ec8a 100644
--- a/src/core/Timer.h
+++ b/src/core/Timer.h
@@ -34,6 +34,7 @@ public:
 	static void SetPreviousTimeInMilliseconds(uint32 t) { m_snPreviousTimeInMilliseconds = t; }
 	static const float &GetTimeScale(void) { return ms_fTimeScale; }
 	static void SetTimeScale(float ts) { ms_fTimeScale = ts; }
+	static uint32 GetCyclesPerFrame();
 
 	static bool GetIsPaused() { return m_UserPause || m_CodePause; }
 	static bool GetIsUserPaused() { return m_UserPause; }
diff --git a/src/core/config.h b/src/core/config.h
index b4f3b7b2..58885e57 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -169,8 +169,9 @@ enum Config {
 	// not in any game
 #	define NASTY_GAME	// nasty game for all languages
 #	define NO_MOVIES	// disable intro videos
-#   define NO_CDCHECK
+#	define NO_CDCHECK
 #	define CHATTYSPLASH	// print what the game is loading
+//#	define TIMEBARS		// print debug timers
 #endif
 
 #define FIX_BUGS		// fixes bugs that we've came across during reversing, TODO: use this more
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 50543b1e..674527f5 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -51,6 +51,7 @@
 #include "Script.h"
 #include "Debug.h"
 #include "Console.h"
+#include "timebars.h"
 
 #define DEFAULT_VIEWWINDOW (Tan(DEGTORAD(CDraw::GetFOV() * 0.5f)))
 
@@ -141,6 +142,11 @@ Idle(void *arg)
 #endif
 
 	CTimer::Update();
+
+#ifdef TIMEBARS
+	tbInit();
+#endif
+
 	CSprite2d::InitPerFrame();
 	CFont::InitPerFrame();
 
@@ -155,16 +161,39 @@ Idle(void *arg)
 		FrontEndMenuManager.Process();
 	} else {
 		CPointLights::InitPerFrame();
+#ifdef TIMEBARS
+		tbStartTimer(0, "CGame::Process");

+#endif
 		CGame::Process();
+#ifdef TIMEBARS
+		tbEndTimer("CGame::Process");
+		tbStartTimer(0, "DMAudio.Service");

+#endif
 		DMAudio.Service();
+
+#ifdef TIMEBARS
+		tbEndTimer("DMAudio.Service");

+#endif
 	}
 
 	if (RsGlobal.quit)
 		return;
 #else
 	CPointLights::InitPerFrame();
+#ifdef TIMEBARS
+	tbStartTimer(0, "CGame::Process");

+#endif
 	CGame::Process();
+#ifdef TIMEBARS
+	tbEndTimer("CGame::Process");
+	tbStartTimer(0, "DMAudio.Service");

+#endif
+
 	DMAudio.Service();
+
+#ifdef TIMEBARS
+	tbEndTimer("DMAudio.Service");

+#endif
 #endif
 
 	if(CGame::bDemoMode && CTimer::GetTimeInMilliseconds() > (3*60 + 30)*1000 && !CCutsceneMgr::IsCutsceneProcessing()){
@@ -192,8 +221,18 @@ Idle(void *arg)
 			RsMouseSetPos(&pos);
 		}
 #endif
+#ifdef TIMEBARS
+		tbStartTimer(0, "CnstrRenderList");

+#endif
 		CRenderer::ConstructRenderList();
+#ifdef TIMEBARS
+		tbEndTimer("CnstrRenderList");
+		tbStartTimer(0, "PreRender");

+#endif
 		CRenderer::PreRender();
+#ifdef TIMEBARS
+		tbEndTimer("PreRender");

+#endif
 
 		if(CWeather::LightningFlash && !CCullZones::CamNoRain()){
 			if(!DoRWStuffStartOfFrame_Horizon(255, 255, 255, 255, 255, 255, 255))
@@ -211,16 +250,31 @@ Idle(void *arg)
 		RwCameraSetFarClipPlane(Scene.camera, CTimeCycle::GetFarClip());
 		RwCameraSetFogDistance(Scene.camera, CTimeCycle::GetFogStart());
 
+#ifdef TIMEBARS
+		tbStartTimer(0, "RenderScene");

+#endif
 		RenderScene();
+#ifdef TIMEBARS
+		tbEndTimer("RenderScene");

+#endif
 		RenderDebugShit();
 		RenderEffects();
 
+#ifdef TIMEBARS

+		tbStartTimer(0, "RenderMotionBlur");

+#endif
 		if((TheCamera.m_BlurType == MBLUR_NONE || TheCamera.m_BlurType == MBLUR_NORMAL) &&
 		   TheCamera.m_ScreenReductionPercentage > 0.0f)
 		        TheCamera.SetMotionBlurAlpha(150);
 		TheCamera.RenderMotionBlur();
-
+#ifdef TIMEBARS
+		tbEndTimer("RenderMotionBlur");
+		tbStartTimer(0, "Render2dStuff");

+#endif
 		Render2dStuff();
+#ifdef TIMEBARS
+		tbEndTimer("Render2dStuff");

+#endif
 	}else{
 		float viewWindow = DEFAULT_VIEWWINDOW;
 #ifdef ASPECT_RATIO_SCALE
@@ -238,10 +292,29 @@ Idle(void *arg)
 	if (FrontEndMenuManager.m_bMenuActive)
 		DefinedState();
 #endif
+#ifdef TIMEBARS
+	tbStartTimer(0, "RenderMenus");

+#endif
 	RenderMenus();
+#ifdef TIMEBARS
+	tbEndTimer("RenderMenus");
+	tbStartTimer(0, "DoFade");

+#endif
 	DoFade();
+#ifdef TIMEBARS
+	tbEndTimer("DoFade");
+	tbStartTimer(0, "Render2dStuff-Fade");

+#endif
 	Render2dStuffAfterFade();
+#ifdef TIMEBARS
+	tbEndTimer("Render2dStuff-Fade");

+#endif
 	CCredits::Render();
+
+#ifdef TIMEBARS
+	tbDisplay();
+#endif
+
 	DoRWStuffEndOfFrame();
 
 //	if(g_SlowMode) 
diff --git a/src/core/timebars.cpp b/src/core/timebars.cpp
new file mode 100644
index 00000000..30421731
--- /dev/null
+++ b/src/core/timebars.cpp
@@ -0,0 +1,121 @@
+#ifndef MASTER

+#include "common.h"

+#include "Font.h"

+#include "Frontend.h"

+#include "Timer.h"

+#include "Text.h"

+

+#define MAX_TIMERS (50)

+#define MAX_MS_COLLECTED (40)

+

+// enables frame time output

+#define FRAMETIME

+

+struct sTimeBar

+{

+	char name[20];

+	float startTime;

+	float endTime;

+	int32 unk;

+};

+

+struct

+{

+	sTimeBar Timers[MAX_TIMERS];

+	uint32 count;

+} TimerBar;

+float MaxTimes[MAX_TIMERS];

+float MaxFrameTime;

+

+uint32 curMS;

+uint32 msCollected[MAX_MS_COLLECTED];

+#ifdef FRAMETIME

+float FrameInitTime;

+#endif

+

+void tbInit()

+{

+	TimerBar.count = 0;

+	uint32 i = CTimer::GetFrameCounter() & 0x7F;

+	if (i == 0) {

+		do

+			MaxTimes[i++] = 0.0f;

+		while (i != MAX_TIMERS);

+#ifdef FRAMETIME

+		MaxFrameTime = 0.0f;

+#endif

+	}

+#ifdef FRAMETIME

+	FrameInitTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();

+#endif

+}

+

+void tbStartTimer(int32 unk, char *name)

+{

+	strcpy(TimerBar.Timers[TimerBar.count].name, name);

+	TimerBar.Timers[TimerBar.count].unk = unk;

+	TimerBar.Timers[TimerBar.count].startTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();

+	TimerBar.count++;

+}

+

+void tbEndTimer(char* name)

+{

+	uint32 n = 1500;

+	for (uint32 i = 0; i < TimerBar.count; i++) {

+		if (strcmp(name, TimerBar.Timers[i].name) == 0)

+			n = i;

+	}

+	assert(n != 1500);

+	TimerBar.Timers[n].endTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();

+}

+

+float Diag_GetFPS()

+{

+	return 39000.0f / (msCollected[(curMS - 1) % MAX_MS_COLLECTED] - msCollected[curMS % MAX_MS_COLLECTED]);

+}

+

+void tbDisplay()

+{

+	char temp[200];

+	wchar wtemp[200];

+

+#ifdef FRAMETIME

+	float FrameEndTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();

+#endif

+

+	msCollected[(curMS++) % MAX_MS_COLLECTED] = RsTimer();

+	CFont::SetBackgroundOff();

+	CFont::SetBackgroundColor(CRGBA(0, 0, 0, 128));

+	CFont::SetScale(0.48f, 1.12f);

+	CFont::SetCentreOff();

+	CFont::SetJustifyOff();

+	CFont::SetWrapx(640.0f);

+	CFont::SetRightJustifyOff();

+	CFont::SetPropOn();

+	CFont::SetFontStyle(FONT_BANK);

+	sprintf(temp, "FPS: %.2f", Diag_GetFPS());

+	AsciiToUnicode(temp, wtemp);

+	CFont::SetColor(CRGBA(255, 255, 255, 255));

+	if (!CMenuManager::m_PrefsMarketing || !CMenuManager::m_PrefsDisableTutorials) {

+		CFont::PrintString(RsGlobal.maximumWidth * (4.0f / DEFAULT_SCREEN_WIDTH), RsGlobal.maximumHeight * (4.0f / DEFAULT_SCREEN_HEIGHT), wtemp);

+

+#ifndef FINAL

+		// Timers output (my own implementation)

+		for (uint32 i = 0; i < TimerBar.count; i++) {

+			MaxTimes[i] = max(MaxTimes[i], TimerBar.Timers[i].endTime - TimerBar.Timers[i].startTime);

+			sprintf(temp, "%s: %.2f", &TimerBar.Timers[i].name[0], MaxTimes[i]);

+			AsciiToUnicode(temp, wtemp);

+			CFont::PrintString(RsGlobal.maximumWidth * (4.0f / DEFAULT_SCREEN_WIDTH), RsGlobal.maximumHeight * ((8.0f * (i + 2)) / DEFAULT_SCREEN_HEIGHT), wtemp);

+		}

+

+#ifdef FRAMETIME

+		MaxFrameTime = max(MaxFrameTime, FrameEndTime - FrameInitTime);

+		sprintf(temp, "Frame Time: %.2f", MaxFrameTime);

+		AsciiToUnicode(temp, wtemp);

+

+		CFont::PrintString(RsGlobal.maximumWidth * (4.0f / DEFAULT_SCREEN_WIDTH), RsGlobal.maximumHeight * ((8.0f * (TimerBar.count + 4)) / DEFAULT_SCREEN_HEIGHT), wtemp);

+#endif // FRAMETIME

+#endif // !FINAL

+	}

+}

+#endif // !MASTER
\ No newline at end of file
diff --git a/src/core/timebars.h b/src/core/timebars.h
new file mode 100644
index 00000000..8ffccd8e
--- /dev/null
+++ b/src/core/timebars.h
@@ -0,0 +1,6 @@
+#pragma once

+

+void tbInit();

+void tbStartTimer(int32, char*);

+void tbEndTimer(char*);

+void tbDisplay();
\ No newline at end of file