projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
walk exchange
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player_walk.c
diff --git
a/player_walk.c
b/player_walk.c
index ad58c7317617e21aea774d125d0c2dd6a007e5e7..0692bdc404a78d127fa1b6be315792ddc1ed2f39 100644
(file)
--- a/
player_walk.c
+++ b/
player_walk.c
@@
-282,7
+282,7
@@
static void player__walk_pre_update(void){
localplayer.immobile = 1;
struct player_avatar *av = localplayer.playeravatar;
localplayer.immobile = 1;
struct player_avatar *av = localplayer.playeravatar;
- m4x3_mulv(
av->sk
.final_mtx[ av->id_ik_foot_r ],
+ m4x3_mulv(
localplayer
.final_mtx[ av->id_ik_foot_r ],
av->sk.bones[ av->id_ik_foot_r ].co,
w->state.drop_in_foot_anchor );
}
av->sk.bones[ av->id_ik_foot_r ].co,
w->state.drop_in_foot_anchor );
}
@@
-617,9
+617,9
@@
static void player__walk_update(void){
}
}
}
}
- ent_gate *gate =
- world_intersect_gates( world, localplayer.rb.co, w->state.prev_pos );
- if( gate ){
+ u32 id = world_intersect_gates(world, localplayer.rb.co, w->state.prev_pos);
+ if( id ){
+ ent_gate *gate = mdl_arritm( &world->ent_gate, mdl_entity_id_id(id) );
m4x3_mulv( gate->transport, localplayer.rb.co, localplayer.rb.co );
m3x3_mulv( gate->transport, localplayer.rb.v, localplayer.rb.v );
m4x3_mulv( gate->transport, localplayer.rb.co, localplayer.rb.co );
m3x3_mulv( gate->transport, localplayer.rb.v, localplayer.rb.v );
@@
-628,7
+628,7
@@
static void player__walk_update(void){
q_mul( transport_rotation, localplayer.rb.q, localplayer.rb.q );
rb_update_transform( &localplayer.rb );
q_mul( transport_rotation, localplayer.rb.q, localplayer.rb.q );
rb_update_transform( &localplayer.rb );
- player__pass_gate(
gate
);
+ player__pass_gate(
id
);
}
rb_update_transform( &localplayer.rb );
}
}
rb_update_transform( &localplayer.rb );
}
@@
-962,4
+962,8
@@
static void player__walk_reset( ent_spawn *rp ){
w->state.outro_start_time = 0.0;
}
w->state.outro_start_time = 0.0;
}
+static void player__walk_animator_exchange( bitpack_ctx *ctx, void *data ){
+ struct player_walk_animator *animator = data;
+ bitpack_bytes( ctx, sizeof(*animator), animator );
+}
#endif /* PLAYER_DEVICE_WALK_H */
#endif /* PLAYER_DEVICE_WALK_H */