ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Project64] Clean up FramePerSecondClass.cpp

This commit is contained in:
zilmar 2015-12-24 06:41:11 +11:00
parent 58c125d337
commit 6ffd1663ca
2 changed files with 149 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Project64-core/N64System/FramePerSecondClass.cpp
View File

@ -13,12 +13,12 @@
#include <Project64-core/N64System/N64Types.h> #include <Project64-core/N64System/N64Types.h>
#include <Windows.h> #include <Windows.h>
CFramePerSecond::CFramePerSecond () CFramePerSecond::CFramePerSecond()
{ {
m_iFrameRateType = g_Settings->LoadDword(UserInterface_FrameDisplayType); m_iFrameRateType = g_Settings->LoadDword(UserInterface_FrameDisplayType);
m_ScreenHertz = g_Settings->LoadDword(GameRunning_ScreenHertz); m_ScreenHertz = g_Settings->LoadDword(GameRunning_ScreenHertz);
g_Settings->RegisterChangeCB(UserInterface_FrameDisplayType,this,(CSettings::SettingChangedFunc)FrameRateTypeChanged); g_Settings->RegisterChangeCB(UserInterface_FrameDisplayType, this, (CSettings::SettingChangedFunc)FrameRateTypeChanged);
g_Settings->RegisterChangeCB(GameRunning_ScreenHertz,this,(CSettings::SettingChangedFunc)ScreenHertzChanged); g_Settings->RegisterChangeCB(GameRunning_ScreenHertz, this, (CSettings::SettingChangedFunc)ScreenHertzChanged);
if (m_ScreenHertz == 0) if (m_ScreenHertz == 0)
{ {
@ -33,16 +33,16 @@ CFramePerSecond::CFramePerSecond ()
CFramePerSecond::~CFramePerSecond() CFramePerSecond::~CFramePerSecond()
{ {
g_Settings->UnregisterChangeCB(UserInterface_FrameDisplayType,this,(CSettings::SettingChangedFunc)FrameRateTypeChanged); g_Settings->UnregisterChangeCB(UserInterface_FrameDisplayType, this, (CSettings::SettingChangedFunc)FrameRateTypeChanged);
g_Settings->UnregisterChangeCB(GameRunning_ScreenHertz,this,(CSettings::SettingChangedFunc)ScreenHertzChanged); g_Settings->UnregisterChangeCB(GameRunning_ScreenHertz, this, (CSettings::SettingChangedFunc)ScreenHertzChanged);
} }
void CFramePerSecond::Reset (bool ClearDisplay) void CFramePerSecond::Reset(bool ClearDisplay)
{ {
m_CurrentFrame = 0; m_CurrentFrame = 0;
m_LastFrame = 0; m_LastFrame = 0;
for (int count = 0; count < NoOfFrames; count ++) for (int count = 0; count < NoOfFrames; count++)
{ {
m_Frames[count] = 0; m_Frames[count] = 0;
} }
@ -58,7 +58,7 @@ void CFramePerSecond::Reset (bool ClearDisplay)
} }
} }
void CFramePerSecond::UpdateViCounter ( void ) void CFramePerSecond::UpdateViCounter(void)
{ {
if (m_iFrameRateType != FR_VIs && m_iFrameRateType != FR_PERCENT) if (m_iFrameRateType != FR_VIs && m_iFrameRateType != FR_PERCENT)
{ {
@ -90,7 +90,7 @@ void CFramePerSecond::DisplayViCounter(uint32_t FrameRate)
__int64 Total; __int64 Total;
Total = 0; Total = 0;
for (int count = 0; count < NoOfFrames; count ++) for (int count = 0; count < NoOfFrames; count++)
{ {
Total += m_Frames[count]; Total += m_Frames[count];
} }
@ -116,7 +116,7 @@ void CFramePerSecond::DisplayViCounter(uint32_t FrameRate)
__int64 Total; __int64 Total;
Total = 0; Total = 0;
for (int count = 0; count < NoOfFrames; count ++) for (int count = 0; count < NoOfFrames; count++)
{ {
Total += m_Frames[count]; Total += m_Frames[count];
} }
@ -128,23 +128,23 @@ void CFramePerSecond::DisplayViCounter(uint32_t FrameRate)
return; return;
} }
} }
g_Notify->DisplayMessage2(stdstr_f("%.1f %%",Percent * 100).ToUTF16().c_str()); g_Notify->DisplayMessage2(stdstr_f("%.1f %%", Percent * 100).ToUTF16().c_str());
} }
} }
void CFramePerSecond::FrameRateTypeChanged (CFramePerSecond * _this) void CFramePerSecond::FrameRateTypeChanged(CFramePerSecond * _this)
{ {
_this->m_iFrameRateType = g_Settings->LoadDword(UserInterface_FrameDisplayType); _this->m_iFrameRateType = g_Settings->LoadDword(UserInterface_FrameDisplayType);
_this->Reset(true); _this->Reset(true);
} }
void CFramePerSecond::ScreenHertzChanged (CFramePerSecond * _this) void CFramePerSecond::ScreenHertzChanged(CFramePerSecond * _this)
{ {
_this->m_ScreenHertz = g_Settings->LoadDword(GameRunning_ScreenHertz); _this->m_ScreenHertz = g_Settings->LoadDword(GameRunning_ScreenHertz);
_this->Reset(true); _this->Reset(true);
} }
void CFramePerSecond::UpdateDlCounter ( void ) void CFramePerSecond::UpdateDlCounter(void)
{ {
if (m_iFrameRateType != FR_DLs) if (m_iFrameRateType != FR_DLs)
{ {
@ -177,7 +177,7 @@ void CFramePerSecond::DisplayDlCounter(uint32_t FrameRate)
__int64 Total; __int64 Total;
Total = 0; Total = 0;
for (int count = 0; count < NoOfFrames; count ++) for (int count = 0; count < NoOfFrames; count++)
{ {
Total += m_Frames[count]; Total += m_Frames[count];
} }

14
Source/Project64-core/N64System/FramePerSecondClass.h
View File

@ -13,15 +13,15 @@
class CFramePerSecond class CFramePerSecond
{ {
public: public:
CFramePerSecond ( void ); CFramePerSecond(void);
~CFramePerSecond ( void ); ~CFramePerSecond(void);
void Reset ( bool ClearDisplay ); void Reset(bool ClearDisplay);
void UpdateDlCounter ( void ); void UpdateDlCounter(void);
void UpdateViCounter ( void ); void UpdateViCounter(void);
void DisplayDlCounter ( uint32_t FrameRate ); void DisplayDlCounter(uint32_t FrameRate);
void DisplayViCounter ( uint32_t FrameRate ); void DisplayViCounter(uint32_t FrameRate);
private: private:
static void FrameRateTypeChanged(CFramePerSecond * _this); static void FrameRateTypeChanged(CFramePerSecond * _this);