memartel/SQCSimulator2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online

Browse Source
This commit is contained in:
Claudel-D-Roy
2023-12-06 14:31:13 -05:00
parent a79bf0d1eb 242250f251
commit 2596a35af4
5 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SQCSim2021/engine.cpp
View File

@@ -1332,8 +1332,6 @@ void Engine::Render(float elapsedTime) {
if (m_isSkybox) m_skybox.Render(skybox);
DrawHud(elapsedTime, bloc);
DisplayPovGun();
ProcessNotificationQueue();
if (m_damage) {
InstantDamage();
@@ -1420,8 +1418,9 @@ void Engine::Render(float elapsedTime) {
}
if (m_syncs.count(sync.timestamp)) {
Sync comp = m_syncs[sync.timestamp];
m_player.InflictDamage(sync.hp - comp.hp);
std::cout << "HP: " << sync.hp << std::endl;
//m_player.InflictDamage(sync.hp - comp.hp);
Vector3f diff = sync.position - comp.position;
@@ -1502,6 +1501,9 @@ void Engine::Render(float elapsedTime) {
glEnable(GL_CULL_FACE);
}
DrawHud(elapsedTime, bloc);
DisplayPovGun();
}
}