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

Sync ees almöss de voork!

Browse Source
This commit is contained in:
MarcEricMartel
2023-11-27 17:44:52 -05:00
parent 10b8d77734
commit e89b5914fb
4 changed files with 64 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
SQCSim2021/engine.cpp
View File

@@ -319,33 +319,8 @@ void Engine::DrawPause()
void Engine::Init() {
GLenum glewErr = glewInit();
if (glewErr != GLEW_OK) {
std::cerr << " ERREUR GLEW : " << glewGetErrorString(glewErr) << std::endl;
abort();
}
uint64_t seed = SEED;
glDisable(GL_FRAMEBUFFER_SRGB);
glEnable(GL_DEPTH_TEST);
glEnable(GL_STENCIL_TEST);
glEnable(GL_POINT_SMOOTH);
glEnable(GL_BLEND);
glEnable(GL_CULL_FACE);
glEnable(GL_TEXTURE_2D);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
gluPerspective(45.0f, (float)Width() / (float)Height(), 0.1f, VIEW_DISTANCE);
glShadeModel(GL_SMOOTH);
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
glDisable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBlendEquation(GL_FUNC_SUBTRACT);
if (m_istarted)
return;
else m_istarted = true;
@@ -363,6 +338,9 @@ void Engine::Init() {
m_whoosh[x] = nullptr;
}
// Init Chunks
m_world.GetChunks().Reset(nullptr);
char* ch = new char[2];
std::cout << "Jouer en ligne? [o/N] ";
@@ -415,12 +393,8 @@ void Engine::Init() {
m_world.SetSeed(seed);
// Init Chunks
m_world.GetChunks().Reset(nullptr);
m_startTime = std::chrono::high_resolution_clock::now();
m_remotePlayer.SetPosition(Vector3f(.5,CHUNK_SIZE_Y + 10., .5));
// Gestion de souris.
CenterMouse();
HideCursor();
@@ -429,6 +403,31 @@ void Engine::Init() {
void Engine::DeInit() {}
void Engine::LoadResource() {
GLenum glewErr = glewInit();
if (glewErr != GLEW_OK) {
std::cerr << " ERREUR GLEW : " << glewGetErrorString(glewErr) << std::endl;
abort();
}
glDisable(GL_FRAMEBUFFER_SRGB);
glEnable(GL_DEPTH_TEST);
glEnable(GL_STENCIL_TEST);
glEnable(GL_POINT_SMOOTH);
glEnable(GL_BLEND);
glEnable(GL_CULL_FACE);
glEnable(GL_TEXTURE_2D);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
gluPerspective(45.0f, (float)Width() / (float)Height(), 0.1f, VIEW_DISTANCE);
glShadeModel(GL_SMOOTH);
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
glDisable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBlendEquation(GL_FUNC_SUBTRACT);
LoadTexture(m_skybox.GetTexture(), TEXTURE_PATH "skybox.png", true);
//LoadTexture(m_skybox2.GetTexture(), TEXTURE_PATH "skybox.png", true);
LoadTexture(m_textureCrosshair, TEXTURE_PATH "cross.bmp", true);
@@ -1331,15 +1330,18 @@ void Engine::Render(float elapsedTime) {
std::cout << "syncsid be no good.";
break;
}
if (m_syncs.contains(sync.timestamp)) {
if (m_syncs.count(sync.timestamp)) {
Sync comp = m_syncs[sync.timestamp];
m_player.InflictDamage(sync.hp - comp.hp);
std::cout << comp.position << " - " << sync.position << std::endl;
Vector3f diff = sync.position - comp.position;
if (diff.Length() > 2.5)
m_player.Move(diff);
//std::cout << sync.timestamp << " ms: " << comp.position << " - " << sync.position << " Diff: " << diff.Length() << std::endl;
if (diff.Length() > 1.5) {
diff.Normalize();
m_player.Move(-diff);
}
// TODO: Syncer sync.timer avec le timer
}