projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build system revision
[carveJwlIkooP6JGAAIwe30JlM.git]
/
vehicle.c
diff --git
a/vehicle.c
b/vehicle.c
index 3555a971ed35c140e15a63f252d243d13e7a6620..0576963e1f59ff8f4bfd0c541c9a7e9f8813a2a6 100644
(file)
--- a/
vehicle.c
+++ b/
vehicle.c
@@
-2,6
+2,7
@@
#define VEHICLE_C
#include "vehicle.h"
#define VEHICLE_C
#include "vehicle.h"
+#include "scene_rigidbody.h"
static int spawn_car( int argc, const char *argv[] ){
v3f ra, rb, rx;
static int spawn_car( int argc, const char *argv[] ){
v3f ra, rb, rx;
@@
-95,7
+96,7
@@
static void vehicle_wheel_force( int index ){
if( t < 1.0f ){
/* spring force */
if( t < 1.0f ){
/* spring force */
- float Fv = (1.0f-t) * k_car_spring*
k_rb
_delta;
+ float Fv = (1.0f-t) * k_car_spring*
vg.time_fixed
_delta;
v3f delta;
v3_sub( pa, gzoomer.rb.co, delta );
v3f delta;
v3_sub( pa, gzoomer.rb.co, delta );
@@
-104,7
+105,8
@@
static void vehicle_wheel_force( int index ){
v3_cross( gzoomer.rb.w, delta, rv );
v3_add( gzoomer.rb.v, rv, rv );
v3_cross( gzoomer.rb.w, delta, rv );
v3_add( gzoomer.rb.v, rv, rv );
- Fv += v3_dot(rv, gzoomer.rb.to_world[1]) * -k_car_spring_damp*k_rb_delta;
+ Fv += v3_dot(rv, gzoomer.rb.to_world[1])
+ * -k_car_spring_damp*vg.time_fixed_delta;
/* scale by normal incident */
Fv *= v3_dot( n, gzoomer.rb.to_world[1] );
/* scale by normal incident */
Fv *= v3_dot( n, gzoomer.rb.to_world[1] );
@@
-150,7
+152,8
@@
static void vehicle_wheel_force( int index ){
/* apply drive force */
if( index >= 2 ){
/* apply drive force */
if( index >= 2 ){
- v3_muls( ty, -gzoomer.drive * k_car_drive_force * k_rb_delta, F );
+ v3_muls( ty, -gzoomer.drive * k_car_drive_force
+ * vg.time_fixed_delta, F );
rb_linear_impulse( &gzoomer.rb, raW, F );
}
}
rb_linear_impulse( &gzoomer.rb, raW, F );
}
}
@@
-211,8
+214,8
@@
static void vehicle_update_fixed(void)
v3_muls( rb->to_world[1], -fabsf(v3_dot( rb->v, rb->to_world[2] )) *
k_car_downforce, Fdown );
v3_muls( rb->to_world[1], -fabsf(v3_dot( rb->v, rb->to_world[2] )) *
k_car_downforce, Fdown );
- v3_muladds( rb->v, Fair,
k_rb
_delta, rb->v );
- v3_muladds( rb->v, Fdown,
k_rb
_delta, rb->v );
+ v3_muladds( rb->v, Fair,
vg.time_fixed
_delta, rb->v );
+ v3_muladds( rb->v, Fdown,
vg.time_fixed
_delta, rb->v );
for( int i=0; i<4; i++ )
vehicle_wheel_force( i );
for( int i=0; i<4; i++ )
vehicle_wheel_force( i );
@@
-238,7
+241,7
@@
static void vehicle_update_fixed(void)
}
len = rb_manifold_apply_filtered( manifold, len );
}
len = rb_manifold_apply_filtered( manifold, len );
- rb_presolve_contacts( manifold, len );
+ rb_presolve_contacts( manifold,
vg.time_fixed_delta,
len );
for( int i=0; i<8; i++ ){
rb_solve_contacts( manifold, len );
vehicle_solve_friction();
for( int i=0; i<8; i++ ){
rb_solve_contacts( manifold, len );
vehicle_solve_friction();