summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authornerzhul <loic.blot@unix-experience.fr>2016-02-11 15:21:21 +0100
committerest31 <MTest31@outlook.com>2016-02-11 16:55:15 +0100
commitfefa148d694364cb4c60fbb4ffdc0f8ae6388df6 (patch)
tree8755fd0d4ef196c23924ae2909a29681f9f77f05 /src/util
parent24b312cc085b7fae6477c8a47fffb57484b20f6e (diff)
downloadminetest-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/util')
-rw-r--r--src/util/numeric.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util/numeric.h b/src/util/numeric.h
index e742ab24a..615327864 100644
--- a/src/util/numeric.h
+++ b/src/util/numeric.h
@@ -310,9 +310,9 @@ inline v3f intToFloat(v3s16 p, f32 d)
}
// Random helper. Usually d=BS
-inline core::aabbox3d<f32> getNodeBox(v3s16 p, float d)
+inline aabb3f getNodeBox(v3s16 p, float d)
{
- return core::aabbox3d<f32>(
+ return aabb3f(
(float)p.X * d - 0.5*d,
(float)p.Y * d - 0.5*d,
(float)p.Z * d - 0.5*d,