diff options
author | Robert Vollmert <rvollmert@gmx.net> | 2009-10-31 20:16:24 +0100 |
---|---|---|
committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-01 21:45:26 +0100 |
commit | b81b08f9aa02afd4a8195bf8d8b846b7de0788cd (patch) | |
tree | ee08c7ec4fdb6a2d572bfa241fb590ac6749e3c8 /crawl-ref/source/ray.cc | |
parent | f6cf2bbe461eb50243c279f5bc4b6efe1ab9c4da (diff) | |
download | crawl-ref-b81b08f9aa02afd4a8195bf8d8b846b7de0788cd.tar.gz crawl-ref-b81b08f9aa02afd4a8195bf8d8b846b7de0788cd.zip |
Add a bunch of ASSERTs to ray.cc.
Diffstat (limited to 'crawl-ref/source/ray.cc')
-rw-r--r-- | crawl-ref/source/ray.cc | 44 |
1 files changed, 43 insertions, 1 deletions
diff --git a/crawl-ref/source/ray.cc b/crawl-ref/source/ray.cc index dff1d3e82a..56fc3058d1 100644 --- a/crawl-ref/source/ray.cc +++ b/crawl-ref/source/ray.cc @@ -15,6 +15,7 @@ #include <cmath> +#include "los.h" #include "ray.h" #include "geom2d.h" @@ -26,6 +27,36 @@ static int ifloor(double d) return static_cast<int>(floor(d)); } +static bool double_is_integral(double d) +{ + return (double_is_zero(d - round(d))); +} + + +// Is v in a diamond? +static bool in_diamond(const geom::vector &v) +{ + int i1 = ifloor(diamonds.ls1.index(v)); + int i2 = ifloor(diamonds.ls2.index(v)); + return ((i1 + i2) % 2 == 0); +} + +// Is v in the interiour of a diamond? +static bool in_diamond_int(const geom::vector &v) +{ + double d1 = diamonds.ls1.index(v); + double d2 = diamonds.ls2.index(v); + return (!double_is_integral(d1) && !double_is_integral(d2)); +} + +// Is v an intersection of grid lines? +static bool is_corner(const geom::vector &v) +{ + double d1 = diamonds.ls1.index(v); + double d2 = diamonds.ls2.index(v); + return (double_is_integral(d1) && double_is_integral(d2)); +} + coord_def ray_def::pos() const { // XXX: pretty arbitrary if we're just on a corner. @@ -37,8 +68,10 @@ coord_def ray_def::pos() const // Return false if we passed or hit a corner. bool ray_def::advance() { + ASSERT(on_corner || in_diamond_int(r.start)); if (on_corner) { + ASSERT (is_corner(r.start)); on_corner = false; r.move_half_cell(diamonds); } @@ -54,13 +87,19 @@ bool ray_def::advance() return (false); } } + // Now inside a non-diamond. + ASSERT(!in_diamond(r.start)); if (r.to_next_cell(diamonds)) + { + ASSERT(in_diamond_int(r.start)); return (true); + } else { // r is now on a corner, going from non-diamond to non-diamond. + ASSERT(is_corner(r.start)); on_corner = true; return (false); } @@ -68,7 +107,10 @@ bool ray_def::advance() void ray_def::bounce(const reflect_grid &rg) { - // XXX + ASSERT(in_diamond(r.start)); + // Find out which side of the diamond r leaves through. + geom::ray copy = r; + r.dir = -r.dir; } |