chg: reenable UI on --capture + enforce window res
|
@ -367703,14 +367703,6 @@ static bool win_debug_visible = true;
|
||||||
|
|
||||||
static
|
static
|
||||||
void ui_render() {
|
void ui_render() {
|
||||||
// skip UI rendering if capture test is enabled
|
|
||||||
static uint64_t capture_target; do_once capture_target = optioni("--capture", 0);
|
|
||||||
if( capture_target ) {
|
|
||||||
glViewport(0,0,window_width(),window_height()); //@fixme: viewport is incorrect when we bail here
|
|
||||||
nk_clear(&nk_glfw.ctx);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// draw queued menus
|
// draw queued menus
|
||||||
ui_notify_render();
|
ui_notify_render();
|
||||||
ui_menu_render();
|
ui_menu_render();
|
||||||
|
@ -392618,6 +392610,11 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
|
||||||
int winWidth = window_canvas().w * scale;
|
int winWidth = window_canvas().w * scale;
|
||||||
int winHeight = window_canvas().h * scale;
|
int winHeight = window_canvas().h * scale;
|
||||||
|
|
||||||
|
if (optioni("--capture", 0)) {
|
||||||
|
winWidth = 1280;
|
||||||
|
winHeight = 720;
|
||||||
|
}
|
||||||
|
|
||||||
window_hints(flags);
|
window_hints(flags);
|
||||||
|
|
||||||
GLFWmonitor* monitor = NULL;
|
GLFWmonitor* monitor = NULL;
|
||||||
|
|
|
@ -1035,14 +1035,6 @@ static bool win_debug_visible = true;
|
||||||
|
|
||||||
static
|
static
|
||||||
void ui_render() {
|
void ui_render() {
|
||||||
// skip UI rendering if capture test is enabled
|
|
||||||
static uint64_t capture_target; do_once capture_target = optioni("--capture", 0);
|
|
||||||
if( capture_target ) {
|
|
||||||
glViewport(0,0,window_width(),window_height()); //@fixme: viewport is incorrect when we bail here
|
|
||||||
nk_clear(&nk_glfw.ctx);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// draw queued menus
|
// draw queued menus
|
||||||
ui_notify_render();
|
ui_notify_render();
|
||||||
ui_menu_render();
|
ui_menu_render();
|
||||||
|
|
|
@ -288,6 +288,11 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
|
||||||
int winWidth = window_canvas().w * scale;
|
int winWidth = window_canvas().w * scale;
|
||||||
int winHeight = window_canvas().h * scale;
|
int winHeight = window_canvas().h * scale;
|
||||||
|
|
||||||
|
if (optioni("--capture", 0)) {
|
||||||
|
winWidth = 1280;
|
||||||
|
winHeight = 720;
|
||||||
|
}
|
||||||
|
|
||||||
window_hints(flags);
|
window_hints(flags);
|
||||||
|
|
||||||
GLFWmonitor* monitor = NULL;
|
GLFWmonitor* monitor = NULL;
|
||||||
|
|
13
engine/v4k.c
|
@ -2243,14 +2243,6 @@ static bool win_debug_visible = true;
|
||||||
|
|
||||||
static
|
static
|
||||||
void ui_render() {
|
void ui_render() {
|
||||||
// skip UI rendering if capture test is enabled
|
|
||||||
static uint64_t capture_target; do_once capture_target = optioni("--capture", 0);
|
|
||||||
if( capture_target ) {
|
|
||||||
glViewport(0,0,window_width(),window_height()); //@fixme: viewport is incorrect when we bail here
|
|
||||||
nk_clear(&nk_glfw.ctx);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// draw queued menus
|
// draw queued menus
|
||||||
ui_notify_render();
|
ui_notify_render();
|
||||||
ui_menu_render();
|
ui_menu_render();
|
||||||
|
@ -27158,6 +27150,11 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
|
||||||
int winWidth = window_canvas().w * scale;
|
int winWidth = window_canvas().w * scale;
|
||||||
int winHeight = window_canvas().h * scale;
|
int winHeight = window_canvas().h * scale;
|
||||||
|
|
||||||
|
if (optioni("--capture", 0)) {
|
||||||
|
winWidth = 1280;
|
||||||
|
winHeight = 720;
|
||||||
|
}
|
||||||
|
|
||||||
window_hints(flags);
|
window_hints(flags);
|
||||||
|
|
||||||
GLFWmonitor* monitor = NULL;
|
GLFWmonitor* monitor = NULL;
|
||||||
|
|
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 81 KiB After Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 226 KiB After Width: | Height: | Size: 1.1 MiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 37 KiB |
Before Width: | Height: | Size: 327 KiB After Width: | Height: | Size: 152 KiB |
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 550 KiB |
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 546 KiB |
Before Width: | Height: | Size: 419 KiB After Width: | Height: | Size: 151 KiB |
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 455 KiB |
Before Width: | Height: | Size: 1.4 MiB After Width: | Height: | Size: 642 KiB |
Before Width: | Height: | Size: 2.4 MiB After Width: | Height: | Size: 800 KiB |
Before Width: | Height: | Size: 1.5 MiB After Width: | Height: | Size: 621 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 27 KiB |
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 41 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 963 KiB After Width: | Height: | Size: 790 KiB |
Before Width: | Height: | Size: 2.4 MiB After Width: | Height: | Size: 831 KiB |
Before Width: | Height: | Size: 81 KiB After Width: | Height: | Size: 64 KiB |