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/broad_phase_2d_hash_grid.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/broad_phase_2d_hash_grid.h')
| -rw-r--r-- | servers/physics_2d/broad_phase_2d_hash_grid.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/servers/physics_2d/broad_phase_2d_hash_grid.h b/servers/physics_2d/broad_phase_2d_hash_grid.h index 713d960487..d530b35d5d 100644 --- a/servers/physics_2d/broad_phase_2d_hash_grid.h +++ b/servers/physics_2d/broad_phase_2d_hash_grid.h @@ -94,7 +94,8 @@ class BroadPhase2DHashGrid : public BroadPhase2DSW { void _enter_grid(Element* p_elem, const Rect2& p_rect,bool p_static); void _exit_grid(Element* p_elem, const Rect2& p_rect,bool p_static); - _FORCE_INLINE_ void _cull(const Point2i p_cell,CollisionObject2DSW** p_results,int p_max_results,int *p_result_indices,int &index); + template<bool use_aabb,bool use_segment> + _FORCE_INLINE_ void _cull(const Point2i p_cell,const Rect2& p_aabb,const Point2& p_from, const Point2& p_to,CollisionObject2DSW** p_results,int p_max_results,int *p_result_indices,int &index); struct PosKey { |