Merging with upstream and still debugging the cell navigation math

This commit is contained in:
samcake 2016-01-27 18:59:45 -08:00
parent 20e1270e92
commit 6d8c33b996

View file

@ -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) }; }