projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stuff
[carveJwlIkooP6JGAAIwe30JlM.git]
/
main.c
diff --git
a/main.c
b/main.c
index 8c1ddef2811b537bcbec692426b676fa8f056ec7..024b15e1d305e01c70ece3b0782f198361ff0edb 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-28,17
+28,16
@@
static int sv_scene = 0;
#include "steam.h"
#include "network.h"
#include "steam.h"
#include "network.h"
-#include "road.h"
+#include "model.h"
+//#include "road.h"
#include "scene.h"
#include "scene.h"
-#include "ik.h"
+
//
#include "ik.h"
#include "audio.h"
#include "audio.h"
-#include "terrain.h"
-#include "character.h"
+
//
#include "terrain.h"
+
//
#include "character.h"
#include "ragdoll.h"
#include "rigidbody.h"
#include "render.h"
#include "ragdoll.h"
#include "rigidbody.h"
#include "render.h"
-#include "gate.h"
-#include "water.h"
#include "world.h"
#include "player.h"
#include "world.h"
#include "player.h"
@@
-47,6
+46,10
@@
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"
+
+#include "gate.h"
+#include "water.h"
void vg_register(void)
{
void vg_register(void)
{
@@
-184,7
+187,7
@@
void vg_start(void)
if( sv_scene == 0 )
{
if( sv_scene == 0 )
{
- character_load( &player.mdl, "ch_
default
" );
+ character_load( &player.mdl, "ch_
new
" );
character_init_ragdoll( &player.mdl );
world_load();
character_init_ragdoll( &player.mdl );
world_load();
@@
-194,11
+197,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
+236,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 )
@@
-255,7
+265,7
@@
static void render_main_game(void)
m4x4f world_4x4;
m4x3_expand( player.camera_inverse, world_4x4 );
m4x4f world_4x4;
m4x3_expand( player.camera_inverse, world_4x4 );
- gpipeline.fov = freecam? 60.0f: 1
3
5.0f; /* 120 */
+ gpipeline.fov = freecam? 60.0f: 1
2
5.0f; /* 120 */
m4x4_projection( vg_pv, gpipeline.fov,
(float)vg_window_x / (float)vg_window_y,
0.02f, 2100.0f );
m4x4_projection( vg_pv, gpipeline.fov,
(float)vg_window_x / (float)vg_window_y,
0.02f, 2100.0f );
@@
-347,6
+357,10
@@
void vg_render(void)
{
physics_test_render();
}
{
physics_test_render();
}
+ else if( sv_scene == 2 )
+ {
+ anim_test_render( &tex_characters );
+ }
#endif
}
#endif
}