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

SQC-15_online #1

Merged
memartel merged 349 commits from SQC-15_online into master 2023-12-10 17:41:26 -05:00
Conversation 0 Commits 349 Files Changed 181 +3 -4
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2a7fe7e806 - Show all commits

2
SQCSim-srv/server.cpp
View File

@@ -85,7 +85,7 @@ int Server::Ready() {
Log("Entrez le seed de la partie: ", false, false); Log("Entrez le seed de la partie: ", false, false);
std::cin.getline(m_buf.ptr, BUFFER_LENGTH); std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
try { try {
m_game.seed = std::stoi(m_buf.ptr); m_game.seed = 9370707;//std::stoi(m_buf.ptr);
} catch(const std::exception& e) { } catch(const std::exception& e) {
Log(e.what(), true, false); Log(e.what(), true, false);
m_game.seed = 0; m_game.seed = 0;

5
SQCSim2021/engine.cpp
View File

@@ -404,7 +404,7 @@ void Engine::Init() {
rt->SetPosition(Vector3f(555, 555, 555)); rt->SetPosition(Vector3f(555, 555, 555));
} }
seed = m_conn.getSeed(); seed = 9370707;//m_conn.getSeed();
m_networkgame = true; m_networkgame = true;
} }
else std::cout << "Erreur de connexion." << std::endl; else std::cout << "Erreur de connexion." << std::endl;
@@ -1358,8 +1358,7 @@ void Engine::Render(float elapsedTime) {
for (auto& [key, player] : m_players) { for (auto& [key, player] : m_players) {
RemotePlayer* rt = static_cast<RemotePlayer*>(player); RemotePlayer* rt = static_cast<RemotePlayer*>(player);
//std::cout << key << ": "; rt->GetPosition().Afficher(); glClear(GL_STENCIL_BUFFER_BIT);
glClear(GL_DEPTH_BUFFER_BIT | 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.
} }