sigonasr2
/
olcPixelGameEngine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge 918706c012 into b7fdab1576

Browse Source
pull/236/merge
Spej 3 years ago committed by GitHub
parent b7fdab1576 918706c012
commit dd77afa7ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      Extensions/olcPGEX_Graphics3D.h

20
Extensions/olcPGEX_Graphics3D.h
Unescape View File

@ -61,7 +61,7 @@
Author Author
~~~~~~ ~~~~~~
David Barr, aka javidx9, ©OneLoneCoder 2018 David Barr, aka javidx9, ©OneLoneCoder 2018
*/ */
@ -259,7 +259,7 @@ namespace olc
//inline static void DrawSprite(olc::Sprite *sprite, olc::GFX2D::Transform2D &transform); //inline static void DrawSprite(olc::Sprite *sprite, olc::GFX2D::Transform2D &transform);
private: private:
static float* m_DepthBuffer; static std::vector<float> m_DepthBuffer;
}; };
} }
@ -845,17 +845,17 @@ namespace olc
} }
float* GFX3D::m_DepthBuffer = nullptr; std::vector<float> GFX3D::m_DepthBuffer;
void GFX3D::ConfigureDisplay() void GFX3D::ConfigureDisplay()
{ {
m_DepthBuffer = new float[pge->ScreenWidth() * pge->ScreenHeight()]{ 0 }; m_DepthBuffer.resize(pge->ScreenWidth() * pge->ScreenHeight());
} }
void GFX3D::ClearDepth() void GFX3D::ClearDepth()
{ {
memset(m_DepthBuffer, 0, pge->ScreenWidth() * pge->ScreenHeight() * sizeof(float)); std::fill(m_DepthBuffer.begin(), m_DepthBuffer.end(), 0);
} }
bool GFX3D::mesh::LoadOBJFile(std::string sFilename, bool bHasTexture) bool GFX3D::mesh::LoadOBJFile(std::string sFilename, bool bHasTexture)
@ -1525,7 +1525,9 @@ namespace olc
if (nFlags & GFX3D::RENDER_DEPTH) if (nFlags & GFX3D::RENDER_DEPTH)
{ {
if (tex_w > m_DepthBuffer[i*pge->ScreenWidth() + j]) if (m_DepthBuffer.size() <= i * pge->ScreenWidth() + j)
pge->Draw(j, i, olc::BLACK);
else if (tex_w > m_DepthBuffer[i*pge->ScreenWidth() + j])
if (pge->Draw(j, i, olc::Pixel(uint8_t(pixel_r * 1.0f), uint8_t(pixel_g * 1.0f), uint8_t(pixel_b * 1.0f), uint8_t(pixel_a * 1.0f)))) if (pge->Draw(j, i, olc::Pixel(uint8_t(pixel_r * 1.0f), uint8_t(pixel_g * 1.0f), uint8_t(pixel_b * 1.0f), uint8_t(pixel_a * 1.0f))))
m_DepthBuffer[i*pge->ScreenWidth() + j] = tex_w; m_DepthBuffer[i*pge->ScreenWidth() + j] = tex_w;
} }
@ -1640,7 +1642,9 @@ namespace olc
if (nFlags & GFX3D::RENDER_DEPTH) if (nFlags & GFX3D::RENDER_DEPTH)
{ {
if (tex_w > m_DepthBuffer[i*pge->ScreenWidth() + j]) if (m_DepthBuffer.size() <= i * pge->ScreenWidth() + j)
pge->Draw(j, i, olc::BLACK);
else if (tex_w > m_DepthBuffer[i*pge->ScreenWidth() + j])
if (pge->Draw(j, i, olc::Pixel(uint8_t(pixel_r * 1.0f), uint8_t(pixel_g * 1.0f), uint8_t(pixel_b * 1.0f), uint8_t(pixel_a * 1.0f)))) if (pge->Draw(j, i, olc::Pixel(uint8_t(pixel_r * 1.0f), uint8_t(pixel_g * 1.0f), uint8_t(pixel_b * 1.0f), uint8_t(pixel_a * 1.0f))))
m_DepthBuffer[i*pge->ScreenWidth() + j] = tex_w; m_DepthBuffer[i*pge->ScreenWidth() + j] = tex_w;
} }
@ -1722,4 +1726,4 @@ namespace olc
} }
#endif #endif

Write Preview
Loading…
Cancel
Save