diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-02-19 11:57:14 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-19 11:57:14 -0300 |
| commit | d7d65fa2f2b51d03f7bdfcbceedca99188ce979c (patch) | |
| tree | fecdf1bfa39ba5a4895b4dbf340a3b68098c109a /servers/physics_2d/collision_solver_2d_sat.h | |
| parent | 8c1731b67995add31361ae526b0e6af76346181e (diff) | |
| download | redot-engine-d7d65fa2f2b51d03f7bdfcbceedca99188ce979c.tar.gz | |
-improved physics ccd
-html5 exporter works again
-disable repeat on image loader by default
-can change shape offset en tileset, texture offset was broken
Diffstat (limited to 'servers/physics_2d/collision_solver_2d_sat.h')
| -rw-r--r-- | servers/physics_2d/collision_solver_2d_sat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics_2d/collision_solver_2d_sat.h b/servers/physics_2d/collision_solver_2d_sat.h index dc6767d651..95468a18b8 100644 --- a/servers/physics_2d/collision_solver_2d_sat.h +++ b/servers/physics_2d/collision_solver_2d_sat.h @@ -32,6 +32,6 @@ #include "collision_solver_2d_sw.h" -bool sat_2d_calculate_penetration(const Shape2DSW *p_shape_A, const Matrix32& p_transform_A, const Matrix32& p_transform_inv_A, const Shape2DSW *p_shape_B, const Matrix32& p_transform_B, const Matrix32& p_transform_inv_B, CollisionSolver2DSW::CallbackResult p_result_callback,void *p_userdata, bool p_swap=false,Vector2 *sep_axis=NULL); +bool sat_2d_calculate_penetration(const Shape2DSW *p_shape_A, const Matrix32& p_transform_A, const Vector2& p_motion_A,const Shape2DSW *p_shape_B, const Matrix32& p_transform_B,const Vector2& p_motion_B, CollisionSolver2DSW::CallbackResult p_result_callback,void *p_userdata, bool p_swap=false,Vector2 *sep_axis=NULL); #endif // COLLISION_SOLVER_2D_SAT_H |