From 48b90b1a93ec445fc418dad771db4140eac8c206 Mon Sep 17 00:00:00 2001 From: FlareMicrosystems Date: Sat, 15 Oct 2022 21:54:50 -0700 Subject: [PATCH] Removed surfaces from code --- src/include/Globals.h | 2 -- src/source/Application.cpp | 4 +--- src/source/Globals.cpp | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/include/Globals.h b/src/include/Globals.h index ca7673b..195cb37 100644 --- a/src/include/Globals.h +++ b/src/include/Globals.h @@ -17,8 +17,6 @@ public: static const int major; static const int minor; static const int patch; - static G3D::TextureRef surface; - static int surfaceId; static const std::string g_appName; static COLORREF g_acrCustClr[16]; //Will be dynamic later static HWND mainHwnd; diff --git a/src/source/Application.cpp b/src/source/Application.cpp index 9f4818b..2d92505 100644 --- a/src/source/Application.cpp +++ b/src/source/Application.cpp @@ -521,9 +521,7 @@ void Application::run() { g_usableApp = this; UpdateWindow(_hWndMain); - // Load objects here= - Globals::surface = Texture::fromFile(GetFileInPath("/content/images/surfacebr.png")); - Globals::surfaceId = Globals::surface->getOpenGLID(); + // Load objects here cameraSound = GetFileInPath("/content/sounds/SWITCH3.wav"); clickSound = GetFileInPath("/content/sounds/switch.wav"); dingSound = GetFileInPath("/content/sounds/electronicpingshort.wav"); diff --git a/src/source/Globals.cpp b/src/source/Globals.cpp index ad1bc61..721285b 100644 --- a/src/source/Globals.cpp +++ b/src/source/Globals.cpp @@ -1,7 +1,6 @@ #include "Globals.h" #include "Application.h" -int Globals::surfaceId = 2; bool Globals::useMousePoint = false; std::vector postRenderStack = std::vector(); @@ -9,7 +8,6 @@ DataModelInstance* g_dataModel = NULL; XplicitNgine* g_xplicitNgine = NULL; bool running = false; -G3D::TextureRef Globals::surface; POINT Globals::mousepoint; GFontRef g_fntdominant = NULL;