diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-06-26 15:48:56 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-06-26 15:48:56 +0300 |
| commit | 91cfbe2891a3fbec2aac019ccfba74b667d94fc4 (patch) | |
| tree | 21ab12f020d71dc7c1534e16d2b295bdd322969e /src/collision.h | |
| parent | 3b098fd5dc1a3e05d671b3ec1a9acb20a036b88f (diff) | |
| download | minetest-91cfbe2891a3fbec2aac019ccfba74b667d94fc4.tar.gz minetest-91cfbe2891a3fbec2aac019ccfba74b667d94fc4.tar.bz2 minetest-91cfbe2891a3fbec2aac019ccfba74b667d94fc4.zip | |
reorganized a lot of stuff and modified mapgen and objects slightly while doing it
Diffstat (limited to 'src/collision.h')
| -rw-r--r-- | src/collision.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/collision.h b/src/collision.h index 9c913c6a9..6d167bb7b 100644 --- a/src/collision.h +++ b/src/collision.h @@ -33,10 +33,15 @@ struct collisionMoveResult {} }; +// Moves using a single iteration; speed should not exceed pos_max_d/dtime collisionMoveResult collisionMoveSimple(Map *map, f32 pos_max_d, const core::aabbox3d<f32> &box_0, f32 dtime, v3f &pos_f, v3f &speed_f); -//{return collisionMoveResult();} + +// Moves using as many iterations as needed +collisionMoveResult collisionMovePrecise(Map *map, f32 pos_max_d, + const core::aabbox3d<f32> &box_0, + f32 dtime, v3f &pos_f, v3f &speed_f); enum CollisionType { |