v4games
/
v4k-git-backup
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ems fixes

main
Dominik Madarász 2024-02-11 03:29:24 +01:00
parent dd7003b276
commit 034046320f
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/joint/v4k.h
View File

@ -355095,7 +355095,7 @@ void ui_hue_cycle( unsigned num_cycles ) {
} }
} }
extern bool debug_visible; static bool win_debug_visible = true;
static static
void ui_render() { void ui_render() {
@ -355111,7 +355111,7 @@ void ui_render() {
* rendering the UI. */ * rendering the UI. */
//nk_sdl_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_MEMORY, MAX_ELEMENT_MEMORY); //nk_sdl_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_MEMORY, MAX_ELEMENT_MEMORY);
if (debug_visible) { if (win_debug_visible) {
GLfloat bkColor[4]; glGetFloatv(GL_COLOR_CLEAR_VALUE, bkColor); // @transparent GLfloat bkColor[4]; glGetFloatv(GL_COLOR_CLEAR_VALUE, bkColor); // @transparent
glClearColor(0,0,0,1); // @transparent glClearColor(0,0,0,1); // @transparent
glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,!bkColor[3] ? GL_TRUE : GL_FALSE); // @transparent glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,!bkColor[3] ? GL_TRUE : GL_FALSE); // @transparent
@ -379188,7 +379188,6 @@ static char title[128] = {0};
static char screenshot_file[DIR_MAX]; static char screenshot_file[DIR_MAX];
static int locked_aspect_ratio = 0; static int locked_aspect_ratio = 0;
static vec4 winbgcolor = {0,0,0,1}; static vec4 winbgcolor = {0,0,0,1};
static bool win_debug_visible = true;
vec4 window_getcolor_() { return winbgcolor; } // internal vec4 window_getcolor_() { return winbgcolor; } // internal
@ -380166,9 +380165,11 @@ void window_setclipboard(const char *text) {
static static
double window_scale() { // ok? @testme double window_scale() { // ok? @testme
float xscale, yscale; float xscale=1.0f, yscale=1.0f;
#if !is(ems) && !is(osx) // @todo: remove silicon mac M1 hack
GLFWmonitor *monitor = glfwGetPrimaryMonitor(); GLFWmonitor *monitor = glfwGetPrimaryMonitor();
glfwGetMonitorContentScale(monitor, &xscale, &yscale); glfwGetMonitorContentScale(monitor, &xscale, &yscale);
#endif
return maxi(xscale, yscale); return maxi(xscale, yscale);
} }
#line 0 #line 0

4
engine/split/v4k_ui.c
View File

@ -1031,7 +1031,7 @@ void ui_hue_cycle( unsigned num_cycles ) {
} }
} }
extern bool debug_visible; static bool win_debug_visible = true;
static static
void ui_render() { void ui_render() {
@ -1047,7 +1047,7 @@ void ui_render() {
* rendering the UI. */ * rendering the UI. */
//nk_sdl_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_MEMORY, MAX_ELEMENT_MEMORY); //nk_sdl_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_MEMORY, MAX_ELEMENT_MEMORY);
if (debug_visible) { if (win_debug_visible) {
GLfloat bkColor[4]; glGetFloatv(GL_COLOR_CLEAR_VALUE, bkColor); // @transparent GLfloat bkColor[4]; glGetFloatv(GL_COLOR_CLEAR_VALUE, bkColor); // @transparent
glClearColor(0,0,0,1); // @transparent glClearColor(0,0,0,1); // @transparent
glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,!bkColor[3] ? GL_TRUE : GL_FALSE); // @transparent glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,!bkColor[3] ? GL_TRUE : GL_FALSE); // @transparent

5
engine/split/v4k_window.c
View File

@ -109,7 +109,6 @@ static char title[128] = {0};
static char screenshot_file[DIR_MAX]; static char screenshot_file[DIR_MAX];
static int locked_aspect_ratio = 0; static int locked_aspect_ratio = 0;
static vec4 winbgcolor = {0,0,0,1}; static vec4 winbgcolor = {0,0,0,1};
static bool win_debug_visible = true;
vec4 window_getcolor_() { return winbgcolor; } // internal vec4 window_getcolor_() { return winbgcolor; } // internal
@ -1087,8 +1086,10 @@ void window_setclipboard(const char *text) {
static static
double window_scale() { // ok? @testme double window_scale() { // ok? @testme
float xscale, yscale; float xscale=1.0f, yscale=1.0f;
#if !is(ems) && !is(osx) // @todo: remove silicon mac M1 hack
GLFWmonitor *monitor = glfwGetPrimaryMonitor(); GLFWmonitor *monitor = glfwGetPrimaryMonitor();
glfwGetMonitorContentScale(monitor, &xscale, &yscale); glfwGetMonitorContentScale(monitor, &xscale, &yscale);
#endif
return maxi(xscale, yscale); return maxi(xscale, yscale);
} }

9
engine/v4k.c
View File

@ -2239,7 +2239,7 @@ void ui_hue_cycle( unsigned num_cycles ) {
} }
} }
extern bool debug_visible; static bool win_debug_visible = true;
static static
void ui_render() { void ui_render() {
@ -2255,7 +2255,7 @@ void ui_render() {
* rendering the UI. */ * rendering the UI. */
//nk_sdl_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_MEMORY, MAX_ELEMENT_MEMORY); //nk_sdl_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_MEMORY, MAX_ELEMENT_MEMORY);
if (debug_visible) { if (win_debug_visible) {
GLfloat bkColor[4]; glGetFloatv(GL_COLOR_CLEAR_VALUE, bkColor); // @transparent GLfloat bkColor[4]; glGetFloatv(GL_COLOR_CLEAR_VALUE, bkColor); // @transparent
glClearColor(0,0,0,1); // @transparent glClearColor(0,0,0,1); // @transparent
glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,!bkColor[3] ? GL_TRUE : GL_FALSE); // @transparent glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,!bkColor[3] ? GL_TRUE : GL_FALSE); // @transparent
@ -26332,7 +26332,6 @@ static char title[128] = {0};
static char screenshot_file[DIR_MAX]; static char screenshot_file[DIR_MAX];
static int locked_aspect_ratio = 0; static int locked_aspect_ratio = 0;
static vec4 winbgcolor = {0,0,0,1}; static vec4 winbgcolor = {0,0,0,1};
static bool win_debug_visible = true;
vec4 window_getcolor_() { return winbgcolor; } // internal vec4 window_getcolor_() { return winbgcolor; } // internal
@ -27310,9 +27309,11 @@ void window_setclipboard(const char *text) {
static static
double window_scale() { // ok? @testme double window_scale() { // ok? @testme
float xscale, yscale; float xscale=1.0f, yscale=1.0f;
#if !is(ems) && !is(osx) // @todo: remove silicon mac M1 hack
GLFWmonitor *monitor = glfwGetPrimaryMonitor(); GLFWmonitor *monitor = glfwGetPrimaryMonitor();
glfwGetMonitorContentScale(monitor, &xscale, &yscale); glfwGetMonitorContentScale(monitor, &xscale, &yscale);
#endif
return maxi(xscale, yscale); return maxi(xscale, yscale);
} }
#line 0 #line 0