From 978b882449b22713a4f82ed45090feea66d7d375 Mon Sep 17 00:00:00 2001 From: Phillip Date: Fri, 20 May 2016 19:59:26 -0700 Subject: [PATCH] Fix MSVC Name Squatting --- include/zeus/CProjection.hpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/zeus/CProjection.hpp b/include/zeus/CProjection.hpp index 007beed..cd8bf5f 100644 --- a/include/zeus/CProjection.hpp +++ b/include/zeus/CProjection.hpp @@ -6,6 +6,8 @@ #include #include #include +#undef near +#undef far namespace zeus { @@ -15,10 +17,12 @@ enum class EProjType Orthographic = 1, Perspective = 2 }; -struct SProjOrtho + +class SProjOrtho { +public: float top, bottom, left, right, near, far; - SProjOrtho(float p_top=1.0f, float p_bottom=-1.0f, float p_left=-1.0f, float p_right=1.0f, + explicit SProjOrtho(float p_top=1.0f, float p_bottom=-1.0f, float p_left=-1.0f, float p_right=1.0f, float p_near=1.0f, float p_far=-1.0f) : top(p_top), bottom(p_bottom), left(p_left), right(p_right), near(p_near), far(p_far) {} };