projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move rigidbody to vg
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player_walk.c
diff --git
a/player_walk.c
b/player_walk.c
index 6b0def6c9133831e174c3dbea412bb7067cc25ab..87bb9cab79213ecde13022b54f25c85cf39ff444 100644
(file)
--- a/
player_walk.c
+++ b/
player_walk.c
@@
-1,5
+1,7
@@
-#ifndef PLAYER_WALK_C
-#define PLAYER_WALK_C
+#pragma once
+
+#include "vg/vg_rigidbody_collision.h"
+#include "scene_rigidbody.h"
#include "player.h"
#include "input.h"
#include "player.h"
#include "input.h"
@@
-489,7
+491,7
@@
static void player_walk_update_generic(void){
w->surface = k_surface_prop_concrete;
for( int i=0; i<len; i++ ){
w->surface = k_surface_prop_concrete;
for( int i=0; i<len; i++ ){
-
struct conta
ct *ct = &manifold[i];
+
rb_
ct *ct = &manifold[i];
rb_debug_contact( ct );
if( player_walk_normal_standable( ct->n ) ){
rb_debug_contact( ct );
if( player_walk_normal_standable( ct->n ) ){
@@
-562,7
+564,7
@@
static void player_walk_update_generic(void){
*/
for( int j=0; j<5; j++ ){
for( int i=0; i<len; i++ ){
*/
for( int j=0; j<5; j++ ){
for( int i=0; i<len; i++ ){
-
struct conta
ct *ct = &manifold[i];
+
rb_
ct *ct = &manifold[i];
/*normal */
float vn = -v3_dot( localplayer.rb.v, ct->n );
/*normal */
float vn = -v3_dot( localplayer.rb.v, ct->n );
@@
-1181,4
+1183,3
@@
static void player__walk_sfx_oneshot( u8 id, v3f pos, f32 volume ){
audio_unlock();
}
audio_unlock();
}
-#endif /* PLAYER_DEVICE_WALK_H */