projects
/
vg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d280e1e
)
add bool type to shader compiler
author
hgn
<hgodden00@gmail.com>
Thu, 13 Jul 2023 19:39:06 +0000
(20:39 +0100)
committer
hgn
<hgodden00@gmail.com>
Thu, 13 Jul 2023 19:39:06 +0000
(20:39 +0100)
vg.h
patch
|
blob
|
history
vg_build_utils_shader.h
patch
|
blob
|
history
diff --git
a/vg.h
b/vg.h
index 132f338275933833d2a0545e6c1dfd3cb5376b9f..f839f02e60e1848573d68c6a52df6467cd64ad36 100644
(file)
--- a/
vg.h
+++ b/
vg.h
@@
-313,7
+313,7
@@
VG_STATIC void _vg_process_events(void)
if( vg_console.enabled &&
(vg_ui.focused_control_type != k_ui_control_modal) ){
if( event.key.keysym.sym == SDLK_ESCAPE ||
if( vg_console.enabled &&
(vg_ui.focused_control_type != k_ui_control_modal) ){
if( event.key.keysym.sym == SDLK_ESCAPE ||
- event.key.keysym.s
ym == SDLK_BACKQUOT
E ){
+ event.key.keysym.s
cancode == SDL_SCANCODE_GRAV
E ){
vg_console.enabled = 0;
ui_defocus_all();
}
vg_console.enabled = 0;
ui_defocus_all();
}
@@
-330,7
+330,7
@@
VG_STATIC void _vg_process_events(void)
}
}
else{
}
}
else{
- if( event.key.keysym.s
ym == SDLK_BACKQUOT
E ){
+ if( event.key.keysym.s
cancode == SDL_SCANCODE_GRAV
E ){
vg_console.enabled = 1;
}
else {
vg_console.enabled = 1;
}
else {
diff --git
a/vg_build_utils_shader.h
b/vg_build_utils_shader.h
index 72afd4e862de9449cbed2401a019ae58d9220b66..df614ace09a5dff21c5b799b6eb374f1728fce80 100644
(file)
--- a/
vg_build_utils_shader.h
+++ b/
vg_build_utils_shader.h
@@
-197,6
+197,7
@@
int vg_build_shader( char *src_vert, /* path/to/vert.vs */
types[] =
{
{ "float", "float f", "glUniform1f(%s,f);" },
types[] =
{
{ "float", "float f", "glUniform1f(%s,f);" },
+ { "bool", "int b", "glUniform1f(%s,b);" },
{ "vec2", "v2f v", "glUniform2fv(%s,1,v);" },
{ "vec3", "v3f v", "glUniform3fv(%s,1,v);" },
{ "vec2", "v2f v", "glUniform2fv(%s,1,v);" },
{ "vec3", "v3f v", "glUniform3fv(%s,1,v);" },