diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-02-26 20:10:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-26 20:10:54 +0100 |
| commit | f13e87e25799aafa4462779650c7d6222c782b31 (patch) | |
| tree | b28e5eed3cba37a72eabcf6eb849852275624a48 /servers/physics/collision_solver_sat.h | |
| parent | a23e062c281292b75083c71a0a1deb03cb57c788 (diff) | |
| parent | eae94ba1c87718c95768f90cda95cf665c77a362 (diff) | |
Merge pull request #7802 from tagcup/physics_64bit
Use real_t as floating point type in physics code.
Diffstat (limited to 'servers/physics/collision_solver_sat.h')
| -rw-r--r-- | servers/physics/collision_solver_sat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics/collision_solver_sat.h b/servers/physics/collision_solver_sat.h index 60387a978d..15fe7dc34a 100644 --- a/servers/physics/collision_solver_sat.h +++ b/servers/physics/collision_solver_sat.h @@ -32,6 +32,6 @@ #include "collision_solver_sw.h" -bool sat_calculate_penetration(const ShapeSW *p_shape_A, const Transform& p_transform_A, const ShapeSW *p_shape_B, const Transform& p_transform_B, CollisionSolverSW::CallbackResult p_result_callback,void *p_userdata, bool p_swap=false,Vector3* r_prev_axis=NULL,float p_margin_a=0,float p_margin_b=0); +bool sat_calculate_penetration(const ShapeSW *p_shape_A, const Transform& p_transform_A, const ShapeSW *p_shape_B, const Transform& p_transform_B, CollisionSolverSW::CallbackResult p_result_callback,void *p_userdata, bool p_swap=false,Vector3* r_prev_axis=NULL,real_t p_margin_a=0,real_t p_margin_b=0); #endif // COLLISION_SOLVER_SAT_H |