OUaip
This commit is contained in:
parent
02fafea45c
commit
a91e5dcf5e
@ -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)
|
||||||
{
|
{
|
||||||
|
@ -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 (!ilLoad(IL_PNG,(const ILstring)it->first.c_str()))
|
if (!ilLoadImage((const ILstring)it->first.c_str()))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (!ilConvertImage(IL_RGBA, IL_UNSIGNED_BYTE))
|
if (!ilConvertImage(IL_RGBA, IL_UNSIGNED_BYTE))
|
||||||
|
Loading…
Reference in New Issue
Block a user