projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added scene_vert struct, result is good
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player.h
diff --git
a/player.h
b/player.h
index 137a1ad056896fb33289b2f24a4aa2f408847bf4..3dce2f01a8ffb6e57d802781f26c2c36e51c0ac8 100644
(file)
--- a/
player.h
+++ b/
player.h
@@
-6,7
+6,7
@@
#include "player_common.h"
#include "player_walk.h"
#include "player_skate.h"
#include "player_common.h"
#include "player_walk.h"
#include "player_skate.h"
-
//
#include "player_dead.h"
+#include "player_dead.h"
struct player_instance
{
struct player_instance
{
@@
-14,6
+14,9
@@
struct player_instance
rigidbody rb;
v3f angles;
rigidbody rb;
v3f angles;
+ v4f qbasis;
+ m3x3f basis, invbasis, basis_gate;
+
/*
* Camera management
* ---------------------------
/*
* Camera management
* ---------------------------
@@
-59,6
+62,9
@@
struct player_instance
*input_js2v,
*input_jump,
*input_push,
*input_js2v,
*input_jump,
*input_push,
+ *input_trick0,
+ *input_trick1,
+ *input_trick2,
*input_walk,
*input_walkh,
*input_walkv,
*input_walk,
*input_walkh,
*input_walkv,
@@
-95,7
+101,7
@@
struct player_instance
struct player_skate _skate;
struct player_walk _walk;
struct player_skate _skate;
struct player_walk _walk;
-
//
struct player_dead _dead;
+ struct player_dead _dead;
};
/*
};
/*
@@
-132,7
+138,7
@@
void( *_player_update[])( player_instance *player ) =
{
player__walk_update,
player__skate_update,
{
player__walk_update,
player__skate_update,
- NULL
+ player__dead_update,
};
VG_STATIC
};
VG_STATIC
@@
-156,7
+162,7
@@
void( *_player_animate[])( player_instance *player, player_animation *dest ) =
{
player__walk_animate,
player__skate_animate,
{
player__walk_animate,
player__skate_animate,
- NULL
+ player__dead_animate
};
VG_STATIC
};
VG_STATIC
@@
-164,7
+170,7
@@
void( *_player_post_animate[])( player_instance *player ) =
{
player__walk_post_animate,
player__skate_post_animate,
{
player__walk_post_animate,
player__skate_post_animate,
- NULL
+ player__dead_post_animate
};
/* implementation */
};
/* implementation */
@@
-173,7
+179,7
@@
void( *_player_post_animate[])( player_instance *player ) =
#include "player_common.c"
#include "player_walk.c"
#include "player_skate.c"
#include "player_common.c"
#include "player_walk.c"
#include "player_skate.c"
-
//
#include "player_dead.c"
+#include "player_dead.c"
#endif /* PLAYER_H */
#endif /* PLAYER_H */