From 7f114b0530327b62785bf9efb6dc8571f569a622 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Mon, 4 Jun 2018 21:57:21 -0400 Subject: [PATCH] Clean up window.cpp --- src/window.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/window.cpp b/src/window.cpp index 37f9e507..5c78e965 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -11,10 +11,10 @@ #include "osdialog.h" -#define NANOVG_GL2 1 -// #define NANOVG_GL3 1 -// #define NANOVG_GLES2 1 -#define NANOVG_GL_IMPLEMENTATION 1 +#define NANOVG_GL2_IMPLEMENTATION 1 +// #define NANOVG_GL3_IMPLEMENTATION 1 +// #define NANOVG_GLES2_IMPLEMENTATION 1 +// #define NANOVG_GLES3_IMPLEMENTATION 1 #include "nanovg_gl.h" // Hack to get framebuffer objects working on OpenGL 2 (we blindly assume the extension is supported) #define NANOVG_FBO_VALID 1 @@ -379,28 +379,28 @@ void windowInit() { glfwSetWindowSizeLimits(gWindow, 640, 480, GLFW_DONT_CARE, GLFW_DONT_CARE); // Set up NanoVG + int nvgFlags = 0;//NVG_ANTIALIAS; #if defined NANOVG_GL2 - gVg = nvgCreateGL2(NVG_ANTIALIAS); + gVg = nvgCreateGL2(nvgFlags); #elif defined NANOVG_GL3 - gVg = nvgCreateGL3(NVG_ANTIALIAS); + gVg = nvgCreateGL3(nvgFlags); #elif defined NANOVG_GLES2 - gVg = nvgCreateGLES2(NVG_ANTIALIAS); + gVg = nvgCreateGLES2(nvgFlags); #endif assert(gVg); #if defined NANOVG_GL2 - gFramebufferVg = nvgCreateGL2(NVG_ANTIALIAS); + gFramebufferVg = nvgCreateGL2(nvgFlags); #elif defined NANOVG_GL3 - gFramebufferVg = nvgCreateGL3(NVG_ANTIALIAS); + gFramebufferVg = nvgCreateGL3(nvgFlags); #elif defined NANOVG_GLES2 - gFramebufferVg = nvgCreateGLES2(NVG_ANTIALIAS); + gFramebufferVg = nvgCreateGLES2(nvgFlags); #endif assert(gFramebufferVg); // Set up Blendish gGuiFont = Font::load(assetGlobal("res/fonts/DejaVuSans.ttf")); bndSetFont(gGuiFont->handle); - // bndSetIconImage(loadImage(assetGlobal("res/icons.png"))); windowSetTheme(nvgRGB(0x33, 0x33, 0x33), nvgRGB(0xf0, 0xf0, 0xf0)); }