From 3cb5a98b60bd5657ba76ac96dab78296c33a3da4 Mon Sep 17 00:00:00 2001 From: milek7 Date: Sun, 24 Jan 2021 22:33:23 +0100 Subject: [PATCH] remove openglcolor.h from stdafx.h --- gamepadinput.h | 1 + openglgeometrybank.cpp | 1 + opengllight.cpp | 1 + openglrenderer.cpp | 1 + stdafx.h | 5 ++--- utilities.h | 1 - 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gamepadinput.h b/gamepadinput.h index c43040f1..ab6da934 100644 --- a/gamepadinput.h +++ b/gamepadinput.h @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include #include "command.h" +#include "parser.h" class gamepad_input { diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp index ace1b78a..961b2716 100644 --- a/openglgeometrybank.cpp +++ b/openglgeometrybank.cpp @@ -9,6 +9,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "openglgeometrybank.h" +#include "openglcolor.h" #include "Logs.h" diff --git a/opengllight.cpp b/opengllight.cpp index b28e07eb..7532d498 100644 --- a/opengllight.cpp +++ b/opengllight.cpp @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "opengllight.h" +#include "utilities.h" void opengl_light::apply_intensity( float const Factor ) { diff --git a/openglrenderer.cpp b/openglrenderer.cpp index 7a9a5152..09af4783 100644 --- a/openglrenderer.cpp +++ b/openglrenderer.cpp @@ -24,6 +24,7 @@ http://mozilla.org/MPL/2.0/. #include "Logs.h" #include "utilities.h" #include "openglgeometrybank.h" +#include "openglcolor.h" int const EU07_PICKBUFFERSIZE { 1024 }; // size of (square) textures bound with the pick framebuffer int const EU07_ENVIRONMENTBUFFERSIZE { 256 }; // size of (square) environmental cube map texture diff --git a/stdafx.h b/stdafx.h index 706f0a1d..ac6e2b7d 100644 --- a/stdafx.h +++ b/stdafx.h @@ -111,8 +111,7 @@ int const null_handle = 0; #include "imgui/imgui.h" #define ImVec2S(a, b) ImVec2(a * Global.ui_scale, b * Global.ui_scale) -#include "openglcolor.h" - -#endif #pragma warning( disable : 5033 ) // "register is no longer a supported storage class" but it's all over python headers + +#endif diff --git a/utilities.h b/utilities.h index b9386a68..ab2bf972 100644 --- a/utilities.h +++ b/utilities.h @@ -17,7 +17,6 @@ http://mozilla.org/MPL/2.0/. #include #include #include "parser.h" -#include "dumb3d.h" /*rozne takie duperele do operacji na stringach w paszczalu, pewnie w delfi sa lepsze*/ /*konwersja zmiennych na stringi, funkcje matematyczne, logiczne, lancuchowe, I/O etc*/