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

window: improve transparency pass (r-lyeh)

main
Dominik Madarász 2023-09-25 12:24:49 +02:00
parent a8c4b1816f
commit a4869085a4
11 changed files with 252 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engine/bind/v4k.lua
View File

@ -34,6 +34,12 @@ ffi.cdef([[
//lcpp INF [0000] set: macro name but used as C declaration in:STATIC void* (set_find)(const set *m, void *key, uint64_t keyhash);
//lcpp INF [0000] set_find: macro name but used as C declaration in: void* (set_find)(const set *m, void *key, uint64_t keyhash);
//lcpp INF [0000] set: macro name but used as C declaration in: void* (set_find)(const set *m, void *key, uint64_t keyhash);
//lcpp INF [0000] set_isempty: macro name but used as C declaration in:API int (set_isempty)(const set *m);
//lcpp INF [0000] set: macro name but used as C declaration in:API int (set_isempty)(const set *m);
//lcpp INF [0000] set_isempty: macro name but used as C declaration in:STATIC int (set_isempty)(const set *m);
//lcpp INF [0000] set: macro name but used as C declaration in:STATIC int (set_isempty)(const set *m);
//lcpp INF [0000] set_isempty: macro name but used as C declaration in: int (set_isempty)(const set *m);
//lcpp INF [0000] set: macro name but used as C declaration in: int (set_isempty)(const set *m);
//lcpp INF [0000] set_count: macro name but used as C declaration in:API int (set_count)(const set *m);
//lcpp INF [0000] set: macro name but used as C declaration in:API int (set_count)(const set *m);
//lcpp INF [0000] set_count: macro name but used as C declaration in:STATIC int (set_count)(const set *m);
@ -85,6 +91,12 @@ ffi.cdef([[
//lcpp INF [0000] map: macro name but used as C declaration in:STATIC void* (map_find)(map *m, void *key, uint64_t keyhash);
//lcpp INF [0000] map_find: macro name but used as C declaration in: void* (map_find)(map *m, void *key, uint64_t keyhash);
//lcpp INF [0000] map: macro name but used as C declaration in: void* (map_find)(map *m, void *key, uint64_t keyhash);
//lcpp INF [0000] map_isempty: macro name but used as C declaration in:API int (map_isempty)(map *m);
//lcpp INF [0000] map: macro name but used as C declaration in:API int (map_isempty)(map *m);
//lcpp INF [0000] map_isempty: macro name but used as C declaration in:STATIC int (map_isempty)(map *m);
//lcpp INF [0000] map: macro name but used as C declaration in:STATIC int (map_isempty)(map *m);
//lcpp INF [0000] map_isempty: macro name but used as C declaration in: int (map_isempty)(map *m);
//lcpp INF [0000] map: macro name but used as C declaration in: int (map_isempty)(map *m);
//lcpp INF [0000] map_count: macro name but used as C declaration in:API int (map_count)(map *m);
//lcpp INF [0000] map: macro name but used as C declaration in:API int (map_count)(map *m);
//lcpp INF [0000] map_count: macro name but used as C declaration in:STATIC int (map_count)(map *m);
@ -1521,6 +1533,7 @@ int count;
void (set_insert)(set *m, set_item *p, void *key, uint64_t keyhash, void *super);
void (set_erase)(set *m, void *key, uint64_t keyhash);
void* (set_find)(const set *m, void *key, uint64_t keyhash);
int (set_isempty)(const set *m);
int (set_count)(const set *m);
void (set_gc)(set *m);
void (set_clear)(set* m);
@ -1544,6 +1557,7 @@ pair** sorted;
void (map_insert)(map *m, pair *p, void *key, void *value, uint64_t keyhash, void *super);
void (map_erase)(map *m, void *key, uint64_t keyhash);
void* (map_find)(map *m, void *key, uint64_t keyhash);
int (map_isempty)(map *m);
int (map_count)(map *m);
void (map_gc)(map *m);
bool (map_sort)(map* m);
@ -2689,6 +2703,7 @@ float *pixels;
char * fx_name(int pass);
int fx_find(const char *name);
int ui_fx(int pass);
int ui_fxs();
void* screenshot(int components);
void* screenshot_async(int components);
void ddraw_color(unsigned rgb);

94
engine/joint/v4k.h
View File

@ -14553,6 +14553,7 @@ static __thread unsigned array_n_;
set_clear(&(m)->base) \
)
#define set_isempty(m) set_isempty(&(m)->base)
#define set_count(m) set_count(&(m)->base)
#define set_gc(m) set_gc(&(m)->base)
@ -14591,6 +14592,7 @@ API void (set_free)(set *m);
API void (set_insert)(set *m, set_item *p, void *key, uint64_t keyhash, void *super);
API void (set_erase)(set *m, void *key, uint64_t keyhash);
API void* (set_find)(const set *m, void *key, uint64_t keyhash);
API int (set_isempty)(const set *m);
API int (set_count)(const set *m);
API void (set_gc)(set *m); // only if using SET_DONT_ERASE
API void (set_clear)(set* m);
@ -14684,6 +14686,7 @@ API void (set_clear)(set* m);
map_clear(&(m)->base) \
)
#define map_isempty(m) map_isempty(&(m)->base)
#define map_count(m) map_count(&(m)->base)
#define map_gc(m) map_gc(&(m)->base)
@ -14728,6 +14731,7 @@ API void (map_free)(map *m);
API void (map_insert)(map *m, pair *p, void *key, void *value, uint64_t keyhash, void *super);
API void (map_erase)(map *m, void *key, uint64_t keyhash);
API void* (map_find)(map *m, void *key, uint64_t keyhash);
API int (map_isempty)(map *m);
API int (map_count)(map *m);
API void (map_gc)(map *m); // only if using MAP_DONT_ERASE
API bool (map_sort)(map* m);
@ -17055,6 +17059,7 @@ API char * fx_name(int pass);
API int fx_find(const char *name);
API int ui_fx(int pass);
API int ui_fxs();
// -----------------------------------------------------------------------------
// utils
@ -329675,8 +329680,9 @@ void (map_erase)(map* m, void *key, uint64_t keyhash) {
}
}
int (map_count)(map* m) {
int (map_count)(map* m) { // clean deferred GC_SLOT only
return m->count;
int counter = 0;
for( int i = 0; i < MAP_HASHSIZE; ++i) {
for( pair *cur = m->array[i]; cur; cur = cur->next ) {
@ -329686,7 +329692,11 @@ int (map_count)(map* m) {
return counter;
}
void (map_gc)(map* m) {
int (map_isempty)(map* m) { // clean deferred GC_SLOT only
return !m->count;
}
void (map_gc)(map* m) { // clean deferred GC_SLOT only
#if MAP_DONT_ERASE
for( pair *next, *cur = m->array[MAP_GC_SLOT]; cur; cur = next ) {
next = cur->next;
@ -329819,6 +329829,7 @@ void (set_erase)(set* m, void *key, uint64_t keyhash) {
int (set_count)(const set* m) { // does not include GC_SLOT
return m->count;
int counter = 0;
for( int i = 0; i < SET_HASHSIZE; ++i) {
for( const set_item *cur = m->array[i]; cur; cur = cur->next ) {
@ -329828,6 +329839,10 @@ int (set_count)(const set* m) { // does not include GC_SLOT
return counter;
}
int (set_isempty)(const set *m) { // clean deferred GC_SLOT only
return !m->count;
}
void (set_gc)(set* m) { // clean deferred GC_SLOT only
#if SET_DONT_ERASE
for( set_item *next, *cur = m->array[set_GC_SLOT]; cur; cur = next ) {
@ -340012,6 +340027,8 @@ int ui_shader(unsigned shader) {
}
int ui_shaders() {
if( !map_count(shader_reflect) ) return 0;
int changed = 0;
int has_menu = ui_has_menubar();
if( (has_menu ? ui_window("Shaders", 0) : ui_panel("Shaders", 0) ) ) {
@ -342436,6 +342453,7 @@ void skybox_sh_add_light(skybox_t *sky, vec3 light, vec3 dir, float strength) {
sky->cubemap.sh[3] = add3(sky->cubemap.sh[3], scale3(scaled_light, -0.488603f * norm_dir.x));
}
API vec4 window_getcolor_(); // internal use, not public
int skybox_push_state(skybox_t *sky, mat44 proj, mat44 view) {
last_cubemap = &sky->cubemap;
@ -342446,6 +342464,9 @@ int skybox_push_state(skybox_t *sky, mat44 proj, mat44 view) {
//glDisable(GL_CULL_FACE);
glDisable(GL_DEPTH_TEST);
// we have to reset clear color here, because of wrong alpha compositing issues on native transparent windows otherwise
vec4 bgcolor = window_getcolor_(); glClearColor(bgcolor.r, bgcolor.g, bgcolor.b, 1); // @transparent
mat44 mvp; multiply44x2(mvp, proj, view);
//glDepthMask(GL_FALSE);
@ -342457,6 +342478,7 @@ int skybox_push_state(skybox_t *sky, mat44 proj, mat44 view) {
return 0; // @fixme: return sortable hash here?
}
int skybox_pop_state() {
//vec4 bgcolor = window_getcolor_(); glClearColor(bgcolor.r, bgcolor.g, bgcolor.b, window_has_transparent() ? 0 : bgcolor.a); // @transparent
//glDepthMask(GL_TRUE);
//glClear(GL_DEPTH_BUFFER_BIT);
return 0;
@ -343106,6 +343128,22 @@ int fx_find(const char *name) {
int ui_fx(int pass) {
return ui_postfx(&fx, pass);
}
int ui_fxs() {
if(!fx.num_loaded) return 0;
int changed = 0;
int has_menu = ui_has_menubar();
if( (has_menu ? ui_window("FX", 0) : ui_panel("FX", 0) ) ) {
for( int i = 0; i < 64; ++i ) {
char *name = fx_name(i); if( !name ) break;
bool b = fx_enabled(i);
if( ui_bool(name, &b) ) fx_enable(i, fx_enabled(i) ^ 1);
ui_fx(i);
}
(has_menu ? ui_window_end : ui_panel_end)();
}
return changed;
}
// -----------------------------------------------------------------------------
// brdf
@ -344364,7 +344402,8 @@ void model_destroy(model_t m) {
anims_t animations(const char *pathfile, int flags) {
anims_t a = {0};
char *anim_file = vfs_read(va("%s@animlist.txt", pathfile));
if (!anim_file) return a;
if( !anim_file ) anim_file = vfs_read(pathfile);
if( anim_file ) {
for each_substring(anim_file, "\r\n", anim) {
int from, to;
char anim_name[128] = {0};
@ -344373,6 +344412,7 @@ anims_t animations(const char *pathfile, int flags) {
array_back(a.anims)->name = strswap(strswap(strswap(STRDUP(anim_name), "Loop", ""), "loop", ""), "()", ""); // @leak
}
a.speed = 1.0;
}
return a;
}
#line 0
@ -347170,6 +347210,15 @@ 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_ACTIVE] = main;
// @transparent
#if !is(ems)
if( glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE ) {
table[NK_COLOR_WINDOW].a =
table[NK_COLOR_HEADER].a = 255;
}
#endif
// @transparent
nk_style_default(ui_ctx);
nk_style_from_table(ui_ctx, table);
@ -347858,7 +347907,9 @@ void ui_render() {
* rendering the UI. */
//nk_sdl_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_MEMORY, MAX_ELEMENT_MEMORY);
glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,GL_FALSE); // @transparent
GLfloat bkColor[4]; glGetFloatv(GL_COLOR_CLEAR_VALUE, bkColor); // @transparent
glClearColor(0,0,0,1); // @transparent
glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,!bkColor[3] ? GL_TRUE : GL_FALSE); // @transparent
nk_glfw3_render(&nk_glfw, NK_ANTI_ALIASING_ON, MAX_VERTEX_MEMORY, MAX_ELEMENT_MEMORY);
glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,GL_TRUE); // @transparent
@ -349394,12 +349445,15 @@ int ui_demo(int do_windows) {
#line 1 "v4k_profile.c"
#if ENABLE_PROFILER
profiler_t profiler;
int profiler_enabled = 0;
int profiler_enabled = 1;
void (profile_init)() { map_init(profiler, less_str, hash_str); profiler_enabled &= !!profiler; }
int (profile_enable)(bool on) { return profiler_enabled = on; }
void (profile_render)() {
if(!profiler_enabled) return;
// @transparent
static bool has_transparent_attrib = 0; do_once has_transparent_attrib = glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE;
if( has_transparent_attrib ) return;
// @transparent
int has_menu = ui_has_menubar();
if( !has_menu ) {
@ -349806,7 +349860,9 @@ static double t, dt, fps, hz = 0.00;
static char title[128] = {0};
static char screenshot_file[DIR_MAX];
static int locked_aspect_ratio = 0;
static vec4 wincolor = {0,0,0,1};
static vec4 winbgcolor = {0,0,0,1};
vec4 window_getcolor_() { return winbgcolor; } // internal
// -----------------------------------------------------------------------------
// glfw
@ -349920,10 +349976,10 @@ struct nk_glfw *window_handle_nkglfw() {
}
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
// @transparent debug
// if( input_down(KEY_F1) ) window_transparent(window_has_transparent()^1);
// if( input_down(KEY_F2) ) window_maximize(window_has_maximize()^1);
// @transparent debug
#if 0 // is(ems)
int canvasWidth, canvasHeight;
@ -349961,7 +350017,7 @@ void glNewFrame() {
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(winbgcolor.r, winbgcolor.g, winbgcolor.b, window_has_transparent() ? 0 : winbgcolor.a); // @transparent
//glClearColor(0.15,0.15,0.15,1);
//glClearColor( clearColor.r, clearColor.g, clearColor.b, clearColor.a );
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT );
@ -350005,7 +350061,13 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
winHeight = mode->height;
}
if( FLAGS_WINDOWED ) {
ifndef(ems, glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, FLAGS_TRANSPARENT ? GLFW_TRUE : GLFW_FALSE)); // @transparent
#if !is(ems)
if( FLAGS_TRANSPARENT ) { // @transparent
//glfwWindowHint(GLFW_MOUSE_PASSTHROUGH, GLFW_TRUE); // see through. requires undecorated
//glfwWindowHint(GLFW_FLOATING, GLFW_TRUE); // always on top
glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_TRUE);
}
#endif
// windowed
float ratio = (float)winWidth / (winHeight + !winHeight);
if( flags & WINDOW_SQUARE ) winWidth = winHeight = winWidth > winHeight ? winHeight : winWidth;
@ -350202,6 +350264,7 @@ int window_frame_begin() {
profile_render();
ui_shaders();
ui_fxs();
#if 0 // deprecated
// run user-defined hooks
@ -350418,8 +350481,7 @@ void window_color(unsigned color) {
unsigned g = (color >> 8) & 255;
unsigned r = (color >> 16) & 255;
unsigned a = (color >> 24) & 255;
wincolor = vec4(r / 255.0, g / 255.0, b / 255.0, a / 255.0);
// glClearColor(wincolor.r, wincolor.g, wincolor.b, 1.0);
winbgcolor = vec4(r / 255.0, g / 255.0, b / 255.0, a / 255.0);
}
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
@ -350672,9 +350734,11 @@ void window_transparent(int enabled) {
if( !window_has_fullscreen() ) {
if( enabled ) {
glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_FALSE);
//glfwSetWindowAttrib(window, GLFW_MOUSE_PASSTHROUGH , GLFW_TRUE);
//glfwMaximizeWindow(window);
} else {
//glfwRestoreWindow(window);
//glfwSetWindowAttrib(window, GLFW_MOUSE_PASSTHROUGH , GLFW_FALSE);
glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_TRUE);
}
}

14
engine/split/v4k_ds.c
View File

@ -183,8 +183,9 @@ void (map_erase)(map* m, void *key, uint64_t keyhash) {
}
}
int (map_count)(map* m) {
int (map_count)(map* m) { // clean deferred GC_SLOT only
return m->count;
int counter = 0;
for( int i = 0; i < MAP_HASHSIZE; ++i) {
for( pair *cur = m->array[i]; cur; cur = cur->next ) {
@ -194,7 +195,11 @@ int (map_count)(map* m) {
return counter;
}
void (map_gc)(map* m) {
int (map_isempty)(map* m) { // clean deferred GC_SLOT only
return !m->count;
}
void (map_gc)(map* m) { // clean deferred GC_SLOT only
#if MAP_DONT_ERASE
for( pair *next, *cur = m->array[MAP_GC_SLOT]; cur; cur = next ) {
next = cur->next;
@ -327,6 +332,7 @@ void (set_erase)(set* m, void *key, uint64_t keyhash) {
int (set_count)(const set* m) { // does not include GC_SLOT
return m->count;
int counter = 0;
for( int i = 0; i < SET_HASHSIZE; ++i) {
for( const set_item *cur = m->array[i]; cur; cur = cur->next ) {
@ -336,6 +342,10 @@ int (set_count)(const set* m) { // does not include GC_SLOT
return counter;
}
int (set_isempty)(const set *m) { // clean deferred GC_SLOT only
return !m->count;
}
void (set_gc)(set* m) { // clean deferred GC_SLOT only
#if SET_DONT_ERASE
for( set_item *next, *cur = m->array[set_GC_SLOT]; cur; cur = next ) {

4
engine/split/v4k_ds.h
View File

@ -242,6 +242,7 @@ static __thread unsigned array_n_;
set_clear(&(m)->base) \
)
#define set_isempty(m) set_isempty(&(m)->base)
#define set_count(m) set_count(&(m)->base)
#define set_gc(m) set_gc(&(m)->base)
@ -280,6 +281,7 @@ API void (set_free)(set *m);
API void (set_insert)(set *m, set_item *p, void *key, uint64_t keyhash, void *super);
API void (set_erase)(set *m, void *key, uint64_t keyhash);
API void* (set_find)(const set *m, void *key, uint64_t keyhash);
API int (set_isempty)(const set *m);
API int (set_count)(const set *m);
API void (set_gc)(set *m); // only if using SET_DONT_ERASE
API void (set_clear)(set* m);
@ -373,6 +375,7 @@ API void (set_clear)(set* m);
map_clear(&(m)->base) \
)
#define map_isempty(m) map_isempty(&(m)->base)
#define map_count(m) map_count(&(m)->base)
#define map_gc(m) map_gc(&(m)->base)
@ -417,6 +420,7 @@ API void (map_free)(map *m);
API void (map_insert)(map *m, pair *p, void *key, void *value, uint64_t keyhash, void *super);
API void (map_erase)(map *m, void *key, uint64_t keyhash);
API void* (map_find)(map *m, void *key, uint64_t keyhash);
API int (map_isempty)(map *m);
API int (map_count)(map *m);
API void (map_gc)(map *m); // only if using MAP_DONT_ERASE
API bool (map_sort)(map* m);

7
engine/split/v4k_profile.c
View File

@ -1,11 +1,14 @@
#if ENABLE_PROFILER
profiler_t profiler;
int profiler_enabled = 0;
int profiler_enabled = 1;
void (profile_init)() { map_init(profiler, less_str, hash_str); profiler_enabled &= !!profiler; }
int (profile_enable)(bool on) { return profiler_enabled = on; }
void (profile_render)() {
if(!profiler_enabled) return;
// @transparent
static bool has_transparent_attrib = 0; do_once has_transparent_attrib = glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE;
if( has_transparent_attrib ) return;
// @transparent
int has_menu = ui_has_menubar();
if( !has_menu ) {

27
engine/split/v4k_render.c
View File

@ -312,6 +312,8 @@ int ui_shader(unsigned shader) {
}
int ui_shaders() {
if( !map_count(shader_reflect) ) return 0;
int changed = 0;
int has_menu = ui_has_menubar();
if( (has_menu ? ui_window("Shaders", 0) : ui_panel("Shaders", 0) ) ) {
@ -2736,6 +2738,7 @@ void skybox_sh_add_light(skybox_t *sky, vec3 light, vec3 dir, float strength) {
sky->cubemap.sh[3] = add3(sky->cubemap.sh[3], scale3(scaled_light, -0.488603f * norm_dir.x));
}
API vec4 window_getcolor_(); // internal use, not public
int skybox_push_state(skybox_t *sky, mat44 proj, mat44 view) {
last_cubemap = &sky->cubemap;
@ -2746,6 +2749,9 @@ int skybox_push_state(skybox_t *sky, mat44 proj, mat44 view) {
//glDisable(GL_CULL_FACE);
glDisable(GL_DEPTH_TEST);
// we have to reset clear color here, because of wrong alpha compositing issues on native transparent windows otherwise
vec4 bgcolor = window_getcolor_(); glClearColor(bgcolor.r, bgcolor.g, bgcolor.b, 1); // @transparent
mat44 mvp; multiply44x2(mvp, proj, view);
//glDepthMask(GL_FALSE);
@ -2757,6 +2763,7 @@ int skybox_push_state(skybox_t *sky, mat44 proj, mat44 view) {
return 0; // @fixme: return sortable hash here?
}
int skybox_pop_state() {
//vec4 bgcolor = window_getcolor_(); glClearColor(bgcolor.r, bgcolor.g, bgcolor.b, window_has_transparent() ? 0 : bgcolor.a); // @transparent
//glDepthMask(GL_TRUE);
//glClear(GL_DEPTH_BUFFER_BIT);
return 0;
@ -3406,6 +3413,22 @@ int fx_find(const char *name) {
int ui_fx(int pass) {
return ui_postfx(&fx, pass);
}
int ui_fxs() {
if(!fx.num_loaded) return 0;
int changed = 0;
int has_menu = ui_has_menubar();
if( (has_menu ? ui_window("FX", 0) : ui_panel("FX", 0) ) ) {
for( int i = 0; i < 64; ++i ) {
char *name = fx_name(i); if( !name ) break;
bool b = fx_enabled(i);
if( ui_bool(name, &b) ) fx_enable(i, fx_enabled(i) ^ 1);
ui_fx(i);
}
(has_menu ? ui_window_end : ui_panel_end)();
}
return changed;
}
// -----------------------------------------------------------------------------
// brdf
@ -4664,7 +4687,8 @@ void model_destroy(model_t m) {
anims_t animations(const char *pathfile, int flags) {
anims_t a = {0};
char *anim_file = vfs_read(va("%s@animlist.txt", pathfile));
if (!anim_file) return a;
if( !anim_file ) anim_file = vfs_read(pathfile);
if( anim_file ) {
for each_substring(anim_file, "\r\n", anim) {
int from, to;
char anim_name[128] = {0};
@ -4673,5 +4697,6 @@ anims_t animations(const char *pathfile, int flags) {
array_back(a.anims)->name = strswap(strswap(strswap(STRDUP(anim_name), "Loop", ""), "loop", ""), "()", ""); // @leak
}
a.speed = 1.0;
}
return a;
}

1
engine/split/v4k_render.h
View File

@ -687,6 +687,7 @@ API char * fx_name(int pass);
API int fx_find(const char *name);
API int ui_fx(int pass);
API int ui_fxs();
// -----------------------------------------------------------------------------
// utils

13
engine/split/v4k_ui.c
View File

@ -176,6 +176,15 @@ 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_ACTIVE] = main;
// @transparent
#if !is(ems)
if( glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE ) {
table[NK_COLOR_WINDOW].a =
table[NK_COLOR_HEADER].a = 255;
}
#endif
// @transparent
nk_style_default(ui_ctx);
nk_style_from_table(ui_ctx, table);
@ -864,7 +873,9 @@ void ui_render() {
* rendering the UI. */
//nk_sdl_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_MEMORY, MAX_ELEMENT_MEMORY);
glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,GL_FALSE); // @transparent
GLfloat bkColor[4]; glGetFloatv(GL_COLOR_CLEAR_VALUE, bkColor); // @transparent
glClearColor(0,0,0,1); // @transparent
glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,!bkColor[3] ? GL_TRUE : GL_FALSE); // @transparent
nk_glfw3_render(&nk_glfw, NK_ANTI_ALIASING_ON, MAX_VERTEX_MEMORY, MAX_ELEMENT_MEMORY);
glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,GL_TRUE); // @transparent

28
engine/split/v4k_window.c
View File

@ -107,7 +107,9 @@ static double t, dt, fps, hz = 0.00;
static char title[128] = {0};
static char screenshot_file[DIR_MAX];
static int locked_aspect_ratio = 0;
static vec4 wincolor = {0,0,0,1};
static vec4 winbgcolor = {0,0,0,1};
vec4 window_getcolor_() { return winbgcolor; } // internal
// -----------------------------------------------------------------------------
// glfw
@ -221,10 +223,10 @@ struct nk_glfw *window_handle_nkglfw() {
}
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
// @transparent debug
// if( input_down(KEY_F1) ) window_transparent(window_has_transparent()^1);
// if( input_down(KEY_F2) ) window_maximize(window_has_maximize()^1);
// @transparent debug
#if 0 // is(ems)
int canvasWidth, canvasHeight;
@ -262,7 +264,7 @@ void glNewFrame() {
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(winbgcolor.r, winbgcolor.g, winbgcolor.b, window_has_transparent() ? 0 : winbgcolor.a); // @transparent
//glClearColor(0.15,0.15,0.15,1);
//glClearColor( clearColor.r, clearColor.g, clearColor.b, clearColor.a );
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT );
@ -306,7 +308,13 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
winHeight = mode->height;
}
if( FLAGS_WINDOWED ) {
ifndef(ems, glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, FLAGS_TRANSPARENT ? GLFW_TRUE : GLFW_FALSE)); // @transparent
#if !is(ems)
if( FLAGS_TRANSPARENT ) { // @transparent
//glfwWindowHint(GLFW_MOUSE_PASSTHROUGH, GLFW_TRUE); // see through. requires undecorated
//glfwWindowHint(GLFW_FLOATING, GLFW_TRUE); // always on top
glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_TRUE);
}
#endif
// windowed
float ratio = (float)winWidth / (winHeight + !winHeight);
if( flags & WINDOW_SQUARE ) winWidth = winHeight = winWidth > winHeight ? winHeight : winWidth;
@ -503,6 +511,7 @@ int window_frame_begin() {
profile_render();
ui_shaders();
ui_fxs();
#if 0 // deprecated
// run user-defined hooks
@ -719,8 +728,7 @@ void window_color(unsigned color) {
unsigned g = (color >> 8) & 255;
unsigned r = (color >> 16) & 255;
unsigned a = (color >> 24) & 255;
wincolor = vec4(r / 255.0, g / 255.0, b / 255.0, a / 255.0);
// glClearColor(wincolor.r, wincolor.g, wincolor.b, 1.0);
winbgcolor = vec4(r / 255.0, g / 255.0, b / 255.0, a / 255.0);
}
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
@ -973,9 +981,11 @@ void window_transparent(int enabled) {
if( !window_has_fullscreen() ) {
if( enabled ) {
glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_FALSE);
//glfwSetWindowAttrib(window, GLFW_MOUSE_PASSTHROUGH , GLFW_TRUE);
//glfwMaximizeWindow(window);
} else {
//glfwRestoreWindow(window);
//glfwSetWindowAttrib(window, GLFW_MOUSE_PASSTHROUGH , GLFW_FALSE);
glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_TRUE);
}
}

89
engine/v4k.c
View File

@ -287,8 +287,9 @@ void (map_erase)(map* m, void *key, uint64_t keyhash) {
}
}
int (map_count)(map* m) {
int (map_count)(map* m) { // clean deferred GC_SLOT only
return m->count;
int counter = 0;
for( int i = 0; i < MAP_HASHSIZE; ++i) {
for( pair *cur = m->array[i]; cur; cur = cur->next ) {
@ -298,7 +299,11 @@ int (map_count)(map* m) {
return counter;
}
void (map_gc)(map* m) {
int (map_isempty)(map* m) { // clean deferred GC_SLOT only
return !m->count;
}
void (map_gc)(map* m) { // clean deferred GC_SLOT only
#if MAP_DONT_ERASE
for( pair *next, *cur = m->array[MAP_GC_SLOT]; cur; cur = next ) {
next = cur->next;
@ -431,6 +436,7 @@ void (set_erase)(set* m, void *key, uint64_t keyhash) {
int (set_count)(const set* m) { // does not include GC_SLOT
return m->count;
int counter = 0;
for( int i = 0; i < SET_HASHSIZE; ++i) {
for( const set_item *cur = m->array[i]; cur; cur = cur->next ) {
@ -440,6 +446,10 @@ int (set_count)(const set* m) { // does not include GC_SLOT
return counter;
}
int (set_isempty)(const set *m) { // clean deferred GC_SLOT only
return !m->count;
}
void (set_gc)(set* m) { // clean deferred GC_SLOT only
#if SET_DONT_ERASE
for( set_item *next, *cur = m->array[set_GC_SLOT]; cur; cur = next ) {
@ -10624,6 +10634,8 @@ int ui_shader(unsigned shader) {
}
int ui_shaders() {
if( !map_count(shader_reflect) ) return 0;
int changed = 0;
int has_menu = ui_has_menubar();
if( (has_menu ? ui_window("Shaders", 0) : ui_panel("Shaders", 0) ) ) {
@ -13048,6 +13060,7 @@ void skybox_sh_add_light(skybox_t *sky, vec3 light, vec3 dir, float strength) {
sky->cubemap.sh[3] = add3(sky->cubemap.sh[3], scale3(scaled_light, -0.488603f * norm_dir.x));
}
API vec4 window_getcolor_(); // internal use, not public
int skybox_push_state(skybox_t *sky, mat44 proj, mat44 view) {
last_cubemap = &sky->cubemap;
@ -13058,6 +13071,9 @@ int skybox_push_state(skybox_t *sky, mat44 proj, mat44 view) {
//glDisable(GL_CULL_FACE);
glDisable(GL_DEPTH_TEST);
// we have to reset clear color here, because of wrong alpha compositing issues on native transparent windows otherwise
vec4 bgcolor = window_getcolor_(); glClearColor(bgcolor.r, bgcolor.g, bgcolor.b, 1); // @transparent
mat44 mvp; multiply44x2(mvp, proj, view);
//glDepthMask(GL_FALSE);
@ -13069,6 +13085,7 @@ int skybox_push_state(skybox_t *sky, mat44 proj, mat44 view) {
return 0; // @fixme: return sortable hash here?
}
int skybox_pop_state() {
//vec4 bgcolor = window_getcolor_(); glClearColor(bgcolor.r, bgcolor.g, bgcolor.b, window_has_transparent() ? 0 : bgcolor.a); // @transparent
//glDepthMask(GL_TRUE);
//glClear(GL_DEPTH_BUFFER_BIT);
return 0;
@ -13718,6 +13735,22 @@ int fx_find(const char *name) {
int ui_fx(int pass) {
return ui_postfx(&fx, pass);
}
int ui_fxs() {
if(!fx.num_loaded) return 0;
int changed = 0;
int has_menu = ui_has_menubar();
if( (has_menu ? ui_window("FX", 0) : ui_panel("FX", 0) ) ) {
for( int i = 0; i < 64; ++i ) {
char *name = fx_name(i); if( !name ) break;
bool b = fx_enabled(i);
if( ui_bool(name, &b) ) fx_enable(i, fx_enabled(i) ^ 1);
ui_fx(i);
}
(has_menu ? ui_window_end : ui_panel_end)();
}
return changed;
}
// -----------------------------------------------------------------------------
// brdf
@ -14976,7 +15009,8 @@ void model_destroy(model_t m) {
anims_t animations(const char *pathfile, int flags) {
anims_t a = {0};
char *anim_file = vfs_read(va("%s@animlist.txt", pathfile));
if (!anim_file) return a;
if( !anim_file ) anim_file = vfs_read(pathfile);
if( anim_file ) {
for each_substring(anim_file, "\r\n", anim) {
int from, to;
char anim_name[128] = {0};
@ -14985,6 +15019,7 @@ anims_t animations(const char *pathfile, int flags) {
array_back(a.anims)->name = strswap(strswap(strswap(STRDUP(anim_name), "Loop", ""), "loop", ""), "()", ""); // @leak
}
a.speed = 1.0;
}
return a;
}
#line 0
@ -17782,6 +17817,15 @@ 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_ACTIVE] = main;
// @transparent
#if !is(ems)
if( glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE ) {
table[NK_COLOR_WINDOW].a =
table[NK_COLOR_HEADER].a = 255;
}
#endif
// @transparent
nk_style_default(ui_ctx);
nk_style_from_table(ui_ctx, table);
@ -18470,7 +18514,9 @@ void ui_render() {
* rendering the UI. */
//nk_sdl_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_MEMORY, MAX_ELEMENT_MEMORY);
glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,GL_FALSE); // @transparent
GLfloat bkColor[4]; glGetFloatv(GL_COLOR_CLEAR_VALUE, bkColor); // @transparent
glClearColor(0,0,0,1); // @transparent
glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,!bkColor[3] ? GL_TRUE : GL_FALSE); // @transparent
nk_glfw3_render(&nk_glfw, NK_ANTI_ALIASING_ON, MAX_VERTEX_MEMORY, MAX_ELEMENT_MEMORY);
glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,GL_TRUE); // @transparent
@ -20006,12 +20052,15 @@ int ui_demo(int do_windows) {
#line 1 "v4k_profile.c"
#if ENABLE_PROFILER
profiler_t profiler;
int profiler_enabled = 0;
int profiler_enabled = 1;
void (profile_init)() { map_init(profiler, less_str, hash_str); profiler_enabled &= !!profiler; }
int (profile_enable)(bool on) { return profiler_enabled = on; }
void (profile_render)() {
if(!profiler_enabled) return;
// @transparent
static bool has_transparent_attrib = 0; do_once has_transparent_attrib = glfwGetWindowAttrib(window_handle(), GLFW_TRANSPARENT_FRAMEBUFFER) == GLFW_TRUE;
if( has_transparent_attrib ) return;
// @transparent
int has_menu = ui_has_menubar();
if( !has_menu ) {
@ -20418,7 +20467,9 @@ static double t, dt, fps, hz = 0.00;
static char title[128] = {0};
static char screenshot_file[DIR_MAX];
static int locked_aspect_ratio = 0;
static vec4 wincolor = {0,0,0,1};
static vec4 winbgcolor = {0,0,0,1};
vec4 window_getcolor_() { return winbgcolor; } // internal
// -----------------------------------------------------------------------------
// glfw
@ -20532,10 +20583,10 @@ struct nk_glfw *window_handle_nkglfw() {
}
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
// @transparent debug
// if( input_down(KEY_F1) ) window_transparent(window_has_transparent()^1);
// if( input_down(KEY_F2) ) window_maximize(window_has_maximize()^1);
// @transparent debug
#if 0 // is(ems)
int canvasWidth, canvasHeight;
@ -20573,7 +20624,7 @@ void glNewFrame() {
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(winbgcolor.r, winbgcolor.g, winbgcolor.b, window_has_transparent() ? 0 : winbgcolor.a); // @transparent
//glClearColor(0.15,0.15,0.15,1);
//glClearColor( clearColor.r, clearColor.g, clearColor.b, clearColor.a );
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT );
@ -20617,7 +20668,13 @@ bool window_create_from_handle(void *handle, float scale, unsigned flags) {
winHeight = mode->height;
}
if( FLAGS_WINDOWED ) {
ifndef(ems, glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, FLAGS_TRANSPARENT ? GLFW_TRUE : GLFW_FALSE)); // @transparent
#if !is(ems)
if( FLAGS_TRANSPARENT ) { // @transparent
//glfwWindowHint(GLFW_MOUSE_PASSTHROUGH, GLFW_TRUE); // see through. requires undecorated
//glfwWindowHint(GLFW_FLOATING, GLFW_TRUE); // always on top
glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_TRUE);
}
#endif
// windowed
float ratio = (float)winWidth / (winHeight + !winHeight);
if( flags & WINDOW_SQUARE ) winWidth = winHeight = winWidth > winHeight ? winHeight : winWidth;
@ -20814,6 +20871,7 @@ int window_frame_begin() {
profile_render();
ui_shaders();
ui_fxs();
#if 0 // deprecated
// run user-defined hooks
@ -21030,8 +21088,7 @@ void window_color(unsigned color) {
unsigned g = (color >> 8) & 255;
unsigned r = (color >> 16) & 255;
unsigned a = (color >> 24) & 255;
wincolor = vec4(r / 255.0, g / 255.0, b / 255.0, a / 255.0);
// glClearColor(wincolor.r, wincolor.g, wincolor.b, 1.0);
winbgcolor = vec4(r / 255.0, g / 255.0, b / 255.0, a / 255.0);
}
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
@ -21284,9 +21341,11 @@ void window_transparent(int enabled) {
if( !window_has_fullscreen() ) {
if( enabled ) {
glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_FALSE);
//glfwSetWindowAttrib(window, GLFW_MOUSE_PASSTHROUGH , GLFW_TRUE);
//glfwMaximizeWindow(window);
} else {
//glfwRestoreWindow(window);
//glfwSetWindowAttrib(window, GLFW_MOUSE_PASSTHROUGH , GLFW_FALSE);
glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_TRUE);
}
}

5
engine/v4k.h
View File

@ -636,6 +636,7 @@ static __thread unsigned array_n_;
set_clear(&(m)->base) \
)
#define set_isempty(m) set_isempty(&(m)->base)
#define set_count(m) set_count(&(m)->base)
#define set_gc(m) set_gc(&(m)->base)
@ -674,6 +675,7 @@ API void (set_free)(set *m);
API void (set_insert)(set *m, set_item *p, void *key, uint64_t keyhash, void *super);
API void (set_erase)(set *m, void *key, uint64_t keyhash);
API void* (set_find)(const set *m, void *key, uint64_t keyhash);
API int (set_isempty)(const set *m);
API int (set_count)(const set *m);
API void (set_gc)(set *m); // only if using SET_DONT_ERASE
API void (set_clear)(set* m);
@ -767,6 +769,7 @@ API void (set_clear)(set* m);
map_clear(&(m)->base) \
)
#define map_isempty(m) map_isempty(&(m)->base)
#define map_count(m) map_count(&(m)->base)
#define map_gc(m) map_gc(&(m)->base)
@ -811,6 +814,7 @@ API void (map_free)(map *m);
API void (map_insert)(map *m, pair *p, void *key, void *value, uint64_t keyhash, void *super);
API void (map_erase)(map *m, void *key, uint64_t keyhash);
API void* (map_find)(map *m, void *key, uint64_t keyhash);
API int (map_isempty)(map *m);
API int (map_count)(map *m);
API void (map_gc)(map *m); // only if using MAP_DONT_ERASE
API bool (map_sort)(map* m);
@ -3138,6 +3142,7 @@ API char * fx_name(int pass);
API int fx_find(const char *name);
API int ui_fx(int pass);
API int ui_fxs();
// -----------------------------------------------------------------------------
// utils