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

ehm

Browse Source
This commit is contained in:
MarcEricMartel 2023-11-27 16:43:18 -05:00
parent e8ca08ecab
commit 10b8d77734
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SQCSim-srv/server.cpp
View File

@ -225,7 +225,6 @@ void Server::Run() {
break; break;
case SYNC: case SYNC:
if (Deserialize(&sync, pck, &bsize)) {} if (Deserialize(&sync, pck, &bsize)) {}
//m_nsync = true;
break; break;
default: break; default: break;
} }
@ -234,7 +233,7 @@ void Server::Run() {
if (conn->m_nsync) { if (conn->m_nsync) {
conn->Run(m_world); conn->Run(m_world);
conn->sendPacks(m_sock_udp, m_players); conn->sendPacks(m_sock_udp, m_players, 0);
} }
} }
} }

9
SQCSim2021/engine.cpp
View File

@ -332,7 +332,7 @@ void Engine::Init() {
glEnable(GL_STENCIL_TEST); glEnable(GL_STENCIL_TEST);
glEnable(GL_POINT_SMOOTH); glEnable(GL_POINT_SMOOTH);
glEnable(GL_BLEND); glEnable(GL_BLEND);
//glEnable(GL_CULL_FACE); glEnable(GL_CULL_FACE);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
@ -739,6 +739,7 @@ void Engine::DisplayHud(int timer) {
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
glLoadIdentity(); glLoadIdentity();
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glClear(GL_STENCIL_BUFFER_BIT);
float itemBackgroundWidthProportion = 0.25f; float itemBackgroundWidthProportion = 0.25f;
float itemBackgroundHeightProportion = 0.175f; float itemBackgroundHeightProportion = 0.175f;
@ -1334,10 +1335,10 @@ void Engine::Render(float elapsedTime) {
Sync comp = m_syncs[sync.timestamp]; Sync comp = m_syncs[sync.timestamp];
m_player.InflictDamage(sync.hp - comp.hp); m_player.InflictDamage(sync.hp - comp.hp);
std::cout << "SID: " << sync.sid << "HP: " << sync.hp << " Pos: " << sync.position << std::endl; std::cout << comp.position << " - " << sync.position << std::endl;
Vector3f diff = sync.position - comp.position; Vector3f diff = sync.position - comp.position;
if (diff.Length() > .5) if (diff.Length() > 2.5)
m_player.Move(diff); m_player.Move(diff);
// TODO: Syncer sync.timer avec le timer // TODO: Syncer sync.timer avec le timer
@ -1363,12 +1364,14 @@ void Engine::Render(float elapsedTime) {
} }
lsPck.clear(); lsPck.clear();
glDisable(GL_CULL_FACE);
for (auto& [key, player] : m_players) { for (auto& [key, player] : m_players) {
RemotePlayer* rt = static_cast<RemotePlayer*>(player); RemotePlayer* rt = static_cast<RemotePlayer*>(player);
glClear(GL_STENCIL_BUFFER_BIT); glClear(GL_STENCIL_BUFFER_BIT);
rt->Render(m_animeAtlas, m_shader01, all, elapsedTime); rt->Render(m_animeAtlas, m_shader01, all, elapsedTime);
m_otherplayerpos = player->GetPosition(); // Aller chercher GetPosition des deux façon, voir si ça chie. m_otherplayerpos = player->GetPosition(); // Aller chercher GetPosition des deux façon, voir si ça chie.
} }
glEnable(GL_CULL_FACE);
} }
} }