From 96cd762293c1df8713aeb9ccfe4ff419c36a0c17 Mon Sep 17 00:00:00 2001 From: PIesArentSquare Date: Sun, 15 Dec 2019 23:46:08 -0500 Subject: [PATCH] Fixed multi-file "Object oriented mode" implementation in olcPGEX_Graphics3D.h Added the OLC_PGE_GRAPHICS3D define similar to the main engine's OLC_PGE_APPLICATION define to fix 'multiple definitions' errors when using the extension in multiple files. --- Extensions/olcPGEX_Graphics3D.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Extensions/olcPGEX_Graphics3D.h b/Extensions/olcPGEX_Graphics3D.h index 9c6dd80..0c64495 100644 --- a/Extensions/olcPGEX_Graphics3D.h +++ b/Extensions/olcPGEX_Graphics3D.h @@ -58,7 +58,7 @@ Author ~~~~~~ - David Barr, aka javidx9, ©OneLoneCoder 2018 + David Barr, aka javidx9, ©OneLoneCoder 2018 */ @@ -940,7 +940,9 @@ namespace olc } + #ifdef OLC_PGE_GRAPHICS3D float* GFX3D::m_DepthBuffer = nullptr; + #endif void GFX3D::ConfigureDisplay() { @@ -953,8 +955,8 @@ namespace olc memset(m_DepthBuffer, 0, pge->ScreenWidth() * pge->ScreenHeight() * sizeof(float)); } - - + #ifdef OLC_PGE_GRAPHICS3D + #undef OLC_PGE_GRAPHICS3D GFX3D::PipeLine::PipeLine() { @@ -1169,6 +1171,7 @@ namespace olc return nTriangleDrawnCount; } + #endif } -#endif \ No newline at end of file +#endif