CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed surfaces from code

Browse Source
This commit is contained in:
FlareMicrosystems
2022-10-15 21:54:50 -07:00
parent c70d39fb25
commit 48b90b1a93
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/Globals.h
View File

@@ -17,8 +17,6 @@ public:
static const int major; static const int major;
static const int minor; static const int minor;
static const int patch; static const int patch;
static G3D::TextureRef surface;
static int surfaceId;
static const std::string g_appName; static const std::string g_appName;
static COLORREF g_acrCustClr[16]; //Will be dynamic later static COLORREF g_acrCustClr[16]; //Will be dynamic later
static HWND mainHwnd; static HWND mainHwnd;

4
src/source/Application.cpp
View File

@@ -521,9 +521,7 @@ void Application::run() {
g_usableApp = this; g_usableApp = this;
UpdateWindow(_hWndMain); UpdateWindow(_hWndMain);
// Load objects here= // Load objects here
Globals::surface = Texture::fromFile(GetFileInPath("/content/images/surfacebr.png"));
Globals::surfaceId = Globals::surface->getOpenGLID();
cameraSound = GetFileInPath("/content/sounds/SWITCH3.wav"); cameraSound = GetFileInPath("/content/sounds/SWITCH3.wav");
clickSound = GetFileInPath("/content/sounds/switch.wav"); clickSound = GetFileInPath("/content/sounds/switch.wav");
dingSound = GetFileInPath("/content/sounds/electronicpingshort.wav"); dingSound = GetFileInPath("/content/sounds/electronicpingshort.wav");

2
src/source/Globals.cpp
View File

@@ -1,7 +1,6 @@
#include "Globals.h" #include "Globals.h"
#include "Application.h" #include "Application.h"
int Globals::surfaceId = 2;
bool Globals::useMousePoint = false; bool Globals::useMousePoint = false;
std::vector<Instance*> postRenderStack = std::vector<Instance*>(); std::vector<Instance*> postRenderStack = std::vector<Instance*>();
@@ -9,7 +8,6 @@ DataModelInstance* g_dataModel = NULL;
XplicitNgine* g_xplicitNgine = NULL; XplicitNgine* g_xplicitNgine = NULL;
bool running = false; bool running = false;
G3D::TextureRef Globals::surface;
POINT Globals::mousepoint; POINT Globals::mousepoint;
GFontRef g_fntdominant = NULL; GFontRef g_fntdominant = NULL;