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

window: transparent windows (r-lyeh)

main
Dominik Madarász 2023-09-21 12:45:42 +02:00
parent 1b294f1a27
commit 8129920be2
16 changed files with 555 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/99-geom.c
View File

@ -5,7 +5,7 @@ int main() {
window_create(25, WINDOW_SQUARE); window_create(25, WINDOW_SQUARE);
window_title(__FILE__); window_title(__FILE__);
unsigned program = shader_geom(vfs_read("shaders/geom-test/line.glsl"), vfs_read("shaders/geom-test/line-vs.glsl"), vfs_read("shaders/geom-test/line-fs.glsl"), "aPos", "FragColor"); unsigned program = shader_geom(vfs_read("shaders/geom-test/line.glsl"), vfs_read("shaders/geom-test/line-vs.glsl"), vfs_read("shaders/geom-test/line-fs.glsl"), "aPos", "FragColor", NULL );
float points[] = { float points[] = {
-0.5f, 0.5f, // top-left -0.5f, 0.5f, // top-left

5
engine/bind/v4k.lua
View File

@ -2899,6 +2899,7 @@ WINDOW_PORTRAIT =64,
WINDOW_LANDSCAPE =128, WINDOW_LANDSCAPE =128,
WINDOW_ASPECT =256, WINDOW_ASPECT =256,
WINDOW_FIXED =512, WINDOW_FIXED =512,
WINDOW_TRANSPARENT =1024,
WINDOW_VSYNC = 0, WINDOW_VSYNC = 0,
WINDOW_VSYNC_ADAPTIVE =4096, WINDOW_VSYNC_ADAPTIVE =4096,
WINDOW_VSYNC_DISABLED =8192, WINDOW_VSYNC_DISABLED =8192,
@ -2933,6 +2934,10 @@ WINDOW_VSYNC_DISABLED =8192,
int window_has_pause(); int window_has_pause();
void window_visible(int visible); void window_visible(int visible);
int window_has_visible(); int window_has_visible();
void window_maximize(int enabled);
int window_has_maximize();
void window_transparent(int enabled);
int window_has_transparent();
double window_aspect(); double window_aspect();
void window_aspect_lock(unsigned numer, unsigned denom); void window_aspect_lock(unsigned numer, unsigned denom);
void window_aspect_unlock(); void window_aspect_unlock();

207
engine/joint/v4k.h
View File

@ -14297,6 +14297,7 @@ typedef char bool;
#pragma comment(lib, "shell32") #pragma comment(lib, "shell32")
#pragma comment(lib, "user32") #pragma comment(lib, "user32")
#pragma comment(lib, "winmm") #pragma comment(lib, "winmm")
#pragma comment(lib, "wininet")
#pragma comment(lib, "ws2_32") #pragma comment(lib, "ws2_32")
#endif #endif
@ -16367,7 +16368,7 @@ API unsigned bgraf( float b, float g, float r, float a );
API float alpha( unsigned rgba ); API float alpha( unsigned rgba );
#define RGBX(rgb,x) ( ((rgb)&0xFFFFFF) | (((unsigned)(x))<<24) ) #define RGBX(rgb,x) ( ((rgb)&0xFFFFFF) | (((unsigned)(x))<<24) )
#define RGB3(r,g,b) ( ((r)<<16) | ((g)<<8) | (b) ) #define RGB3(r,g,b) ( (255<<24) | ((r)<<16) | ((g)<<8) | (b) )
#define RGB4(r,g,b,a) RGBX(RGB3(r,g,b),a) #define RGB4(r,g,b,a) RGBX(RGB3(r,g,b),a)
#define BLACK RGBX(0x000000,255) #define BLACK RGBX(0x000000,255)
@ -16389,7 +16390,7 @@ API float alpha( unsigned rgba );
#define ORANGE RGB3( 255,144,48 ) #define ORANGE RGB3( 255,144,48 )
#define PURPLE RGB3( 102,77,102 ) // 178,128,255 ) #define PURPLE RGB3( 102,77,102 ) // 178,128,255 )
#define YELLOW RGB3( 255,224,0 ) #define YELLOW RGB3( 255,224,0 )
#define GRAY RGB3( 149,149,149 ) #define GRAY RGB3( 32, 32, 32 ) // 149,149,149 )
#define PINK RGB3( 255,48,144 ) #define PINK RGB3( 255,48,144 )
#define AQUA RGB3( 48,255,144 ) #define AQUA RGB3( 48,255,144 )
@ -17520,6 +17521,7 @@ enum WINDOW_FLAGS {
WINDOW_LANDSCAPE = 0x80, WINDOW_LANDSCAPE = 0x80,
WINDOW_ASPECT = 0x100, // keep aspect WINDOW_ASPECT = 0x100, // keep aspect
WINDOW_FIXED = 0x200, // disable resizing WINDOW_FIXED = 0x200, // disable resizing
WINDOW_TRANSPARENT = 0x400,
WINDOW_VSYNC = 0, WINDOW_VSYNC = 0,
WINDOW_VSYNC_ADAPTIVE = 0x1000, WINDOW_VSYNC_ADAPTIVE = 0x1000,
@ -17564,6 +17566,10 @@ API void window_pause(int paused);
API int window_has_pause(); API int window_has_pause();
API void window_visible(int visible); API void window_visible(int visible);
API int window_has_visible(); API int window_has_visible();
API void window_maximize(int enabled);
API int window_has_maximize();
API void window_transparent(int enabled);
API int window_has_transparent();
API double window_aspect(); API double window_aspect();
API void window_aspect_lock(unsigned numer, unsigned denom); API void window_aspect_lock(unsigned numer, unsigned denom);
@ -336156,7 +336162,7 @@ void font_face_from_mem(const char *tag, const void *ttf_bufferv, unsigned ttf_l
const char *vs_filename = 0, *fs_filename = 0; const char *vs_filename = 0, *fs_filename = 0;
const char *vs = vs_filename ? file_read(vs_filename) : mv_vs_source; const char *vs = vs_filename ? file_read(vs_filename) : mv_vs_source;
const char *fs = fs_filename ? file_read(fs_filename) : mv_fs_source; const char *fs = fs_filename ? file_read(fs_filename) : mv_fs_source;
f->program = shader(vs, fs, "vertexPosition,instanceGlyph", "outColor", ""); f->program = shader(vs, fs, "vertexPosition,instanceGlyph", "outColor", NULL);
// figure out what ranges we're about to bake // figure out what ranges we're about to bake
#define MERGE_TABLE(table) do { \ #define MERGE_TABLE(table) do { \
@ -338568,6 +338574,7 @@ void* forget( void *ptr ) {
#line 0 #line 0
#line 1 "v4k_network.c" #line 1 "v4k_network.c"
#if is(tcc) && is(win32) // @fixme: https lib is broken with tcc. replaced with InternetReadFile() api for now #if is(tcc) && is(win32) // @fixme: https lib is broken with tcc. replaced with InternetReadFile() api for now
# include <wininet.h> # include <wininet.h>
@ -338590,7 +338597,6 @@ int download_file( FILE *out, const char *url ) {
} }
array(char) download( const char *url ) { array(char) download( const char *url ) {
int ok = false;
char buffer[ 4096 ]; char buffer[ 4096 ];
DWORD response_size = 0, pos = 0; DWORD response_size = 0, pos = 0;
@ -338599,7 +338605,7 @@ array(char) download( const char *url ) {
for( HINTERNET request = InternetOpenUrlA(session, url, NULL, 0, INTERNET_FLAG_RELOAD, 0); request; InternetCloseHandle(request), request = 0 ) for( HINTERNET request = InternetOpenUrlA(session, url, NULL, 0, INTERNET_FLAG_RELOAD, 0); request; InternetCloseHandle(request), request = 0 )
for(; InternetReadFile(request, buffer, sizeof(buffer), &response_size) != FALSE && response_size > 0; ) { for(; InternetReadFile(request, buffer, sizeof(buffer), &response_size) != FALSE && response_size > 0; ) {
array_resize(out, pos + response_size); array_resize(out, pos + response_size);
ok = !!memcpy(out + (pos += response_size) - response_size, buffer, response_size); memcpy(out + (pos += response_size) - response_size, buffer, response_size);
} }
return out; return out;
@ -340608,7 +340614,7 @@ void fullscreen_quad_rgb( texture_t texture, float gamma ) {
const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B_flipped.glsl"); const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B_flipped.glsl");
const char* fs = vfs_read("shaders/fs_2_4_texel_inv_gamma.glsl"); const char* fs = vfs_read("shaders/fs_2_4_texel_inv_gamma.glsl");
program = shader(vs, fs, "", "fragcolor" , ""); program = shader(vs, fs, "", "fragcolor" , NULL);
u_inv_gamma = glGetUniformLocation(program, "u_inv_gamma"); u_inv_gamma = glGetUniformLocation(program, "u_inv_gamma");
glGenVertexArrays( 1, (GLuint*)&vao ); glGenVertexArrays( 1, (GLuint*)&vao );
} }
@ -340639,7 +340645,7 @@ void fullscreen_quad_rgb_flipped( texture_t texture, float gamma ) {
const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B.glsl"); const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B.glsl");
const char* fs = vfs_read("shaders/fs_2_4_texel_inv_gamma.glsl"); const char* fs = vfs_read("shaders/fs_2_4_texel_inv_gamma.glsl");
program = shader(vs, fs, "", "fragcolor" , ""); program = shader(vs, fs, "", "fragcolor" , NULL);
u_inv_gamma = glGetUniformLocation(program, "u_inv_gamma"); u_inv_gamma = glGetUniformLocation(program, "u_inv_gamma");
glGenVertexArrays( 1, (GLuint*)&vao ); glGenVertexArrays( 1, (GLuint*)&vao );
} }
@ -340670,7 +340676,7 @@ void fullscreen_quad_ycbcr( texture_t textureYCbCr[3], float gamma ) {
const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B_flipped.glsl"); const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B_flipped.glsl");
const char* fs = vfs_read("shaders/fs_2_4_texel_ycbr_gamma_saturation.glsl"); const char* fs = vfs_read("shaders/fs_2_4_texel_ycbr_gamma_saturation.glsl");
program = shader(vs, fs, "", "fragcolor" , ""); program = shader(vs, fs, "", "fragcolor" , NULL);
u_gamma = glGetUniformLocation(program, "u_gamma"); u_gamma = glGetUniformLocation(program, "u_gamma");
uy = glGetUniformLocation(program, "u_texture_y"); uy = glGetUniformLocation(program, "u_texture_y");
@ -340714,7 +340720,7 @@ void fullscreen_quad_ycbcr_flipped( texture_t textureYCbCr[3], float gamma ) {
const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B.glsl"); const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B.glsl");
const char* fs = vfs_read("shaders/fs_2_4_texel_ycbr_gamma_saturation.glsl"); const char* fs = vfs_read("shaders/fs_2_4_texel_ycbr_gamma_saturation.glsl");
program = shader(vs, fs, "", "fragcolor" , ""); program = shader(vs, fs, "", "fragcolor" , NULL);
u_gamma = glGetUniformLocation(program, "u_gamma"); u_gamma = glGetUniformLocation(program, "u_gamma");
uy = glGetUniformLocation(program, "u_texture_y"); uy = glGetUniformLocation(program, "u_texture_y");
@ -341005,7 +341011,7 @@ static void sprite_render_meshes() {
if( sprite_program < 0 ) { if( sprite_program < 0 ) {
sprite_program = shader( vfs_read("shaders/vs_324_24_sprite.glsl"), vfs_read("shaders/fs_24_4_sprite.glsl"), sprite_program = shader( vfs_read("shaders/vs_324_24_sprite.glsl"), vfs_read("shaders/fs_24_4_sprite.glsl"),
"att_Position,att_TexCoord,att_Color", "att_Position,att_TexCoord,att_Color",
"fragColor", "" "fragColor", NULL
); );
} }
@ -342022,7 +342028,7 @@ skybox_t skybox(const char *asset, int flags) {
sky.flags = flags ? flags : !!asset; // either cubemap or rayleigh sky.flags = flags ? flags : !!asset; // either cubemap or rayleigh
sky.program = shader(vfs_read("shaders/vs_3_3_skybox.glsl"), sky.program = shader(vfs_read("shaders/vs_3_3_skybox.glsl"),
sky.flags ? vfs_read("fs_3_4_skybox.glsl") : vfs_read("shaders/fs_3_4_skybox_rayleigh.glsl"), sky.flags ? vfs_read("fs_3_4_skybox.glsl") : vfs_read("shaders/fs_3_4_skybox_rayleigh.glsl"),
"att_position", "fragcolor", ""); "att_position", "fragcolor", NULL);
// sky cubemap & SH // sky cubemap & SH
if( asset ) { if( asset ) {
@ -342604,7 +342610,7 @@ int postfx_load_from_mem( postfx *fx, const char *name, const char *fs ) {
strcat(fs2, fs); strcat(fs2, fs);
p->program = shader(vs, fs2, "vtexcoord", "fragColor" , ""); p->program = shader(vs, fs2, "vtexcoord", "fragColor" , NULL);
FREE(fs2); FREE(fs2);
@ -342665,6 +342671,9 @@ void postfx_clear(postfx *fx) {
} }
bool postfx_begin(postfx *fx, int width, int height) { bool postfx_begin(postfx *fx, int width, int height) {
// reset clear color: needed in case transparent window is being used (alpha != 0)
glClearColor(0,0,0,0); // @transparent
width += !width; width += !width;
height += !height; height += !height;
@ -342971,7 +342980,7 @@ shadertoy_t shadertoy( const char *shaderfile, unsigned flags ) {
glGenVertexArrays(1, &s.vao); glGenVertexArrays(1, &s.vao);
char *fs = stringf("%s%s", vfs_read("header_shadertoy.glsl"), file); char *fs = stringf("%s%s", vfs_read("header_shadertoy.glsl"), file);
s.program = shader((flags&SHADERTOY_FLIP_Y) ? vfs_read("shaders/vs_shadertoy_flip.glsl") : vfs_read("shaders/vs_shadertoy.glsl"), fs, "", "fragColor", ""); s.program = shader((flags&SHADERTOY_FLIP_Y) ? vfs_read("shaders/vs_shadertoy_flip.glsl") : vfs_read("shaders/vs_shadertoy.glsl"), fs, "", "fragColor", NULL);
FREE(fs); FREE(fs);
if( strstr(file, "noise3.jpg")) if( strstr(file, "noise3.jpg"))
@ -345161,7 +345170,7 @@ scene_t* scene_get_active() {
scene_t* scene_push() { scene_t* scene_push() {
scene_t *s = REALLOC(0, sizeof(scene_t)), clear = {0}; *s = clear; scene_t *s = REALLOC(0, sizeof(scene_t)), clear = {0}; *s = clear;
const char *symbols[] = { "{{include-shadowmap}}", vfs_read("shaders/fs_0_0_shadowmap_lit.glsl") }; const char *symbols[] = { "{{include-shadowmap}}", vfs_read("shaders/fs_0_0_shadowmap_lit.glsl") };
s->program = shader(strlerp(1, symbols, vfs_read("shaders/vs_332_32.glsl")), strlerp(1, symbols, vfs_read("shaders/fs_32_4_model.glsl")), "att_position,att_normal,att_texcoord,att_color", "fragcolor", ""); s->program = shader(strlerp(1, symbols, vfs_read("shaders/vs_332_32.glsl")), strlerp(1, symbols, vfs_read("shaders/fs_32_4_model.glsl")), "att_position,att_normal,att_texcoord,att_color", "fragcolor", NULL);
s->skybox = skybox(NULL, 0); s->skybox = skybox(NULL, 0);
array_push(scenes, s); array_push(scenes, s);
last_scene = s; last_scene = s;
@ -346602,8 +346611,8 @@ void thread_destroy( void *thd ) {
#define UI_FONT_HEADING_SIZE UI_FONT_ENUM(14.5,15) #define UI_FONT_HEADING_SIZE UI_FONT_ENUM(14.5,15)
#define UI_FONT_TERMINAL_SIZE UI_FONT_ENUM(14,14) #define UI_FONT_TERMINAL_SIZE UI_FONT_ENUM(14,14)
#else #else
#define UI_FONT_REGULAR_SIZE UI_FONT_ENUM(14.5,15.5) #define UI_FONT_REGULAR_SIZE UI_FONT_ENUM(14.5,16)
#define UI_FONT_HEADING_SIZE UI_FONT_ENUM(16,17) #define UI_FONT_HEADING_SIZE UI_FONT_ENUM(16,17.5)
#define UI_FONT_TERMINAL_SIZE UI_FONT_ENUM(14,14) #define UI_FONT_TERMINAL_SIZE UI_FONT_ENUM(14,14)
#endif #endif
@ -346753,6 +346762,13 @@ table[NK_COLOR_CHART_COLOR_HIGHLIGHT] = hover_hue; // nk_rgba(255, 0, 0, 255);
// table[NK_COLOR_SELECT] = nk_rgba(57, 67, 61, 255); // table[NK_COLOR_SELECT] = nk_rgba(57, 67, 61, 255);
// table[NK_COLOR_SELECT_ACTIVE] = main; // table[NK_COLOR_SELECT_ACTIVE] = main;
// @transparent
#if !is(ems)
if( glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE )
for(int i = 0; i < countof(table); ++i) table[i].a = 255; // table[i].a ? 255 : 0;
#endif
// @transparent
nk_style_default(ui_ctx); nk_style_default(ui_ctx);
nk_style_from_table(ui_ctx, table); nk_style_from_table(ui_ctx, table);
@ -347327,6 +347343,71 @@ int ui_enable_(int enabled) {
off.window.header.normal.data.color.a *= alpha; off.window.header.normal.data.color.a *= alpha;
off.window.header.hover.data.color.a *= alpha; off.window.header.hover.data.color.a *= alpha;
off.window.header.active.data.color.a *= alpha; off.window.header.active.data.color.a *= alpha;
// @transparent {
// fixes for transparent windows
#if !is(ems)
float hsva[4];
if( glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE ) {
#define fix(col) off.col = nk_rgba_cf(nk_hsva_colorfv( (nk_colorf_hsva_fv(hsva, nk_color_cf(on.col)),hsva[1] *= alpha,hsva[2] *= alpha, hsva) ))
fix(contextual_button.normal.data.color);
fix(menu_button.normal.data.color);
fix(option.normal.data.color);
fix(option.cursor_normal.data.color);
fix(checkbox.normal.data.color);
fix(checkbox.cursor_normal.data.color);
fix(selectable.normal.data.color);
fix(selectable.normal_active.data.color);
fix(slider.normal.data.color);
fix(slider.bar_normal);
fix(slider.cursor_normal.data.color);
fix(slider.dec_button.normal.data.color);
fix(slider.inc_button.normal.data.color);
fix(progress.normal.data.color);
fix(progress.cursor_normal.data.color);
fix(property.normal.data.color);
fix(property.label_normal);
fix(property.edit.normal.data.color);
fix(property.edit.cursor_normal);
fix(property.edit.selected_normal);
fix(property.dec_button.normal.data.color);
fix(property.inc_button.normal.data.color);
fix(edit.normal.data.color);
fix(edit.cursor_normal);
fix(edit.selected_normal);
fix(scrollh.normal.data.color);
fix(scrollh.cursor_normal.data.color);
fix(scrollv.normal.data.color);
fix(scrollv.cursor_normal.data.color);
fix(combo.normal.data.color);
fix(combo.label_normal);
fix(combo.symbol_normal);
fix(combo.button.normal.data.color);
fix(window.header.normal.data.color);
fix(button.normal.data.color);
#undef fix
#define fix(field) on.field.a = off.field.a = 0
fix(button.border_color);
fix(button.border_color);
fix(button.border_color);
fix(contextual_button.border_color);
fix(menu_button.border_color);
fix(option.border_color);
fix(checkbox.border_color);
fix(slider.border_color);
fix(progress.border_color);
fix(property.border_color);
fix(edit.border_color);
fix(chart.border_color);
fix(scrollh.border_color);
fix(scrollv.border_color);
fix(tab.border_color);
fix(combo.border_color);
fix(window.border_color);
#undef fix
}
#endif
// } @transparent
} }
static struct nk_input input; static struct nk_input input;
if (!enabled) { if (!enabled) {
@ -347444,6 +347525,7 @@ void ui_render() {
#if is(ems) #if is(ems)
glFinish(); glFinish();
#endif #endif
ui_dirty = 1; ui_dirty = 1;
ui_hue = 0; ui_hue = 0;
@ -347881,11 +347963,25 @@ int ui_window_end() {
if(ui_window_has_menubar) nk_menubar_end(ui_ctx), ui_window_has_menubar = 0; if(ui_window_has_menubar) nk_menubar_end(ui_ctx), ui_window_has_menubar = 0;
nk_end(ui_ctx), ui_has_window = 0; nk_end(ui_ctx), ui_has_window = 0;
int closed = 0;
if( nk_window_is_hidden(ui_ctx, ui_last_title) ) { if( nk_window_is_hidden(ui_ctx, ui_last_title) ) {
nk_window_close(ui_ctx, ui_last_title); nk_window_close(ui_ctx, ui_last_title);
ui_show(ui_last_title, false); ui_show(ui_last_title, false);
if( ui_last_enabled ) *ui_last_enabled = 0; // clear developers' flag if( ui_last_enabled ) *ui_last_enabled = 0; // clear developers' flag
closed = 1;
} }
// @transparent
#if !is(ems)
static bool has_transparent_attrib = 0; do_once has_transparent_attrib = glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE;
if( closed && has_transparent_attrib && !ui_has_menubar() ) {
bool any_open = 0;
for each_map_ptr(ui_windows, char*, k, unsigned, v) any_open |= *v & 1;
if( !any_open ) glfwSetWindowShouldClose(window_handle(), GLFW_TRUE);
}
#endif
// @transparent
return 0; return 0;
} }
@ -348134,7 +348230,12 @@ int ui_button_transparent(const char *text) {
static static
int ui_button_(const char *text) { int ui_button_(const char *text) {
int ret = 0; // @transparent
static bool transparency_fix_needed = 0; ifndef(ems, do_once transparency_fix_needed = glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE);
const float dim = transparency_fix_needed && ui_alpha < 1 ? 0.5 : 1;
const float dim_alpha = transparency_fix_needed ? 1.0 : 0.90*ui_alpha;
const float text_alpha = transparency_fix_needed ? 1.0 : ui_alpha;
// @transparent
if( 1 ) { if( 1 ) {
#if UI_BUTTON_MONOCHROME #if UI_BUTTON_MONOCHROME
@ -348154,20 +348255,20 @@ int ui_button_(const char *text) {
nk_style_push_color(ui_ctx, &ui_ctx->style.button.hover.data.color, nk_hsva_f(ui_hue,1.00,1.0*ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.hover.data.color, nk_hsva_f(ui_hue,1.00,1.0*ui_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.active.data.color, nk_hsva_f(ui_hue,0.60,0.4*ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.active.data.color, nk_hsva_f(ui_hue,0.60,0.4*ui_alpha));
#else // new #else // new
nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_normal, nk_rgba_f(0.00,0.00,0.00,ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_normal, nk_rgba_f(0.00,0.00,0.00,text_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_hover, nk_rgba_f(0.11,0.11,0.11,ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_hover, nk_rgba_f(0.11,0.11,0.11,text_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_active, nk_rgba_f(0.00,0.00,0.00,ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_active, nk_rgba_f(0.00,0.00,0.00,text_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.normal.data.color, nk_hsva_f(ui_hue,0.80,0.6,0.90*ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.normal.data.color, nk_hsva_f(ui_hue,0.80*dim,0.6*dim,dim_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.hover.data.color, nk_hsva_f(ui_hue,0.85,0.9,0.90*ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.hover.data.color, nk_hsva_f(ui_hue,0.85*dim,0.9*dim,dim_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.active.data.color, nk_hsva_f(ui_hue,0.80,0.6,0.90*ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.active.data.color, nk_hsva_f(ui_hue,0.80*dim,0.6*dim,dim_alpha));
#endif #endif
} }
struct nk_rect bounds = nk_widget_bounds(ui_ctx); struct nk_rect bounds = nk_widget_bounds(ui_ctx);
const char *split = strchr(text, '@'), *tooltip = split + 1; const char *split = strchr(text, '@'), *tooltip = split + 1;
ret = nk_button_text(ui_ctx, text, split ? (int)(split - text) : strlen(text) ); int ret = nk_button_text(ui_ctx, text, split ? (int)(split - text) : strlen(text) );
const struct nk_input *in = &ui_ctx->input; const struct nk_input *in = &ui_ctx->input;
if (split && nk_input_is_mouse_hovering_rect(in, bounds) && !ui_has_active_popups && nk_window_has_focus(ui_ctx)) { if (split && nk_input_is_mouse_hovering_rect(in, bounds) && !ui_has_active_popups && nk_window_has_focus(ui_ctx)) {
@ -348960,7 +349061,7 @@ int ui_demo(int do_windows) {
#line 1 "v4k_profile.c" #line 1 "v4k_profile.c"
#if ENABLE_PROFILER #if ENABLE_PROFILER
profiler_t profiler; profiler_t profiler;
int profiler_enabled = 1; int profiler_enabled = 0;
void (profile_init)() { map_init(profiler, less_str, hash_str); profiler_enabled &= !!profiler; } void (profile_init)() { map_init(profiler, less_str, hash_str); profiler_enabled &= !!profiler; }
int (profile_enable)(bool on) { return profiler_enabled = on; } int (profile_enable)(bool on) { return profiler_enabled = on; }
@ -349372,6 +349473,7 @@ static double t, dt, fps, hz = 0.00;
static char title[128] = {0}; 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 wincolor = {0,0,0,1};
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// glfw // glfw
@ -349485,6 +349587,10 @@ struct nk_glfw *window_handle_nkglfw() {
} }
void glNewFrame() { void glNewFrame() {
// @transparent
// if( input_down(KEY_F1) ) window_transparent(window_has_transparent()^1); // debug
// if( input_down(KEY_F2) ) window_maximize(window_has_maximize()^1); // debug
// @transparent
#if 0 // is(ems) #if 0 // is(ems)
int canvasWidth, canvasHeight; int canvasWidth, canvasHeight;
@ -349521,6 +349627,8 @@ void glNewFrame() {
glViewport(0, 0, window_width(), window_height()); glViewport(0, 0, window_width(), window_height());
// GLfloat bgColor[4]; glGetFloatv(GL_COLOR_CLEAR_VALUE, bgColor);
glClearColor(wincolor.r, wincolor.g, wincolor.b, window_has_transparent() ? 0 : wincolor.a); // @transparent
//glClearColor(0.15,0.15,0.15,1); //glClearColor(0.15,0.15,0.15,1);
//glClearColor( clearColor.r, clearColor.g, clearColor.b, clearColor.a ); //glClearColor( clearColor.r, clearColor.g, clearColor.b, clearColor.a );
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT ); glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT );
@ -349535,10 +349643,14 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
scale = 100.f; scale = 100.f;
#endif #endif
if( flag("--fullscreen") ) scale = 100;
scale = (scale < 1 ? scale * 100 : scale); scale = (scale < 1 ? scale * 100 : scale);
bool FLAGS_FULLSCREEN = scale > 100; bool FLAGS_FULLSCREEN = scale > 100;
bool FLAGS_FULLSCREEN_DESKTOP = scale == 100; bool FLAGS_FULLSCREEN_DESKTOP = scale == 100;
bool FLAGS_WINDOWED = scale < 100; bool FLAGS_WINDOWED = scale < 100;
bool FLAGS_TRANSPARENT = flag("--transparent") || (flags & WINDOW_TRANSPARENT);
if( FLAGS_TRANSPARENT ) FLAGS_FULLSCREEN = 0, FLAGS_FULLSCREEN_DESKTOP = 0, FLAGS_WINDOWED = 1;
scale = (scale > 100 ? 100 : scale) / 100.f; scale = (scale > 100 ? 100 : scale) / 100.f;
int winWidth = window_canvas().w * scale; int winWidth = window_canvas().w * scale;
int winHeight = window_canvas().h * scale; int winHeight = window_canvas().h * scale;
@ -349560,6 +349672,7 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
winHeight = mode->height; winHeight = mode->height;
} }
if( FLAGS_WINDOWED ) { if( FLAGS_WINDOWED ) {
ifndef(ems, glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, FLAGS_TRANSPARENT ? GLFW_TRUE : GLFW_FALSE)); // @transparent
// windowed // windowed
float ratio = (float)winWidth / (winHeight + !winHeight); float ratio = (float)winWidth / (winHeight + !winHeight);
if( flags & WINDOW_SQUARE ) winWidth = winHeight = winWidth > winHeight ? winHeight : winWidth; if( flags & WINDOW_SQUARE ) winWidth = winHeight = winWidth > winHeight ? winHeight : winWidth;
@ -349624,6 +349737,13 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
PRINTF("GPU device: %s\n", glGetString(GL_RENDERER)); PRINTF("GPU device: %s\n", glGetString(GL_RENDERER));
PRINTF("GPU driver: %s\n", glGetString(GL_VERSION)); PRINTF("GPU driver: %s\n", glGetString(GL_VERSION));
#if !is(ems)
if( FLAGS_TRANSPARENT ) { // @transparent
glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_FALSE);
if( scale >= 1 ) glfwMaximizeWindow(window);
}
#endif
g->ctx = ui_ctx; g->ctx = ui_ctx;
g->nk_glfw = &nk_glfw; g->nk_glfw = &nk_glfw;
g->window = window; g->window = window;
@ -349664,6 +349784,7 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
if(JOB_ID==JOB_MAX-1)ddraw_line(vec3(-1,y+pixel*2,0), vec3(1, y+pixel*2,0)); /* full line */ \ if(JOB_ID==JOB_MAX-1)ddraw_line(vec3(-1,y+pixel*2,0), vec3(1, y+pixel*2,0)); /* full line */ \
} while(0) } while(0)
if( FLAGS_TRANSPARENT ) {} else // @transparent
for(int i = 0; i < cook_jobs(); ++i) ddraw_progress_bar(i, cook_jobs(), jobs[i].progress); for(int i = 0; i < cook_jobs(); ++i) ddraw_progress_bar(i, cook_jobs(), jobs[i].progress);
// ddraw_progress_bar(0, 1, cook_progress()); // ddraw_progress_bar(0, 1, cook_progress());
@ -349962,7 +350083,8 @@ void window_color(unsigned color) {
unsigned g = (color >> 8) & 255; unsigned g = (color >> 8) & 255;
unsigned r = (color >> 16) & 255; unsigned r = (color >> 16) & 255;
unsigned a = (color >> 24) & 255; unsigned a = (color >> 24) & 255;
glClearColor(r / 255.0, g / 255.0, b / 255.0, 1.0); wincolor = vec4(r / 255.0, g / 255.0, b / 255.0, a / 255.0);
// glClearColor(wincolor.r, wincolor.g, wincolor.b, 1.0);
} }
void window_icon(const char *file_icon) { void window_icon(const char *file_icon) {
unsigned len = file_size(file_icon); // len = len ? len : vfs_size(file_icon); // @fixme: reenable this to allow icons to be put in cooked .zipfiles unsigned len = file_size(file_icon); // len = len ? len : vfs_size(file_icon); // @fixme: reenable this to allow icons to be put in cooked .zipfiles
@ -350209,6 +350331,39 @@ void window_aspect_unlock() {
if(!window) return; if(!window) return;
window_aspect_lock(0, 0); window_aspect_lock(0, 0);
} }
void window_transparent(int enabled) {
#if !is(ems)
if( !window_has_fullscreen() ) {
if( enabled ) {
glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_FALSE);
//glfwMaximizeWindow(window);
} else {
//glfwRestoreWindow(window);
glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_TRUE);
}
}
#endif
}
int window_has_transparent() {
return ifdef(ems, 0, glfwGetWindowAttrib(window, GLFW_DECORATED) != GLFW_TRUE);
}
void window_maximize(int enabled) {
ifdef(ems, return);
if( !window_has_fullscreen() ) {
if( enabled ) {
glfwMaximizeWindow(window);
} else {
glfwRestoreWindow(window);
}
}
}
int window_has_maximize() {
return ifdef(ems, 0, glfwGetWindowAttrib(window, GLFW_MAXIMIZED) == GLFW_TRUE);
}
#line 0 #line 0
#line 1 "v4k_obj.c" #line 1 "v4k_obj.c"

1
engine/split/v4k_config.h
View File

@ -282,6 +282,7 @@ typedef char bool;
#pragma comment(lib, "shell32") #pragma comment(lib, "shell32")
#pragma comment(lib, "user32") #pragma comment(lib, "user32")
#pragma comment(lib, "winmm") #pragma comment(lib, "winmm")
#pragma comment(lib, "wininet")
#pragma comment(lib, "ws2_32") #pragma comment(lib, "ws2_32")
#endif #endif

2
engine/split/v4k_font.c
View File

@ -1694,7 +1694,7 @@ void font_face_from_mem(const char *tag, const void *ttf_bufferv, unsigned ttf_l
const char *vs_filename = 0, *fs_filename = 0; const char *vs_filename = 0, *fs_filename = 0;
const char *vs = vs_filename ? file_read(vs_filename) : mv_vs_source; const char *vs = vs_filename ? file_read(vs_filename) : mv_vs_source;
const char *fs = fs_filename ? file_read(fs_filename) : mv_fs_source; const char *fs = fs_filename ? file_read(fs_filename) : mv_fs_source;
f->program = shader(vs, fs, "vertexPosition,instanceGlyph", "outColor", ""); f->program = shader(vs, fs, "vertexPosition,instanceGlyph", "outColor", NULL);
// figure out what ranges we're about to bake // figure out what ranges we're about to bake
#define MERGE_TABLE(table) do { \ #define MERGE_TABLE(table) do { \

4
engine/split/v4k_network.c
View File

@ -1,3 +1,4 @@
#if is(tcc) && is(win32) // @fixme: https lib is broken with tcc. replaced with InternetReadFile() api for now #if is(tcc) && is(win32) // @fixme: https lib is broken with tcc. replaced with InternetReadFile() api for now
# include <wininet.h> # include <wininet.h>
@ -20,7 +21,6 @@ int download_file( FILE *out, const char *url ) {
} }
array(char) download( const char *url ) { array(char) download( const char *url ) {
int ok = false;
char buffer[ 4096 ]; char buffer[ 4096 ];
DWORD response_size = 0, pos = 0; DWORD response_size = 0, pos = 0;
@ -29,7 +29,7 @@ array(char) download( const char *url ) {
for( HINTERNET request = InternetOpenUrlA(session, url, NULL, 0, INTERNET_FLAG_RELOAD, 0); request; InternetCloseHandle(request), request = 0 ) for( HINTERNET request = InternetOpenUrlA(session, url, NULL, 0, INTERNET_FLAG_RELOAD, 0); request; InternetCloseHandle(request), request = 0 )
for(; InternetReadFile(request, buffer, sizeof(buffer), &response_size) != FALSE && response_size > 0; ) { for(; InternetReadFile(request, buffer, sizeof(buffer), &response_size) != FALSE && response_size > 0; ) {
array_resize(out, pos + response_size); array_resize(out, pos + response_size);
ok = !!memcpy(out + (pos += response_size) - response_size, buffer, response_size); memcpy(out + (pos += response_size) - response_size, buffer, response_size);
} }
return out; return out;

2
engine/split/v4k_profile.c
View File

@ -1,6 +1,6 @@
#if ENABLE_PROFILER #if ENABLE_PROFILER
profiler_t profiler; profiler_t profiler;
int profiler_enabled = 1; int profiler_enabled = 0;
void (profile_init)() { map_init(profiler, less_str, hash_str); profiler_enabled &= !!profiler; } void (profile_init)() { map_init(profiler, less_str, hash_str); profiler_enabled &= !!profiler; }
int (profile_enable)(bool on) { return profiler_enabled = on; } int (profile_enable)(bool on) { return profiler_enabled = on; }

19
engine/split/v4k_render.c
View File

@ -1042,7 +1042,7 @@ void fullscreen_quad_rgb( texture_t texture, float gamma ) {
const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B_flipped.glsl"); const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B_flipped.glsl");
const char* fs = vfs_read("shaders/fs_2_4_texel_inv_gamma.glsl"); const char* fs = vfs_read("shaders/fs_2_4_texel_inv_gamma.glsl");
program = shader(vs, fs, "", "fragcolor" , ""); program = shader(vs, fs, "", "fragcolor" , NULL);
u_inv_gamma = glGetUniformLocation(program, "u_inv_gamma"); u_inv_gamma = glGetUniformLocation(program, "u_inv_gamma");
glGenVertexArrays( 1, (GLuint*)&vao ); glGenVertexArrays( 1, (GLuint*)&vao );
} }
@ -1073,7 +1073,7 @@ void fullscreen_quad_rgb_flipped( texture_t texture, float gamma ) {
const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B.glsl"); const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B.glsl");
const char* fs = vfs_read("shaders/fs_2_4_texel_inv_gamma.glsl"); const char* fs = vfs_read("shaders/fs_2_4_texel_inv_gamma.glsl");
program = shader(vs, fs, "", "fragcolor" , ""); program = shader(vs, fs, "", "fragcolor" , NULL);
u_inv_gamma = glGetUniformLocation(program, "u_inv_gamma"); u_inv_gamma = glGetUniformLocation(program, "u_inv_gamma");
glGenVertexArrays( 1, (GLuint*)&vao ); glGenVertexArrays( 1, (GLuint*)&vao );
} }
@ -1104,7 +1104,7 @@ void fullscreen_quad_ycbcr( texture_t textureYCbCr[3], float gamma ) {
const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B_flipped.glsl"); const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B_flipped.glsl");
const char* fs = vfs_read("shaders/fs_2_4_texel_ycbr_gamma_saturation.glsl"); const char* fs = vfs_read("shaders/fs_2_4_texel_ycbr_gamma_saturation.glsl");
program = shader(vs, fs, "", "fragcolor" , ""); program = shader(vs, fs, "", "fragcolor" , NULL);
u_gamma = glGetUniformLocation(program, "u_gamma"); u_gamma = glGetUniformLocation(program, "u_gamma");
uy = glGetUniformLocation(program, "u_texture_y"); uy = glGetUniformLocation(program, "u_texture_y");
@ -1148,7 +1148,7 @@ void fullscreen_quad_ycbcr_flipped( texture_t textureYCbCr[3], float gamma ) {
const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B.glsl"); const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B.glsl");
const char* fs = vfs_read("shaders/fs_2_4_texel_ycbr_gamma_saturation.glsl"); const char* fs = vfs_read("shaders/fs_2_4_texel_ycbr_gamma_saturation.glsl");
program = shader(vs, fs, "", "fragcolor" , ""); program = shader(vs, fs, "", "fragcolor" , NULL);
u_gamma = glGetUniformLocation(program, "u_gamma"); u_gamma = glGetUniformLocation(program, "u_gamma");
uy = glGetUniformLocation(program, "u_texture_y"); uy = glGetUniformLocation(program, "u_texture_y");
@ -1439,7 +1439,7 @@ static void sprite_render_meshes() {
if( sprite_program < 0 ) { if( sprite_program < 0 ) {
sprite_program = shader( vfs_read("shaders/vs_324_24_sprite.glsl"), vfs_read("shaders/fs_24_4_sprite.glsl"), sprite_program = shader( vfs_read("shaders/vs_324_24_sprite.glsl"), vfs_read("shaders/fs_24_4_sprite.glsl"),
"att_Position,att_TexCoord,att_Color", "att_Position,att_TexCoord,att_Color",
"fragColor", "" "fragColor", NULL
); );
} }
@ -2456,7 +2456,7 @@ skybox_t skybox(const char *asset, int flags) {
sky.flags = flags ? flags : !!asset; // either cubemap or rayleigh sky.flags = flags ? flags : !!asset; // either cubemap or rayleigh
sky.program = shader(vfs_read("shaders/vs_3_3_skybox.glsl"), sky.program = shader(vfs_read("shaders/vs_3_3_skybox.glsl"),
sky.flags ? vfs_read("fs_3_4_skybox.glsl") : vfs_read("shaders/fs_3_4_skybox_rayleigh.glsl"), sky.flags ? vfs_read("fs_3_4_skybox.glsl") : vfs_read("shaders/fs_3_4_skybox_rayleigh.glsl"),
"att_position", "fragcolor", ""); "att_position", "fragcolor", NULL);
// sky cubemap & SH // sky cubemap & SH
if( asset ) { if( asset ) {
@ -3038,7 +3038,7 @@ int postfx_load_from_mem( postfx *fx, const char *name, const char *fs ) {
strcat(fs2, fs); strcat(fs2, fs);
p->program = shader(vs, fs2, "vtexcoord", "fragColor" , ""); p->program = shader(vs, fs2, "vtexcoord", "fragColor" , NULL);
FREE(fs2); FREE(fs2);
@ -3099,6 +3099,9 @@ void postfx_clear(postfx *fx) {
} }
bool postfx_begin(postfx *fx, int width, int height) { bool postfx_begin(postfx *fx, int width, int height) {
// reset clear color: needed in case transparent window is being used (alpha != 0)
glClearColor(0,0,0,0); // @transparent
width += !width; width += !width;
height += !height; height += !height;
@ -3405,7 +3408,7 @@ shadertoy_t shadertoy( const char *shaderfile, unsigned flags ) {
glGenVertexArrays(1, &s.vao); glGenVertexArrays(1, &s.vao);
char *fs = stringf("%s%s", vfs_read("header_shadertoy.glsl"), file); char *fs = stringf("%s%s", vfs_read("header_shadertoy.glsl"), file);
s.program = shader((flags&SHADERTOY_FLIP_Y) ? vfs_read("shaders/vs_shadertoy_flip.glsl") : vfs_read("shaders/vs_shadertoy.glsl"), fs, "", "fragColor", ""); s.program = shader((flags&SHADERTOY_FLIP_Y) ? vfs_read("shaders/vs_shadertoy_flip.glsl") : vfs_read("shaders/vs_shadertoy.glsl"), fs, "", "fragColor", NULL);
FREE(fs); FREE(fs);
if( strstr(file, "noise3.jpg")) if( strstr(file, "noise3.jpg"))

4
engine/split/v4k_render.h
View File

@ -18,7 +18,7 @@ API unsigned bgraf( float b, float g, float r, float a );
API float alpha( unsigned rgba ); API float alpha( unsigned rgba );
#define RGBX(rgb,x) ( ((rgb)&0xFFFFFF) | (((unsigned)(x))<<24) ) #define RGBX(rgb,x) ( ((rgb)&0xFFFFFF) | (((unsigned)(x))<<24) )
#define RGB3(r,g,b) ( ((r)<<16) | ((g)<<8) | (b) ) #define RGB3(r,g,b) ( (255<<24) | ((r)<<16) | ((g)<<8) | (b) )
#define RGB4(r,g,b,a) RGBX(RGB3(r,g,b),a) #define RGB4(r,g,b,a) RGBX(RGB3(r,g,b),a)
#define BLACK RGBX(0x000000,255) #define BLACK RGBX(0x000000,255)
@ -40,7 +40,7 @@ API float alpha( unsigned rgba );
#define ORANGE RGB3( 255,144,48 ) #define ORANGE RGB3( 255,144,48 )
#define PURPLE RGB3( 102,77,102 ) // 178,128,255 ) #define PURPLE RGB3( 102,77,102 ) // 178,128,255 )
#define YELLOW RGB3( 255,224,0 ) #define YELLOW RGB3( 255,224,0 )
#define GRAY RGB3( 149,149,149 ) #define GRAY RGB3( 32, 32, 32 ) // 149,149,149 )
#define PINK RGB3( 255,48,144 ) #define PINK RGB3( 255,48,144 )
#define AQUA RGB3( 48,255,144 ) #define AQUA RGB3( 48,255,144 )

2
engine/split/v4k_scene.c
View File

@ -257,7 +257,7 @@ scene_t* scene_get_active() {
scene_t* scene_push() { scene_t* scene_push() {
scene_t *s = REALLOC(0, sizeof(scene_t)), clear = {0}; *s = clear; scene_t *s = REALLOC(0, sizeof(scene_t)), clear = {0}; *s = clear;
const char *symbols[] = { "{{include-shadowmap}}", vfs_read("shaders/fs_0_0_shadowmap_lit.glsl") }; const char *symbols[] = { "{{include-shadowmap}}", vfs_read("shaders/fs_0_0_shadowmap_lit.glsl") };
s->program = shader(strlerp(1, symbols, vfs_read("shaders/vs_332_32.glsl")), strlerp(1, symbols, vfs_read("shaders/fs_32_4_model.glsl")), "att_position,att_normal,att_texcoord,att_color", "fragcolor", ""); s->program = shader(strlerp(1, symbols, vfs_read("shaders/vs_332_32.glsl")), strlerp(1, symbols, vfs_read("shaders/fs_32_4_model.glsl")), "att_position,att_normal,att_texcoord,att_color", "fragcolor", NULL);
s->skybox = skybox(NULL, 0); s->skybox = skybox(NULL, 0);
array_push(scenes, s); array_push(scenes, s);
last_scene = s; last_scene = s;

112
engine/split/v4k_ui.c
View File

@ -25,8 +25,8 @@
#define UI_FONT_HEADING_SIZE UI_FONT_ENUM(14.5,15) #define UI_FONT_HEADING_SIZE UI_FONT_ENUM(14.5,15)
#define UI_FONT_TERMINAL_SIZE UI_FONT_ENUM(14,14) #define UI_FONT_TERMINAL_SIZE UI_FONT_ENUM(14,14)
#else #else
#define UI_FONT_REGULAR_SIZE UI_FONT_ENUM(14.5,15.5) #define UI_FONT_REGULAR_SIZE UI_FONT_ENUM(14.5,16)
#define UI_FONT_HEADING_SIZE UI_FONT_ENUM(16,17) #define UI_FONT_HEADING_SIZE UI_FONT_ENUM(16,17.5)
#define UI_FONT_TERMINAL_SIZE UI_FONT_ENUM(14,14) #define UI_FONT_TERMINAL_SIZE UI_FONT_ENUM(14,14)
#endif #endif
@ -176,6 +176,13 @@ table[NK_COLOR_CHART_COLOR_HIGHLIGHT] = hover_hue; // nk_rgba(255, 0, 0, 255);
// table[NK_COLOR_SELECT] = nk_rgba(57, 67, 61, 255); // table[NK_COLOR_SELECT] = nk_rgba(57, 67, 61, 255);
// table[NK_COLOR_SELECT_ACTIVE] = main; // table[NK_COLOR_SELECT_ACTIVE] = main;
// @transparent
#if !is(ems)
if( glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE )
for(int i = 0; i < countof(table); ++i) table[i].a = 255; // table[i].a ? 255 : 0;
#endif
// @transparent
nk_style_default(ui_ctx); nk_style_default(ui_ctx);
nk_style_from_table(ui_ctx, table); nk_style_from_table(ui_ctx, table);
@ -750,6 +757,71 @@ int ui_enable_(int enabled) {
off.window.header.normal.data.color.a *= alpha; off.window.header.normal.data.color.a *= alpha;
off.window.header.hover.data.color.a *= alpha; off.window.header.hover.data.color.a *= alpha;
off.window.header.active.data.color.a *= alpha; off.window.header.active.data.color.a *= alpha;
// @transparent {
// fixes for transparent windows
#if !is(ems)
float hsva[4];
if( glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE ) {
#define fix(col) off.col = nk_rgba_cf(nk_hsva_colorfv( (nk_colorf_hsva_fv(hsva, nk_color_cf(on.col)),hsva[1] *= alpha,hsva[2] *= alpha, hsva) ))
fix(contextual_button.normal.data.color);
fix(menu_button.normal.data.color);
fix(option.normal.data.color);
fix(option.cursor_normal.data.color);
fix(checkbox.normal.data.color);
fix(checkbox.cursor_normal.data.color);
fix(selectable.normal.data.color);
fix(selectable.normal_active.data.color);
fix(slider.normal.data.color);
fix(slider.bar_normal);
fix(slider.cursor_normal.data.color);
fix(slider.dec_button.normal.data.color);
fix(slider.inc_button.normal.data.color);
fix(progress.normal.data.color);
fix(progress.cursor_normal.data.color);
fix(property.normal.data.color);
fix(property.label_normal);
fix(property.edit.normal.data.color);
fix(property.edit.cursor_normal);
fix(property.edit.selected_normal);
fix(property.dec_button.normal.data.color);
fix(property.inc_button.normal.data.color);
fix(edit.normal.data.color);
fix(edit.cursor_normal);
fix(edit.selected_normal);
fix(scrollh.normal.data.color);
fix(scrollh.cursor_normal.data.color);
fix(scrollv.normal.data.color);
fix(scrollv.cursor_normal.data.color);
fix(combo.normal.data.color);
fix(combo.label_normal);
fix(combo.symbol_normal);
fix(combo.button.normal.data.color);
fix(window.header.normal.data.color);
fix(button.normal.data.color);
#undef fix
#define fix(field) on.field.a = off.field.a = 0
fix(button.border_color);
fix(button.border_color);
fix(button.border_color);
fix(contextual_button.border_color);
fix(menu_button.border_color);
fix(option.border_color);
fix(checkbox.border_color);
fix(slider.border_color);
fix(progress.border_color);
fix(property.border_color);
fix(edit.border_color);
fix(chart.border_color);
fix(scrollh.border_color);
fix(scrollv.border_color);
fix(tab.border_color);
fix(combo.border_color);
fix(window.border_color);
#undef fix
}
#endif
// } @transparent
} }
static struct nk_input input; static struct nk_input input;
if (!enabled) { if (!enabled) {
@ -867,6 +939,7 @@ void ui_render() {
#if is(ems) #if is(ems)
glFinish(); glFinish();
#endif #endif
ui_dirty = 1; ui_dirty = 1;
ui_hue = 0; ui_hue = 0;
@ -1304,11 +1377,25 @@ int ui_window_end() {
if(ui_window_has_menubar) nk_menubar_end(ui_ctx), ui_window_has_menubar = 0; if(ui_window_has_menubar) nk_menubar_end(ui_ctx), ui_window_has_menubar = 0;
nk_end(ui_ctx), ui_has_window = 0; nk_end(ui_ctx), ui_has_window = 0;
int closed = 0;
if( nk_window_is_hidden(ui_ctx, ui_last_title) ) { if( nk_window_is_hidden(ui_ctx, ui_last_title) ) {
nk_window_close(ui_ctx, ui_last_title); nk_window_close(ui_ctx, ui_last_title);
ui_show(ui_last_title, false); ui_show(ui_last_title, false);
if( ui_last_enabled ) *ui_last_enabled = 0; // clear developers' flag if( ui_last_enabled ) *ui_last_enabled = 0; // clear developers' flag
closed = 1;
} }
// @transparent
#if !is(ems)
static bool has_transparent_attrib = 0; do_once has_transparent_attrib = glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE;
if( closed && has_transparent_attrib && !ui_has_menubar() ) {
bool any_open = 0;
for each_map_ptr(ui_windows, char*, k, unsigned, v) any_open |= *v & 1;
if( !any_open ) glfwSetWindowShouldClose(window_handle(), GLFW_TRUE);
}
#endif
// @transparent
return 0; return 0;
} }
@ -1557,7 +1644,12 @@ int ui_button_transparent(const char *text) {
static static
int ui_button_(const char *text) { int ui_button_(const char *text) {
int ret = 0; // @transparent
static bool transparency_fix_needed = 0; ifndef(ems, do_once transparency_fix_needed = glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE);
const float dim = transparency_fix_needed && ui_alpha < 1 ? 0.5 : 1;
const float dim_alpha = transparency_fix_needed ? 1.0 : 0.90*ui_alpha;
const float text_alpha = transparency_fix_needed ? 1.0 : ui_alpha;
// @transparent
if( 1 ) { if( 1 ) {
#if UI_BUTTON_MONOCHROME #if UI_BUTTON_MONOCHROME
@ -1577,20 +1669,20 @@ int ui_button_(const char *text) {
nk_style_push_color(ui_ctx, &ui_ctx->style.button.hover.data.color, nk_hsva_f(ui_hue,1.00,1.0*ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.hover.data.color, nk_hsva_f(ui_hue,1.00,1.0*ui_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.active.data.color, nk_hsva_f(ui_hue,0.60,0.4*ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.active.data.color, nk_hsva_f(ui_hue,0.60,0.4*ui_alpha));
#else // new #else // new
nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_normal, nk_rgba_f(0.00,0.00,0.00,ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_normal, nk_rgba_f(0.00,0.00,0.00,text_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_hover, nk_rgba_f(0.11,0.11,0.11,ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_hover, nk_rgba_f(0.11,0.11,0.11,text_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_active, nk_rgba_f(0.00,0.00,0.00,ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_active, nk_rgba_f(0.00,0.00,0.00,text_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.normal.data.color, nk_hsva_f(ui_hue,0.80,0.6,0.90*ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.normal.data.color, nk_hsva_f(ui_hue,0.80*dim,0.6*dim,dim_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.hover.data.color, nk_hsva_f(ui_hue,0.85,0.9,0.90*ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.hover.data.color, nk_hsva_f(ui_hue,0.85*dim,0.9*dim,dim_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.active.data.color, nk_hsva_f(ui_hue,0.80,0.6,0.90*ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.active.data.color, nk_hsva_f(ui_hue,0.80*dim,0.6*dim,dim_alpha));
#endif #endif
} }
struct nk_rect bounds = nk_widget_bounds(ui_ctx); struct nk_rect bounds = nk_widget_bounds(ui_ctx);
const char *split = strchr(text, '@'), *tooltip = split + 1; const char *split = strchr(text, '@'), *tooltip = split + 1;
ret = nk_button_text(ui_ctx, text, split ? (int)(split - text) : strlen(text) ); int ret = nk_button_text(ui_ctx, text, split ? (int)(split - text) : strlen(text) );
const struct nk_input *in = &ui_ctx->input; const struct nk_input *in = &ui_ctx->input;
if (split && nk_input_is_mouse_hovering_rect(in, bounds) && !ui_has_active_popups && nk_window_has_focus(ui_ctx)) { if (split && nk_input_is_mouse_hovering_rect(in, bounds) && !ui_has_active_popups && nk_window_has_focus(ui_ctx)) {

56
engine/split/v4k_window.c
View File

@ -107,6 +107,7 @@ static double t, dt, fps, hz = 0.00;
static char title[128] = {0}; 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 wincolor = {0,0,0,1};
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// glfw // glfw
@ -220,6 +221,10 @@ struct nk_glfw *window_handle_nkglfw() {
} }
void glNewFrame() { void glNewFrame() {
// @transparent
// if( input_down(KEY_F1) ) window_transparent(window_has_transparent()^1); // debug
// if( input_down(KEY_F2) ) window_maximize(window_has_maximize()^1); // debug
// @transparent
#if 0 // is(ems) #if 0 // is(ems)
int canvasWidth, canvasHeight; int canvasWidth, canvasHeight;
@ -256,6 +261,8 @@ void glNewFrame() {
glViewport(0, 0, window_width(), window_height()); glViewport(0, 0, window_width(), window_height());
// GLfloat bgColor[4]; glGetFloatv(GL_COLOR_CLEAR_VALUE, bgColor);
glClearColor(wincolor.r, wincolor.g, wincolor.b, window_has_transparent() ? 0 : wincolor.a); // @transparent
//glClearColor(0.15,0.15,0.15,1); //glClearColor(0.15,0.15,0.15,1);
//glClearColor( clearColor.r, clearColor.g, clearColor.b, clearColor.a ); //glClearColor( clearColor.r, clearColor.g, clearColor.b, clearColor.a );
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT ); glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT );
@ -270,10 +277,14 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
scale = 100.f; scale = 100.f;
#endif #endif
if( flag("--fullscreen") ) scale = 100;
scale = (scale < 1 ? scale * 100 : scale); scale = (scale < 1 ? scale * 100 : scale);
bool FLAGS_FULLSCREEN = scale > 100; bool FLAGS_FULLSCREEN = scale > 100;
bool FLAGS_FULLSCREEN_DESKTOP = scale == 100; bool FLAGS_FULLSCREEN_DESKTOP = scale == 100;
bool FLAGS_WINDOWED = scale < 100; bool FLAGS_WINDOWED = scale < 100;
bool FLAGS_TRANSPARENT = flag("--transparent") || (flags & WINDOW_TRANSPARENT);
if( FLAGS_TRANSPARENT ) FLAGS_FULLSCREEN = 0, FLAGS_FULLSCREEN_DESKTOP = 0, FLAGS_WINDOWED = 1;
scale = (scale > 100 ? 100 : scale) / 100.f; scale = (scale > 100 ? 100 : scale) / 100.f;
int winWidth = window_canvas().w * scale; int winWidth = window_canvas().w * scale;
int winHeight = window_canvas().h * scale; int winHeight = window_canvas().h * scale;
@ -295,6 +306,7 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
winHeight = mode->height; winHeight = mode->height;
} }
if( FLAGS_WINDOWED ) { if( FLAGS_WINDOWED ) {
ifndef(ems, glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, FLAGS_TRANSPARENT ? GLFW_TRUE : GLFW_FALSE)); // @transparent
// windowed // windowed
float ratio = (float)winWidth / (winHeight + !winHeight); float ratio = (float)winWidth / (winHeight + !winHeight);
if( flags & WINDOW_SQUARE ) winWidth = winHeight = winWidth > winHeight ? winHeight : winWidth; if( flags & WINDOW_SQUARE ) winWidth = winHeight = winWidth > winHeight ? winHeight : winWidth;
@ -359,6 +371,13 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
PRINTF("GPU device: %s\n", glGetString(GL_RENDERER)); PRINTF("GPU device: %s\n", glGetString(GL_RENDERER));
PRINTF("GPU driver: %s\n", glGetString(GL_VERSION)); PRINTF("GPU driver: %s\n", glGetString(GL_VERSION));
#if !is(ems)
if( FLAGS_TRANSPARENT ) { // @transparent
glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_FALSE);
if( scale >= 1 ) glfwMaximizeWindow(window);
}
#endif
g->ctx = ui_ctx; g->ctx = ui_ctx;
g->nk_glfw = &nk_glfw; g->nk_glfw = &nk_glfw;
g->window = window; g->window = window;
@ -399,6 +418,7 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
if(JOB_ID==JOB_MAX-1)ddraw_line(vec3(-1,y+pixel*2,0), vec3(1, y+pixel*2,0)); /* full line */ \ if(JOB_ID==JOB_MAX-1)ddraw_line(vec3(-1,y+pixel*2,0), vec3(1, y+pixel*2,0)); /* full line */ \
} while(0) } while(0)
if( FLAGS_TRANSPARENT ) {} else // @transparent
for(int i = 0; i < cook_jobs(); ++i) ddraw_progress_bar(i, cook_jobs(), jobs[i].progress); for(int i = 0; i < cook_jobs(); ++i) ddraw_progress_bar(i, cook_jobs(), jobs[i].progress);
// ddraw_progress_bar(0, 1, cook_progress()); // ddraw_progress_bar(0, 1, cook_progress());
@ -697,7 +717,8 @@ void window_color(unsigned color) {
unsigned g = (color >> 8) & 255; unsigned g = (color >> 8) & 255;
unsigned r = (color >> 16) & 255; unsigned r = (color >> 16) & 255;
unsigned a = (color >> 24) & 255; unsigned a = (color >> 24) & 255;
glClearColor(r / 255.0, g / 255.0, b / 255.0, 1.0); wincolor = vec4(r / 255.0, g / 255.0, b / 255.0, a / 255.0);
// glClearColor(wincolor.r, wincolor.g, wincolor.b, 1.0);
} }
void window_icon(const char *file_icon) { void window_icon(const char *file_icon) {
unsigned len = file_size(file_icon); // len = len ? len : vfs_size(file_icon); // @fixme: reenable this to allow icons to be put in cooked .zipfiles unsigned len = file_size(file_icon); // len = len ? len : vfs_size(file_icon); // @fixme: reenable this to allow icons to be put in cooked .zipfiles
@ -944,3 +965,36 @@ void window_aspect_unlock() {
if(!window) return; if(!window) return;
window_aspect_lock(0, 0); window_aspect_lock(0, 0);
} }
void window_transparent(int enabled) {
#if !is(ems)
if( !window_has_fullscreen() ) {
if( enabled ) {
glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_FALSE);
//glfwMaximizeWindow(window);
} else {
//glfwRestoreWindow(window);
glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_TRUE);
}
}
#endif
}
int window_has_transparent() {
return ifdef(ems, 0, glfwGetWindowAttrib(window, GLFW_DECORATED) != GLFW_TRUE);
}
void window_maximize(int enabled) {
ifdef(ems, return);
if( !window_has_fullscreen() ) {
if( enabled ) {
glfwMaximizeWindow(window);
} else {
glfwRestoreWindow(window);
}
}
}
int window_has_maximize() {
return ifdef(ems, 0, glfwGetWindowAttrib(window, GLFW_MAXIMIZED) == GLFW_TRUE);
}

5
engine/split/v4k_window.h
View File

@ -16,6 +16,7 @@ enum WINDOW_FLAGS {
WINDOW_LANDSCAPE = 0x80, WINDOW_LANDSCAPE = 0x80,
WINDOW_ASPECT = 0x100, // keep aspect WINDOW_ASPECT = 0x100, // keep aspect
WINDOW_FIXED = 0x200, // disable resizing WINDOW_FIXED = 0x200, // disable resizing
WINDOW_TRANSPARENT = 0x400,
WINDOW_VSYNC = 0, WINDOW_VSYNC = 0,
WINDOW_VSYNC_ADAPTIVE = 0x1000, WINDOW_VSYNC_ADAPTIVE = 0x1000,
@ -60,6 +61,10 @@ API void window_pause(int paused);
API int window_has_pause(); API int window_has_pause();
API void window_visible(int visible); API void window_visible(int visible);
API int window_has_visible(); API int window_has_visible();
API void window_maximize(int enabled);
API int window_has_maximize();
API void window_transparent(int enabled);
API int window_has_transparent();
API double window_aspect(); API double window_aspect();
API void window_aspect_lock(unsigned numer, unsigned denom); API void window_aspect_lock(unsigned numer, unsigned denom);

197
engine/v4k.c
View File

@ -6854,7 +6854,7 @@ void font_face_from_mem(const char *tag, const void *ttf_bufferv, unsigned ttf_l
const char *vs_filename = 0, *fs_filename = 0; const char *vs_filename = 0, *fs_filename = 0;
const char *vs = vs_filename ? file_read(vs_filename) : mv_vs_source; const char *vs = vs_filename ? file_read(vs_filename) : mv_vs_source;
const char *fs = fs_filename ? file_read(fs_filename) : mv_fs_source; const char *fs = fs_filename ? file_read(fs_filename) : mv_fs_source;
f->program = shader(vs, fs, "vertexPosition,instanceGlyph", "outColor", ""); f->program = shader(vs, fs, "vertexPosition,instanceGlyph", "outColor", NULL);
// figure out what ranges we're about to bake // figure out what ranges we're about to bake
#define MERGE_TABLE(table) do { \ #define MERGE_TABLE(table) do { \
@ -9266,6 +9266,7 @@ void* forget( void *ptr ) {
#line 0 #line 0
#line 1 "v4k_network.c" #line 1 "v4k_network.c"
#if is(tcc) && is(win32) // @fixme: https lib is broken with tcc. replaced with InternetReadFile() api for now #if is(tcc) && is(win32) // @fixme: https lib is broken with tcc. replaced with InternetReadFile() api for now
# include <wininet.h> # include <wininet.h>
@ -9288,7 +9289,6 @@ int download_file( FILE *out, const char *url ) {
} }
array(char) download( const char *url ) { array(char) download( const char *url ) {
int ok = false;
char buffer[ 4096 ]; char buffer[ 4096 ];
DWORD response_size = 0, pos = 0; DWORD response_size = 0, pos = 0;
@ -9297,7 +9297,7 @@ array(char) download( const char *url ) {
for( HINTERNET request = InternetOpenUrlA(session, url, NULL, 0, INTERNET_FLAG_RELOAD, 0); request; InternetCloseHandle(request), request = 0 ) for( HINTERNET request = InternetOpenUrlA(session, url, NULL, 0, INTERNET_FLAG_RELOAD, 0); request; InternetCloseHandle(request), request = 0 )
for(; InternetReadFile(request, buffer, sizeof(buffer), &response_size) != FALSE && response_size > 0; ) { for(; InternetReadFile(request, buffer, sizeof(buffer), &response_size) != FALSE && response_size > 0; ) {
array_resize(out, pos + response_size); array_resize(out, pos + response_size);
ok = !!memcpy(out + (pos += response_size) - response_size, buffer, response_size); memcpy(out + (pos += response_size) - response_size, buffer, response_size);
} }
return out; return out;
@ -11306,7 +11306,7 @@ void fullscreen_quad_rgb( texture_t texture, float gamma ) {
const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B_flipped.glsl"); const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B_flipped.glsl");
const char* fs = vfs_read("shaders/fs_2_4_texel_inv_gamma.glsl"); const char* fs = vfs_read("shaders/fs_2_4_texel_inv_gamma.glsl");
program = shader(vs, fs, "", "fragcolor" , ""); program = shader(vs, fs, "", "fragcolor" , NULL);
u_inv_gamma = glGetUniformLocation(program, "u_inv_gamma"); u_inv_gamma = glGetUniformLocation(program, "u_inv_gamma");
glGenVertexArrays( 1, (GLuint*)&vao ); glGenVertexArrays( 1, (GLuint*)&vao );
} }
@ -11337,7 +11337,7 @@ void fullscreen_quad_rgb_flipped( texture_t texture, float gamma ) {
const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B.glsl"); const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B.glsl");
const char* fs = vfs_read("shaders/fs_2_4_texel_inv_gamma.glsl"); const char* fs = vfs_read("shaders/fs_2_4_texel_inv_gamma.glsl");
program = shader(vs, fs, "", "fragcolor" , ""); program = shader(vs, fs, "", "fragcolor" , NULL);
u_inv_gamma = glGetUniformLocation(program, "u_inv_gamma"); u_inv_gamma = glGetUniformLocation(program, "u_inv_gamma");
glGenVertexArrays( 1, (GLuint*)&vao ); glGenVertexArrays( 1, (GLuint*)&vao );
} }
@ -11368,7 +11368,7 @@ void fullscreen_quad_ycbcr( texture_t textureYCbCr[3], float gamma ) {
const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B_flipped.glsl"); const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B_flipped.glsl");
const char* fs = vfs_read("shaders/fs_2_4_texel_ycbr_gamma_saturation.glsl"); const char* fs = vfs_read("shaders/fs_2_4_texel_ycbr_gamma_saturation.glsl");
program = shader(vs, fs, "", "fragcolor" , ""); program = shader(vs, fs, "", "fragcolor" , NULL);
u_gamma = glGetUniformLocation(program, "u_gamma"); u_gamma = glGetUniformLocation(program, "u_gamma");
uy = glGetUniformLocation(program, "u_texture_y"); uy = glGetUniformLocation(program, "u_texture_y");
@ -11412,7 +11412,7 @@ void fullscreen_quad_ycbcr_flipped( texture_t textureYCbCr[3], float gamma ) {
const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B.glsl"); const char* vs = vfs_read("shaders/vs_0_2_fullscreen_quad_B.glsl");
const char* fs = vfs_read("shaders/fs_2_4_texel_ycbr_gamma_saturation.glsl"); const char* fs = vfs_read("shaders/fs_2_4_texel_ycbr_gamma_saturation.glsl");
program = shader(vs, fs, "", "fragcolor" , ""); program = shader(vs, fs, "", "fragcolor" , NULL);
u_gamma = glGetUniformLocation(program, "u_gamma"); u_gamma = glGetUniformLocation(program, "u_gamma");
uy = glGetUniformLocation(program, "u_texture_y"); uy = glGetUniformLocation(program, "u_texture_y");
@ -11703,7 +11703,7 @@ static void sprite_render_meshes() {
if( sprite_program < 0 ) { if( sprite_program < 0 ) {
sprite_program = shader( vfs_read("shaders/vs_324_24_sprite.glsl"), vfs_read("shaders/fs_24_4_sprite.glsl"), sprite_program = shader( vfs_read("shaders/vs_324_24_sprite.glsl"), vfs_read("shaders/fs_24_4_sprite.glsl"),
"att_Position,att_TexCoord,att_Color", "att_Position,att_TexCoord,att_Color",
"fragColor", "" "fragColor", NULL
); );
} }
@ -12720,7 +12720,7 @@ skybox_t skybox(const char *asset, int flags) {
sky.flags = flags ? flags : !!asset; // either cubemap or rayleigh sky.flags = flags ? flags : !!asset; // either cubemap or rayleigh
sky.program = shader(vfs_read("shaders/vs_3_3_skybox.glsl"), sky.program = shader(vfs_read("shaders/vs_3_3_skybox.glsl"),
sky.flags ? vfs_read("fs_3_4_skybox.glsl") : vfs_read("shaders/fs_3_4_skybox_rayleigh.glsl"), sky.flags ? vfs_read("fs_3_4_skybox.glsl") : vfs_read("shaders/fs_3_4_skybox_rayleigh.glsl"),
"att_position", "fragcolor", ""); "att_position", "fragcolor", NULL);
// sky cubemap & SH // sky cubemap & SH
if( asset ) { if( asset ) {
@ -13302,7 +13302,7 @@ int postfx_load_from_mem( postfx *fx, const char *name, const char *fs ) {
strcat(fs2, fs); strcat(fs2, fs);
p->program = shader(vs, fs2, "vtexcoord", "fragColor" , ""); p->program = shader(vs, fs2, "vtexcoord", "fragColor" , NULL);
FREE(fs2); FREE(fs2);
@ -13363,6 +13363,9 @@ void postfx_clear(postfx *fx) {
} }
bool postfx_begin(postfx *fx, int width, int height) { bool postfx_begin(postfx *fx, int width, int height) {
// reset clear color: needed in case transparent window is being used (alpha != 0)
glClearColor(0,0,0,0); // @transparent
width += !width; width += !width;
height += !height; height += !height;
@ -13669,7 +13672,7 @@ shadertoy_t shadertoy( const char *shaderfile, unsigned flags ) {
glGenVertexArrays(1, &s.vao); glGenVertexArrays(1, &s.vao);
char *fs = stringf("%s%s", vfs_read("header_shadertoy.glsl"), file); char *fs = stringf("%s%s", vfs_read("header_shadertoy.glsl"), file);
s.program = shader((flags&SHADERTOY_FLIP_Y) ? vfs_read("shaders/vs_shadertoy_flip.glsl") : vfs_read("shaders/vs_shadertoy.glsl"), fs, "", "fragColor", ""); s.program = shader((flags&SHADERTOY_FLIP_Y) ? vfs_read("shaders/vs_shadertoy_flip.glsl") : vfs_read("shaders/vs_shadertoy.glsl"), fs, "", "fragColor", NULL);
FREE(fs); FREE(fs);
if( strstr(file, "noise3.jpg")) if( strstr(file, "noise3.jpg"))
@ -15859,7 +15862,7 @@ scene_t* scene_get_active() {
scene_t* scene_push() { scene_t* scene_push() {
scene_t *s = REALLOC(0, sizeof(scene_t)), clear = {0}; *s = clear; scene_t *s = REALLOC(0, sizeof(scene_t)), clear = {0}; *s = clear;
const char *symbols[] = { "{{include-shadowmap}}", vfs_read("shaders/fs_0_0_shadowmap_lit.glsl") }; const char *symbols[] = { "{{include-shadowmap}}", vfs_read("shaders/fs_0_0_shadowmap_lit.glsl") };
s->program = shader(strlerp(1, symbols, vfs_read("shaders/vs_332_32.glsl")), strlerp(1, symbols, vfs_read("shaders/fs_32_4_model.glsl")), "att_position,att_normal,att_texcoord,att_color", "fragcolor", ""); s->program = shader(strlerp(1, symbols, vfs_read("shaders/vs_332_32.glsl")), strlerp(1, symbols, vfs_read("shaders/fs_32_4_model.glsl")), "att_position,att_normal,att_texcoord,att_color", "fragcolor", NULL);
s->skybox = skybox(NULL, 0); s->skybox = skybox(NULL, 0);
array_push(scenes, s); array_push(scenes, s);
last_scene = s; last_scene = s;
@ -17300,8 +17303,8 @@ void thread_destroy( void *thd ) {
#define UI_FONT_HEADING_SIZE UI_FONT_ENUM(14.5,15) #define UI_FONT_HEADING_SIZE UI_FONT_ENUM(14.5,15)
#define UI_FONT_TERMINAL_SIZE UI_FONT_ENUM(14,14) #define UI_FONT_TERMINAL_SIZE UI_FONT_ENUM(14,14)
#else #else
#define UI_FONT_REGULAR_SIZE UI_FONT_ENUM(14.5,15.5) #define UI_FONT_REGULAR_SIZE UI_FONT_ENUM(14.5,16)
#define UI_FONT_HEADING_SIZE UI_FONT_ENUM(16,17) #define UI_FONT_HEADING_SIZE UI_FONT_ENUM(16,17.5)
#define UI_FONT_TERMINAL_SIZE UI_FONT_ENUM(14,14) #define UI_FONT_TERMINAL_SIZE UI_FONT_ENUM(14,14)
#endif #endif
@ -17451,6 +17454,13 @@ table[NK_COLOR_CHART_COLOR_HIGHLIGHT] = hover_hue; // nk_rgba(255, 0, 0, 255);
// table[NK_COLOR_SELECT] = nk_rgba(57, 67, 61, 255); // table[NK_COLOR_SELECT] = nk_rgba(57, 67, 61, 255);
// table[NK_COLOR_SELECT_ACTIVE] = main; // table[NK_COLOR_SELECT_ACTIVE] = main;
// @transparent
#if !is(ems)
if( glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE )
for(int i = 0; i < countof(table); ++i) table[i].a = 255; // table[i].a ? 255 : 0;
#endif
// @transparent
nk_style_default(ui_ctx); nk_style_default(ui_ctx);
nk_style_from_table(ui_ctx, table); nk_style_from_table(ui_ctx, table);
@ -18025,6 +18035,71 @@ int ui_enable_(int enabled) {
off.window.header.normal.data.color.a *= alpha; off.window.header.normal.data.color.a *= alpha;
off.window.header.hover.data.color.a *= alpha; off.window.header.hover.data.color.a *= alpha;
off.window.header.active.data.color.a *= alpha; off.window.header.active.data.color.a *= alpha;
// @transparent {
// fixes for transparent windows
#if !is(ems)
float hsva[4];
if( glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE ) {
#define fix(col) off.col = nk_rgba_cf(nk_hsva_colorfv( (nk_colorf_hsva_fv(hsva, nk_color_cf(on.col)),hsva[1] *= alpha,hsva[2] *= alpha, hsva) ))
fix(contextual_button.normal.data.color);
fix(menu_button.normal.data.color);
fix(option.normal.data.color);
fix(option.cursor_normal.data.color);
fix(checkbox.normal.data.color);
fix(checkbox.cursor_normal.data.color);
fix(selectable.normal.data.color);
fix(selectable.normal_active.data.color);
fix(slider.normal.data.color);
fix(slider.bar_normal);
fix(slider.cursor_normal.data.color);
fix(slider.dec_button.normal.data.color);
fix(slider.inc_button.normal.data.color);
fix(progress.normal.data.color);
fix(progress.cursor_normal.data.color);
fix(property.normal.data.color);
fix(property.label_normal);
fix(property.edit.normal.data.color);
fix(property.edit.cursor_normal);
fix(property.edit.selected_normal);
fix(property.dec_button.normal.data.color);
fix(property.inc_button.normal.data.color);
fix(edit.normal.data.color);
fix(edit.cursor_normal);
fix(edit.selected_normal);
fix(scrollh.normal.data.color);
fix(scrollh.cursor_normal.data.color);
fix(scrollv.normal.data.color);
fix(scrollv.cursor_normal.data.color);
fix(combo.normal.data.color);
fix(combo.label_normal);
fix(combo.symbol_normal);
fix(combo.button.normal.data.color);
fix(window.header.normal.data.color);
fix(button.normal.data.color);
#undef fix
#define fix(field) on.field.a = off.field.a = 0
fix(button.border_color);
fix(button.border_color);
fix(button.border_color);
fix(contextual_button.border_color);
fix(menu_button.border_color);
fix(option.border_color);
fix(checkbox.border_color);
fix(slider.border_color);
fix(progress.border_color);
fix(property.border_color);
fix(edit.border_color);
fix(chart.border_color);
fix(scrollh.border_color);
fix(scrollv.border_color);
fix(tab.border_color);
fix(combo.border_color);
fix(window.border_color);
#undef fix
}
#endif
// } @transparent
} }
static struct nk_input input; static struct nk_input input;
if (!enabled) { if (!enabled) {
@ -18142,6 +18217,7 @@ void ui_render() {
#if is(ems) #if is(ems)
glFinish(); glFinish();
#endif #endif
ui_dirty = 1; ui_dirty = 1;
ui_hue = 0; ui_hue = 0;
@ -18579,11 +18655,25 @@ int ui_window_end() {
if(ui_window_has_menubar) nk_menubar_end(ui_ctx), ui_window_has_menubar = 0; if(ui_window_has_menubar) nk_menubar_end(ui_ctx), ui_window_has_menubar = 0;
nk_end(ui_ctx), ui_has_window = 0; nk_end(ui_ctx), ui_has_window = 0;
int closed = 0;
if( nk_window_is_hidden(ui_ctx, ui_last_title) ) { if( nk_window_is_hidden(ui_ctx, ui_last_title) ) {
nk_window_close(ui_ctx, ui_last_title); nk_window_close(ui_ctx, ui_last_title);
ui_show(ui_last_title, false); ui_show(ui_last_title, false);
if( ui_last_enabled ) *ui_last_enabled = 0; // clear developers' flag if( ui_last_enabled ) *ui_last_enabled = 0; // clear developers' flag
closed = 1;
} }
// @transparent
#if !is(ems)
static bool has_transparent_attrib = 0; do_once has_transparent_attrib = glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE;
if( closed && has_transparent_attrib && !ui_has_menubar() ) {
bool any_open = 0;
for each_map_ptr(ui_windows, char*, k, unsigned, v) any_open |= *v & 1;
if( !any_open ) glfwSetWindowShouldClose(window_handle(), GLFW_TRUE);
}
#endif
// @transparent
return 0; return 0;
} }
@ -18832,7 +18922,12 @@ int ui_button_transparent(const char *text) {
static static
int ui_button_(const char *text) { int ui_button_(const char *text) {
int ret = 0; // @transparent
static bool transparency_fix_needed = 0; ifndef(ems, do_once transparency_fix_needed = glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE);
const float dim = transparency_fix_needed && ui_alpha < 1 ? 0.5 : 1;
const float dim_alpha = transparency_fix_needed ? 1.0 : 0.90*ui_alpha;
const float text_alpha = transparency_fix_needed ? 1.0 : ui_alpha;
// @transparent
if( 1 ) { if( 1 ) {
#if UI_BUTTON_MONOCHROME #if UI_BUTTON_MONOCHROME
@ -18852,20 +18947,20 @@ int ui_button_(const char *text) {
nk_style_push_color(ui_ctx, &ui_ctx->style.button.hover.data.color, nk_hsva_f(ui_hue,1.00,1.0*ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.hover.data.color, nk_hsva_f(ui_hue,1.00,1.0*ui_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.active.data.color, nk_hsva_f(ui_hue,0.60,0.4*ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.active.data.color, nk_hsva_f(ui_hue,0.60,0.4*ui_alpha));
#else // new #else // new
nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_normal, nk_rgba_f(0.00,0.00,0.00,ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_normal, nk_rgba_f(0.00,0.00,0.00,text_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_hover, nk_rgba_f(0.11,0.11,0.11,ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_hover, nk_rgba_f(0.11,0.11,0.11,text_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_active, nk_rgba_f(0.00,0.00,0.00,ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.text_active, nk_rgba_f(0.00,0.00,0.00,text_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.normal.data.color, nk_hsva_f(ui_hue,0.80,0.6,0.90*ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.normal.data.color, nk_hsva_f(ui_hue,0.80*dim,0.6*dim,dim_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.hover.data.color, nk_hsva_f(ui_hue,0.85,0.9,0.90*ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.hover.data.color, nk_hsva_f(ui_hue,0.85*dim,0.9*dim,dim_alpha));
nk_style_push_color(ui_ctx, &ui_ctx->style.button.active.data.color, nk_hsva_f(ui_hue,0.80,0.6,0.90*ui_alpha)); nk_style_push_color(ui_ctx, &ui_ctx->style.button.active.data.color, nk_hsva_f(ui_hue,0.80*dim,0.6*dim,dim_alpha));
#endif #endif
} }
struct nk_rect bounds = nk_widget_bounds(ui_ctx); struct nk_rect bounds = nk_widget_bounds(ui_ctx);
const char *split = strchr(text, '@'), *tooltip = split + 1; const char *split = strchr(text, '@'), *tooltip = split + 1;
ret = nk_button_text(ui_ctx, text, split ? (int)(split - text) : strlen(text) ); int ret = nk_button_text(ui_ctx, text, split ? (int)(split - text) : strlen(text) );
const struct nk_input *in = &ui_ctx->input; const struct nk_input *in = &ui_ctx->input;
if (split && nk_input_is_mouse_hovering_rect(in, bounds) && !ui_has_active_popups && nk_window_has_focus(ui_ctx)) { if (split && nk_input_is_mouse_hovering_rect(in, bounds) && !ui_has_active_popups && nk_window_has_focus(ui_ctx)) {
@ -19658,7 +19753,7 @@ int ui_demo(int do_windows) {
#line 1 "v4k_profile.c" #line 1 "v4k_profile.c"
#if ENABLE_PROFILER #if ENABLE_PROFILER
profiler_t profiler; profiler_t profiler;
int profiler_enabled = 1; int profiler_enabled = 0;
void (profile_init)() { map_init(profiler, less_str, hash_str); profiler_enabled &= !!profiler; } void (profile_init)() { map_init(profiler, less_str, hash_str); profiler_enabled &= !!profiler; }
int (profile_enable)(bool on) { return profiler_enabled = on; } int (profile_enable)(bool on) { return profiler_enabled = on; }
@ -20070,6 +20165,7 @@ static double t, dt, fps, hz = 0.00;
static char title[128] = {0}; 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 wincolor = {0,0,0,1};
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// glfw // glfw
@ -20183,6 +20279,10 @@ struct nk_glfw *window_handle_nkglfw() {
} }
void glNewFrame() { void glNewFrame() {
// @transparent
// if( input_down(KEY_F1) ) window_transparent(window_has_transparent()^1); // debug
// if( input_down(KEY_F2) ) window_maximize(window_has_maximize()^1); // debug
// @transparent
#if 0 // is(ems) #if 0 // is(ems)
int canvasWidth, canvasHeight; int canvasWidth, canvasHeight;
@ -20219,6 +20319,8 @@ void glNewFrame() {
glViewport(0, 0, window_width(), window_height()); glViewport(0, 0, window_width(), window_height());
// GLfloat bgColor[4]; glGetFloatv(GL_COLOR_CLEAR_VALUE, bgColor);
glClearColor(wincolor.r, wincolor.g, wincolor.b, window_has_transparent() ? 0 : wincolor.a); // @transparent
//glClearColor(0.15,0.15,0.15,1); //glClearColor(0.15,0.15,0.15,1);
//glClearColor( clearColor.r, clearColor.g, clearColor.b, clearColor.a ); //glClearColor( clearColor.r, clearColor.g, clearColor.b, clearColor.a );
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT ); glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT );
@ -20233,10 +20335,14 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
scale = 100.f; scale = 100.f;
#endif #endif
if( flag("--fullscreen") ) scale = 100;
scale = (scale < 1 ? scale * 100 : scale); scale = (scale < 1 ? scale * 100 : scale);
bool FLAGS_FULLSCREEN = scale > 100; bool FLAGS_FULLSCREEN = scale > 100;
bool FLAGS_FULLSCREEN_DESKTOP = scale == 100; bool FLAGS_FULLSCREEN_DESKTOP = scale == 100;
bool FLAGS_WINDOWED = scale < 100; bool FLAGS_WINDOWED = scale < 100;
bool FLAGS_TRANSPARENT = flag("--transparent") || (flags & WINDOW_TRANSPARENT);
if( FLAGS_TRANSPARENT ) FLAGS_FULLSCREEN = 0, FLAGS_FULLSCREEN_DESKTOP = 0, FLAGS_WINDOWED = 1;
scale = (scale > 100 ? 100 : scale) / 100.f; scale = (scale > 100 ? 100 : scale) / 100.f;
int winWidth = window_canvas().w * scale; int winWidth = window_canvas().w * scale;
int winHeight = window_canvas().h * scale; int winHeight = window_canvas().h * scale;
@ -20258,6 +20364,7 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
winHeight = mode->height; winHeight = mode->height;
} }
if( FLAGS_WINDOWED ) { if( FLAGS_WINDOWED ) {
ifndef(ems, glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, FLAGS_TRANSPARENT ? GLFW_TRUE : GLFW_FALSE)); // @transparent
// windowed // windowed
float ratio = (float)winWidth / (winHeight + !winHeight); float ratio = (float)winWidth / (winHeight + !winHeight);
if( flags & WINDOW_SQUARE ) winWidth = winHeight = winWidth > winHeight ? winHeight : winWidth; if( flags & WINDOW_SQUARE ) winWidth = winHeight = winWidth > winHeight ? winHeight : winWidth;
@ -20322,6 +20429,13 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
PRINTF("GPU device: %s\n", glGetString(GL_RENDERER)); PRINTF("GPU device: %s\n", glGetString(GL_RENDERER));
PRINTF("GPU driver: %s\n", glGetString(GL_VERSION)); PRINTF("GPU driver: %s\n", glGetString(GL_VERSION));
#if !is(ems)
if( FLAGS_TRANSPARENT ) { // @transparent
glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_FALSE);
if( scale >= 1 ) glfwMaximizeWindow(window);
}
#endif
g->ctx = ui_ctx; g->ctx = ui_ctx;
g->nk_glfw = &nk_glfw; g->nk_glfw = &nk_glfw;
g->window = window; g->window = window;
@ -20362,6 +20476,7 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
if(JOB_ID==JOB_MAX-1)ddraw_line(vec3(-1,y+pixel*2,0), vec3(1, y+pixel*2,0)); /* full line */ \ if(JOB_ID==JOB_MAX-1)ddraw_line(vec3(-1,y+pixel*2,0), vec3(1, y+pixel*2,0)); /* full line */ \
} while(0) } while(0)
if( FLAGS_TRANSPARENT ) {} else // @transparent
for(int i = 0; i < cook_jobs(); ++i) ddraw_progress_bar(i, cook_jobs(), jobs[i].progress); for(int i = 0; i < cook_jobs(); ++i) ddraw_progress_bar(i, cook_jobs(), jobs[i].progress);
// ddraw_progress_bar(0, 1, cook_progress()); // ddraw_progress_bar(0, 1, cook_progress());
@ -20660,7 +20775,8 @@ void window_color(unsigned color) {
unsigned g = (color >> 8) & 255; unsigned g = (color >> 8) & 255;
unsigned r = (color >> 16) & 255; unsigned r = (color >> 16) & 255;
unsigned a = (color >> 24) & 255; unsigned a = (color >> 24) & 255;
glClearColor(r / 255.0, g / 255.0, b / 255.0, 1.0); wincolor = vec4(r / 255.0, g / 255.0, b / 255.0, a / 255.0);
// glClearColor(wincolor.r, wincolor.g, wincolor.b, 1.0);
} }
void window_icon(const char *file_icon) { void window_icon(const char *file_icon) {
unsigned len = file_size(file_icon); // len = len ? len : vfs_size(file_icon); // @fixme: reenable this to allow icons to be put in cooked .zipfiles unsigned len = file_size(file_icon); // len = len ? len : vfs_size(file_icon); // @fixme: reenable this to allow icons to be put in cooked .zipfiles
@ -20907,6 +21023,39 @@ void window_aspect_unlock() {
if(!window) return; if(!window) return;
window_aspect_lock(0, 0); window_aspect_lock(0, 0);
} }
void window_transparent(int enabled) {
#if !is(ems)
if( !window_has_fullscreen() ) {
if( enabled ) {
glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_FALSE);
//glfwMaximizeWindow(window);
} else {
//glfwRestoreWindow(window);
glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_TRUE);
}
}
#endif
}
int window_has_transparent() {
return ifdef(ems, 0, glfwGetWindowAttrib(window, GLFW_DECORATED) != GLFW_TRUE);
}
void window_maximize(int enabled) {
ifdef(ems, return);
if( !window_has_fullscreen() ) {
if( enabled ) {
glfwMaximizeWindow(window);
} else {
glfwRestoreWindow(window);
}
}
}
int window_has_maximize() {
return ifdef(ems, 0, glfwGetWindowAttrib(window, GLFW_MAXIMIZED) == GLFW_TRUE);
}
#line 0 #line 0
#line 1 "v4k_obj.c" #line 1 "v4k_obj.c"

10
engine/v4k.h
View File

@ -380,6 +380,7 @@ typedef char bool;
#pragma comment(lib, "shell32") #pragma comment(lib, "shell32")
#pragma comment(lib, "user32") #pragma comment(lib, "user32")
#pragma comment(lib, "winmm") #pragma comment(lib, "winmm")
#pragma comment(lib, "wininet")
#pragma comment(lib, "ws2_32") #pragma comment(lib, "ws2_32")
#endif #endif
@ -2450,7 +2451,7 @@ API unsigned bgraf( float b, float g, float r, float a );
API float alpha( unsigned rgba ); API float alpha( unsigned rgba );
#define RGBX(rgb,x) ( ((rgb)&0xFFFFFF) | (((unsigned)(x))<<24) ) #define RGBX(rgb,x) ( ((rgb)&0xFFFFFF) | (((unsigned)(x))<<24) )
#define RGB3(r,g,b) ( ((r)<<16) | ((g)<<8) | (b) ) #define RGB3(r,g,b) ( (255<<24) | ((r)<<16) | ((g)<<8) | (b) )
#define RGB4(r,g,b,a) RGBX(RGB3(r,g,b),a) #define RGB4(r,g,b,a) RGBX(RGB3(r,g,b),a)
#define BLACK RGBX(0x000000,255) #define BLACK RGBX(0x000000,255)
@ -2472,7 +2473,7 @@ API float alpha( unsigned rgba );
#define ORANGE RGB3( 255,144,48 ) #define ORANGE RGB3( 255,144,48 )
#define PURPLE RGB3( 102,77,102 ) // 178,128,255 ) #define PURPLE RGB3( 102,77,102 ) // 178,128,255 )
#define YELLOW RGB3( 255,224,0 ) #define YELLOW RGB3( 255,224,0 )
#define GRAY RGB3( 149,149,149 ) #define GRAY RGB3( 32, 32, 32 ) // 149,149,149 )
#define PINK RGB3( 255,48,144 ) #define PINK RGB3( 255,48,144 )
#define AQUA RGB3( 48,255,144 ) #define AQUA RGB3( 48,255,144 )
@ -3603,6 +3604,7 @@ enum WINDOW_FLAGS {
WINDOW_LANDSCAPE = 0x80, WINDOW_LANDSCAPE = 0x80,
WINDOW_ASPECT = 0x100, // keep aspect WINDOW_ASPECT = 0x100, // keep aspect
WINDOW_FIXED = 0x200, // disable resizing WINDOW_FIXED = 0x200, // disable resizing
WINDOW_TRANSPARENT = 0x400,
WINDOW_VSYNC = 0, WINDOW_VSYNC = 0,
WINDOW_VSYNC_ADAPTIVE = 0x1000, WINDOW_VSYNC_ADAPTIVE = 0x1000,
@ -3647,6 +3649,10 @@ API void window_pause(int paused);
API int window_has_pause(); API int window_has_pause();
API void window_visible(int visible); API void window_visible(int visible);
API int window_has_visible(); API int window_has_visible();
API void window_maximize(int enabled);
API int window_has_maximize();
API void window_transparent(int enabled);
API int window_has_transparent();
API double window_aspect(); API double window_aspect();
API void window_aspect_lock(unsigned numer, unsigned denom); API void window_aspect_lock(unsigned numer, unsigned denom);

6
workbench/workbench.c
View File

@ -115,6 +115,12 @@ int main() {
ui_panel_end(); ui_panel_end();
} }
static bool show_main_window = 1;
if ( ui_window("Workbench", &show_main_window) ) {
ui_label("v4.games");
ui_window_end();
}
for (int i=0; i<array_count(assets); i++) { for (int i=0; i<array_count(assets); i++) {
asset_t *f = (assets+i); asset_t *f = (assets+i);
if (ui_window(f->name, &f->opened)) { if (ui_window(f->name, &f->opened)) {