projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
review: rigidbody.h
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player_skate.c
diff --git
a/player_skate.c
b/player_skate.c
index 59ac9f10b3d925a1763d8fb74381ed2b898eef58..6b5bdfb993b4dc0f16cab22400407dec183f311c 100644
(file)
--- a/
player_skate.c
+++ b/
player_skate.c
@@
-262,7
+262,7
@@
too_many_samples:
v3_copy( average_normal, inf->n );
v3_copy( average_direction, inf->dir );
v3_copy( average_normal, inf->n );
v3_copy( average_direction, inf->dir );
- vg_line_p
t3
( inf->co, 0.02f, VG__GREEN );
+ vg_line_p
oint
( inf->co, 0.02f, VG__GREEN );
vg_line_arrow( inf->co, average_direction, 0.3f, VG__GREEN );
vg_line_arrow( inf->co, inf->n, 0.2f, VG__CYAN );
vg_line_arrow( inf->co, average_direction, 0.3f, VG__GREEN );
vg_line_arrow( inf->co, inf->n, 0.2f, VG__CYAN );
@@
-1180,7
+1180,7
@@
VG_STATIC void player__skate_post_update( player_instance *player )
v3_add( jump->log[jump->log_length-1], jump->n, p1 );
vg_line( jump->log[jump->log_length-1], p1, 0xffffffff );
v3_add( jump->log[jump->log_length-1], jump->n, p1 );
vg_line( jump->log[jump->log_length-1], p1, 0xffffffff );
- vg_line_p
t3
( jump->apex, 0.02f, 0xffffffff );
+ vg_line_p
oint
( jump->apex, 0.02f, 0xffffffff );
}
audio_lock();
}
audio_lock();
@@
-2347,8
+2347,7
@@
begin_collision:;
s->substep -= s->substep_delta;
rb_ct manifold[128];
s->substep -= s->substep_delta;
rb_ct manifold[128];
- int manifold_len = 0;
-
+ int manifold_len = 0;
/*
* Phase -1: head detection
* --------------------------------------------------------------------------
/*
* Phase -1: head detection
* --------------------------------------------------------------------------
@@
-2416,7
+2415,7
@@
begin_collision:;
manifold_len += l;
if( vg_lines.draw )
manifold_len += l;
if( vg_lines.draw )
-
debug
_capsule( mtx, capsule.radius, capsule.height, VG__WHITE );
+
vg_line
_capsule( mtx, capsule.radius, capsule.height, VG__WHITE );
/* add limits */
if( s->state.activity >= k_skate_activity_grind_any ){
/* add limits */
if( s->state.activity >= k_skate_activity_grind_any ){
@@
-2438,7
+2437,7
@@
begin_collision:;
v3f world_cog;
m4x3_mulv( player->rb.to_world, s->weight_distribution, world_cog );
v3f world_cog;
m4x3_mulv( player->rb.to_world, s->weight_distribution, world_cog );
- vg_line_p
t3
( world_cog, 0.02f, VG__BLACK );
+ vg_line_p
oint
( world_cog, 0.02f, VG__BLACK );
for( int i=0; i<manifold_len; i ++ ){
rb_prepare_contact( &manifold[i], s->substep_delta );
for( int i=0; i<manifold_len; i ++ ){
rb_prepare_contact( &manifold[i], s->substep_delta );
@@
-2559,13
+2558,13
@@
begin_collision:;
m4x3f mtx;
m3x3_copy( player->rb.to_world, mtx );
m4x3_mulv( player->rb.to_world, wheels[i].pos, mtx[3] );
m4x3f mtx;
m3x3_copy( player->rb.to_world, mtx );
m4x3_mulv( player->rb.to_world, wheels[i].pos, mtx[3] );
-
debug
_sphere( mtx, wheels[i].radius,
- (u32[]){ VG__WHITE, VG__BLACK,
+
vg_line
_sphere( mtx, wheels[i].radius,
+
(u32[]){ VG__WHITE, VG__BLACK,
wheels[i].colour }[ wheels[i].state ]);
}
skate_integrate( player );
wheels[i].colour }[ wheels[i].state ]);
}
skate_integrate( player );
- vg_line_p
t3
( s->state.cog, 0.02f, VG__WHITE );
+ vg_line_p
oint
( s->state.cog, 0.02f, VG__WHITE );
ent_gate *gate =
world_intersect_gates(world, player->rb.co, s->state.prev_pos );
ent_gate *gate =
world_intersect_gates(world, player->rb.co, s->state.prev_pos );