ax/manigraph
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'roberto' into experimental

Browse Source
This commit is contained in:
PedroEdiaz
2024-12-01 00:24:52 -06:00
parent 1a0b804b57 df5ae70aa2
commit 8be2052c45
9 changed files with 116 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main.c
View File

@@ -47,8 +47,8 @@ extern volatile unsigned char animate_index;
#ifndef EMSCRIPTEN
static inline
#endif
void
main_loop(void)
void main_loop(void)
{
quat_t q;
@@ -60,23 +60,26 @@ static inline
{
static float angle = 0;
if (animate_index && m)
{
angle += 0.01;
load_uint_to_shader(shader, "i", animate_index - 1);
load_uint_to_shader(shader_plain, "i", animate_index - 1);
load_float_to_shader(shader, "angle", angle);
load_float_to_shader(shader_plain, "angle", angle);
}
if (angle > M_PI / 2 && angle)
if( angle > M_PI/2 )
{
animate_index = 0;
angle = 0;
load_float_to_shader( shader, "angle", angle);
load_float_to_shader( shader_plain, "angle", angle);
set_projection_mesh( projection );
}
if( animate_index )
{
load_uint_to_shader( shader, "i", animate_index-1 );
load_uint_to_shader( shader_plain, "i", animate_index-1 );
angle+=0.01;
load_float_to_shader( shader, "angle", angle);
load_float_to_shader( shader_plain, "angle", angle);
}
}
clean_context();
#ifndef DEBUG
@@ -116,7 +119,7 @@ int main(void)
mlog("[CONTEXT] Error al inicializar...\n");
goto error_context;
}
set_clean_color_context(0xFB, 0xEA, 0xEB);
set_clean_color_context(0xFF, 0xFF, 0xFF);
}
mlog("[TEXTURE] Inicializando...\n");
@@ -181,7 +184,8 @@ int main(void)
mlog("[MAIN LOOP] Inicializando...\n");
#ifdef EMSCRIPTEN
emscripten_set_main_loop(&main_loop, 0, 1);
emscripten_set_main_loop(&main_loop, 60, 1);
return 0;
#else
while (is_open_window(window))
main_loop();