diff options
author | nerzhul <loic.blot@unix-experience.fr> | 2016-02-11 15:21:21 +0100 |
---|---|---|
committer | est31 <MTest31@outlook.com> | 2016-02-11 16:55:15 +0100 |
commit | fefa148d694364cb4c60fbb4ffdc0f8ae6388df6 (patch) | |
tree | 8755fd0d4ef196c23924ae2909a29681f9f77f05 /src/content_cao.h | |
parent | 24b312cc085b7fae6477c8a47fffb57484b20f6e (diff) | |
download | minetest-fefa148d694364cb4c60fbb4ffdc0f8ae6388df6.tar.gz minetest-fefa148d694364cb4c60fbb4ffdc0f8ae6388df6.tar.bz2 minetest-fefa148d694364cb4c60fbb4ffdc0f8ae6388df6.zip |
v2d & aabbox3d<f32> & sky cleanups
* Sky: rename Box => m_box and inline getBoundingBox
* Uniformize aabbox3d<f32> to aabb3f
Diffstat (limited to 'src/content_cao.h')
-rw-r--r-- | src/content_cao.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/content_cao.h b/src/content_cao.h index abb242aa4..f71dfeb1f 100644 --- a/src/content_cao.h +++ b/src/content_cao.h @@ -65,7 +65,7 @@ private: // scene::ISceneManager *m_smgr; IrrlichtDevice *m_irr; - core::aabbox3d<f32> m_selection_box; + aabb3f m_selection_box; scene::IMeshSceneNode *m_meshnode; scene::IAnimatedMeshSceneNode *m_animated_meshnode; WieldMeshSceneNode *m_wield_meshnode; @@ -127,7 +127,7 @@ public: bool collideWithObjects(); - core::aabbox3d<f32>* getSelectionBox(); + aabb3f *getSelectionBox(); v3f getPosition(); |