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 +6 -6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a91e5dcf5e - Show all commits

7
SQCSim2021/engine.cpp
View File

@@ -1182,7 +1182,6 @@ void Engine::Render(float elapsedTime) {
m_world.Update(m_bullets, m_player.GetPosition(), m_blockinfo); m_world.Update(m_bullets, m_player.GetPosition(), m_blockinfo);
m_renderer.UpdateMesh(&m_world, 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); 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); //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); DrawHud(elapsedTime, bloc);
if (m_isSkybox) DisplayPovGun(); DisplayPovGun();
ProcessNotificationQueue(); ProcessNotificationQueue();
if (m_damage) if (m_damage)
{ {

5
SQCSim2021/textureatlas.cpp
View File

@@ -69,9 +69,10 @@ bool TextureAtlas::Generate(int textureSize, bool mipmap) {
ilOriginFunc(IL_ORIGIN_LOWER_LEFT); ilOriginFunc(IL_ORIGIN_LOWER_LEFT);
ilEnable(IL_ORIGIN_SET); ilEnable(IL_ORIGIN_SET);
ilEnable(IL_ALPHA);
ilEnable(IL_BLIT_BLEND);
if (!ilLoadImage((const ILstring)it->first.c_str()))
if (!ilLoad(IL_PNG,(const ILstring)it->first.c_str()))
return false; return false;
if (!ilConvertImage(IL_RGBA, IL_UNSIGNED_BYTE)) if (!ilConvertImage(IL_RGBA, IL_UNSIGNED_BYTE))