From a91e5dcf5ed478d545f131f75dbedd0865086a94 Mon Sep 17 00:00:00 2001 From: MarcEricMartel Date: Mon, 20 Nov 2023 15:20:20 -0500 Subject: [PATCH] OUaip --- SQCSim2021/engine.cpp | 7 +++---- SQCSim2021/textureatlas.cpp | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SQCSim2021/engine.cpp b/SQCSim2021/engine.cpp index 3e9a9f3..8e8ef0d 100644 --- a/SQCSim2021/engine.cpp +++ b/SQCSim2021/engine.cpp @@ -1182,7 +1182,6 @@ void Engine::Render(float elapsedTime) { m_world.Update(m_bullets, m_player.GetPosition(), m_blockinfo); m_renderer.UpdateMesh(&m_world, m_player.GetPosition(), m_blockinfo); - glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); m_remotePlayer.Render(m_animeAtlas, m_shader01, all, elapsedTime); @@ -1192,12 +1191,12 @@ void Engine::Render(float elapsedTime) { //m_remotePlayer.Render(m_textureAtlas, m_shader01, all, elapsedTime); - //if (m_isSkybox) m_skybox.Render(skybox); + if (m_isSkybox) m_skybox.Render(skybox); - if (m_isSkybox) DrawHud(elapsedTime, bloc); - if (m_isSkybox) DisplayPovGun(); + DrawHud(elapsedTime, bloc); + DisplayPovGun(); ProcessNotificationQueue(); if (m_damage) { diff --git a/SQCSim2021/textureatlas.cpp b/SQCSim2021/textureatlas.cpp index 3e15259..ccefd2c 100644 --- a/SQCSim2021/textureatlas.cpp +++ b/SQCSim2021/textureatlas.cpp @@ -69,9 +69,10 @@ bool TextureAtlas::Generate(int textureSize, bool mipmap) { ilOriginFunc(IL_ORIGIN_LOWER_LEFT); ilEnable(IL_ORIGIN_SET); - + ilEnable(IL_ALPHA); + ilEnable(IL_BLIT_BLEND); - if (!ilLoad(IL_PNG,(const ILstring)it->first.c_str())) + if (!ilLoadImage((const ILstring)it->first.c_str())) return false; if (!ilConvertImage(IL_RGBA, IL_UNSIGNED_BYTE))