projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oops
[carveJwlIkooP6JGAAIwe30JlM.git]
/
main.c
diff --git
a/main.c
b/main.c
index 8c1ddef2811b537bcbec692426b676fa8f056ec7..2ae90c83a42ec35dcc8baf079723951e1745353b 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-17,7
+17,7
@@
vg_tex2d tex_water = { .path = "textures/water.qoi" };
static int debugview = 0;
static int sv_debugcam = 0;
static int lightedit = 0;
static int debugview = 0;
static int sv_debugcam = 0;
static int lightedit = 0;
-static int sv_scene =
0
;
+static int sv_scene =
2
;
/* Components */
//#define SR_NETWORKED
/* Components */
//#define SR_NETWORKED
@@
-47,6
+47,7
@@
static int sv_scene = 0;
#include "shaders/unlit.h"
#include "physics_test.h"
#include "shaders/unlit.h"
#include "physics_test.h"
+#include "anim_test.h"
void vg_register(void)
{
void vg_register(void)
{
@@
-54,6
+55,7
@@
void vg_register(void)
shader_standard_register();
shader_vblend_register();
shader_unlit_register();
shader_standard_register();
shader_vblend_register();
shader_unlit_register();
+ shader_viewchar_register();
world_register();
character_register();
world_register();
character_register();
@@
-194,11
+196,14
@@
void vg_start(void)
network_init();
}
network_init();
}
- else
+ else
if( sv_scene == 1 )
{
physics_test_start();
}
{
physics_test_start();
}
-
+ else if( sv_scene == 2 )
+ {
+ anim_test_start();
+ }
}
void vg_free(void)
}
void vg_free(void)
@@
-230,6
+235,10
@@
void vg_update(void)
{
physics_test_update();
}
{
physics_test_update();
}
+ else if( sv_scene == 2 )
+ {
+ anim_test_update();
+ }
}
static void vg_framebuffer_resize( int w, int h )
}
static void vg_framebuffer_resize( int w, int h )
@@
-347,6
+356,10
@@
void vg_render(void)
{
physics_test_render();
}
{
physics_test_render();
}
+ else if( sv_scene == 2 )
+ {
+ anim_test_render( &tex_pallet );
+ }
#endif
}
#endif
}