celisej567/mcpe
1
0
Fork 0
mirror of https://github.com/celisej567/mcpe.git synced 2026-09-17 20:10:23 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added field names for Timer (#64)

Browse Source 
* Update Timer.hpp

* Update Timer.cpp

* Fixed member names & replaced all references
This commit is contained in:
Alexander Argentakis
2023-08-20 21:19:04 +03:00
committed by GitHub
parent a35318fc7f
commit a6d05eb6f3
3 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/Minecraft.cpp
View File

@@ -514,7 +514,7 @@ void Minecraft::tickInput()
goto label_12;
}
if (!m_pScreen && (field_DA8 - field_DAC) >= (m_timer.field_10 * 0.25f))
if (!m_pScreen && (field_DA8 - field_DAC) >= (m_timer.m_ticksPerSecond * 0.25f))
{
handleMouseClick(1);
field_DAC = field_DA8;
@@ -695,9 +695,9 @@ void Minecraft::update()
{
if (field_288 && m_pLevel)
{
float x = m_timer.field_18;
float x = m_timer.m_renderTicks;
m_timer.advanceTime();
m_timer.field_18 = x;
m_timer.m_renderTicks = x;
}
else
{
@@ -709,7 +709,7 @@ void Minecraft::update()
m_pRakNetInstance->runEvents(m_pNetEventCallback);
}
for (int i = 0; i < m_timer.field_14; i++)
for (int i = 0; i < m_timer.m_ticks; i++)
{
tick();
field_DA8++;
@@ -724,14 +724,14 @@ void Minecraft::update()
tickMouse();
#endif
m_pGameRenderer->render(m_timer.field_18);
m_pGameRenderer->render(m_timer.m_renderTicks);
double time = double(getTimeS());
m_fDeltaTime = time - m_fLastUpdated;
m_fLastUpdated = time;
// Added by iProgramInCpp
m_pGameMode->render(m_timer.field_18);
m_pGameMode->render(m_timer.m_renderTicks);
}
void Minecraft::init()

58
source/common/Timer.cpp
View File

@@ -45,56 +45,56 @@ void Timer::advanceTime()
#else
int timeMs = getTimeMs();
#endif
if (timeMs - field_4 <= 1000)
if (timeMs - m_lastSyncTime <= 1000)
{
if (timeMs - field_4 < 0)
if (timeMs - m_lastSyncTime < 0)
{
field_4 = field_8 = timeMs;
m_lastSyncTime = m_unprocessedTime = timeMs;
}
}
else
{
#ifdef USE_ACCURATE_TIMER
double diff1 = timeMs - field_4;
double diff2 = timeMs - field_8;
double diff1 = timeMs - m_lastSyncTime;
double diff2 = timeMs - m_unprocessedTime;
#else
int diff1 = timeMs - field_4;
int diff2 = timeMs - field_8;
int diff1 = timeMs - m_lastSyncTime;
int diff2 = timeMs - m_unprocessedTime;
#endif
field_C += ((float(diff1) / float(diff2)) - field_C) * 0.2f;
m_tickAdjustment += ((float(diff1) / float(diff2)) - m_tickAdjustment) * 0.2f;
}
float diff = float(timeMs) / 1000.0f - field_0;
field_0 = float(timeMs) / 1000.0f;
float diff = float(timeMs) / 1000.0f - m_lastUpdateTime;
m_lastUpdateTime = float(timeMs) / 1000.0f;
float x1 = diff * field_C;
float x1 = diff * m_tickAdjustment;
if (x1 > 1) x1 = 1;
if (x1 < 0) x1 = 0;
float x2 = field_20 + x1 * field_1C * field_10;
field_14 = int(x2);
field_20 = x2 - field_14;
field_18 = x2 - field_14;
if (field_14 > 10)
field_14 = 10;
float x2 = m_partialTicks + x1 * m_timerSpeed * m_ticksPerSecond;
m_ticks = int(x2);
m_partialTicks = x2 - m_ticks;
m_renderTicks = x2 - m_ticks;
if (m_ticks > 10)
m_ticks = 10;
}
Timer::Timer()
{
field_0 = 0;
m_lastUpdateTime = 0;
#ifndef USE_ACCURATE_TIMER
field_4 = 0;
field_8 = 0;
m_lastSyncTime = 0;
m_unprocessedTime = 0;
#else
field_4 = 0;
field_8 = 0;
m_lastSyncTime = 0;
m_unprocessedTime = 0;
#endif
field_C = 1.0f;
field_10 = 20.0f;
field_14 = 0;
field_18 = 0;
field_1C = 1.0f;
field_20 = 0;
m_tickAdjustment = 1.0f;
m_ticksPerSecond = 20.0f;
m_ticks = 0;
m_renderTicks = 0;
m_timerSpeed = 1.0f;
m_partialTicks = 0;
field_4 = field_8 = getTimeMs();
m_lastSyncTime = m_unprocessedTime = getTimeMs();
}

22
source/common/Timer.hpp
View File

@@ -20,19 +20,19 @@ public:
void advanceTime();
public:
float field_0;
float m_lastUpdateTime;
#ifndef USE_ACCURATE_TIMER
int field_4;
int field_8;
int m_lastSyncTime;
int m_unprocessedTime;
#else
double field_4;
double field_8;
double m_lastSyncTime;
double m_unprocessedTime;
#endif
float field_C;
float field_10;
int field_14;
float field_18;
float field_1C;
float field_20;
float m_tickAdjustment;
float m_ticksPerSecond;
int m_ticks;
float m_renderTicks;
float m_timerSpeed;
float m_partialTicks;
};