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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/content_cao.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp index c3247bd17..e7c7a0be5 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -309,7 +309,7 @@ public: void initialize(const std::string &data); - core::aabbox3d<f32>* getSelectionBox() + aabb3f *getSelectionBox() {return &m_selection_box;} v3f getPosition() {return m_position;} @@ -319,7 +319,7 @@ public: bool getCollisionBox(aabb3f *toset) { return false; } private: - core::aabbox3d<f32> m_selection_box; + aabb3f m_selection_box; scene::IMeshSceneNode *m_node; v3f m_position; std::string m_itemstring; @@ -674,7 +674,7 @@ GenericCAO::~GenericCAO() removeFromScene(true); } -core::aabbox3d<f32>* GenericCAO::getSelectionBox() +aabb3f *GenericCAO::getSelectionBox() { if(!m_prop.is_visible || !m_is_visible || m_is_local_player || getParent() != NULL) return NULL; @@ -1185,7 +1185,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) if(m_prop.physical) { - core::aabbox3d<f32> box = m_prop.collisionbox; + aabb3f box = m_prop.collisionbox; box.MinEdge *= BS; box.MaxEdge *= BS; collisionMoveResult moveresult; |