diff options
author | Arisotura <thetotalworm@gmail.com> | 2019-06-25 19:29:21 +0200 |
---|---|---|
committer | Arisotura <thetotalworm@gmail.com> | 2019-06-25 19:29:21 +0200 |
commit | 204b5d87006f05a2b27fa908201146ac98c1ac62 (patch) | |
tree | 7acabe6bed68ffa8babac088814760abba7cec95 /src | |
parent | 4d775dcf8578c0ded92d39917a2a60c70e248e70 (diff) |
HARK HARK HARK
Diffstat (limited to 'src')
-rw-r--r-- | src/GPU3D_OpenGL.cpp | 5 | ||||
-rw-r--r-- | src/libui_sdl/main.cpp | 4 | ||||
-rw-r--r-- | src/version.h | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/GPU3D_OpenGL.cpp b/src/GPU3D_OpenGL.cpp index 92fdfe8..d616e1c 100644 --- a/src/GPU3D_OpenGL.cpp +++ b/src/GPU3D_OpenGL.cpp @@ -479,7 +479,7 @@ void UpdateDisplaySettings() glBufferData(GL_PIXEL_PACK_BUFFER, 256*192*4, NULL, GL_DYNAMIC_READ); //glLineWidth(scale); - glLineWidth(1.5); + //glLineWidth(1.5); } @@ -743,6 +743,7 @@ void RenderSceneChunk(int y, int h) // pass 1: opaque pixels UseRenderShader(flags); + glLineWidth(1.0); glColorMaski(1, GL_TRUE, GL_TRUE, fogenable, GL_FALSE); @@ -774,6 +775,7 @@ void RenderSceneChunk(int y, int h) if (RenderDispCnt & (1<<5)) { UseRenderShader(flags | RenderFlag_Edge); + glLineWidth(1.5); glColorMaski(0, GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); glColorMaski(1, GL_FALSE, GL_TRUE, GL_FALSE, GL_FALSE); @@ -806,6 +808,7 @@ void RenderSceneChunk(int y, int h) glBlendFuncSeparate(GL_ONE, GL_ZERO, GL_ONE, GL_ONE); UseRenderShader(flags | RenderFlag_Trans); + glLineWidth(1.0); if (NumOpaqueFinalPolys > -1) { diff --git a/src/libui_sdl/main.cpp b/src/libui_sdl/main.cpp index 1e91e15..99d4e3f 100644 --- a/src/libui_sdl/main.cpp +++ b/src/libui_sdl/main.cpp @@ -1223,8 +1223,8 @@ int OnAreaKeyEvent(uiAreaHandler* handler, uiArea* area, uiAreaKeyEvent* evt) KeyHotkeyMask |= (1<<i); // REMOVE ME - if (evt->Scancode == 0x57) // F11 - NDS::debug(0); + //if (evt->Scancode == 0x57) // F11 + // NDS::debug(0); } return 1; diff --git a/src/version.h b/src/version.h index cc15c89..0d71ed8 100644 --- a/src/version.h +++ b/src/version.h @@ -19,7 +19,7 @@ #ifndef VERSION_H #define VERSION_H -#define MELONDS_VERSION "0.8.1" +#define MELONDS_VERSION "0.8.2" #define MELONDS_URL "http://melonds.kuribo64.net/" |