From 6d8c33b996eb8cf7886f4689647afd84730dc4ca Mon Sep 17 00:00:00 2001 From: samcake Date: Wed, 27 Jan 2016 18:59:45 -0800 Subject: [PATCH] Merging with upstream and still debugging the cell navigation math --- libraries/render/src/render/Octree.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/render/src/render/Octree.h b/libraries/render/src/render/Octree.h index f8afae3898..e78a876bcd 100644 --- a/libraries/render/src/render/Octree.h +++ b/libraries/render/src/render/Octree.h @@ -108,7 +108,7 @@ namespace render { // Eval the octant of this cell relative to its parent Octant octant() const { return Octant((pos.x & 1) | (pos.y & 1) | (pos.z & 1)); } - Coord3 octantAxes(Link octant) const { Coord3((Coord)bool(octant & XAxis), (Coord)bool(octant & YAxis), (Coord)bool(octant & ZAxis)); } + Coord3 octantAxes(Link octant) const { return Coord3((Coord)bool(octant & XAxis), (Coord)bool(octant & YAxis), (Coord)bool(octant & ZAxis)); } // Get the Parent cell Location of this cell Location parent() const { return Location{ (pos >> Coord3(1)), Depth(depth <= 0 ? 0 : depth - 1) }; }