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/clouds.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/clouds.h')
| -rw-r--r-- | src/clouds.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/clouds.h b/src/clouds.h index 195f48de0..9c6b41786 100644 --- a/src/clouds.h +++ b/src/clouds.h @@ -53,7 +53,7 @@ public: virtual void render(); - virtual const core::aabbox3d<f32>& getBoundingBox() const + virtual const aabb3f &getBoundingBox() const { return m_box; } @@ -79,7 +79,7 @@ public: void updateCameraOffset(v3s16 camera_offset) { m_camera_offset = camera_offset; - m_box = core::aabbox3d<f32>(-BS * 1000000, m_cloud_y - BS - BS * camera_offset.Y, -BS * 1000000, + m_box = aabb3f(-BS * 1000000, m_cloud_y - BS - BS * camera_offset.Y, -BS * 1000000, BS * 1000000, m_cloud_y + BS - BS * camera_offset.Y, BS * 1000000); } @@ -87,7 +87,7 @@ public: private: video::SMaterial m_material; - core::aabbox3d<f32> m_box; + aabb3f m_box; s16 m_passed_cloud_y; float m_cloud_y; u16 m_cloud_radius_i; |