denes
/
graph
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

getting rid of some warnings

Browse Source
master
dmatetelki 10 years ago
parent 41390ded4b
commit d81550a1b7
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File

22
lib/qtgraph/marching_squares.cpp
Unescape View File

@ -39,12 +39,7 @@ namespace {
constexpr int2 (int _x, int _y) : x(_x), y(_y) {} constexpr int2 (int _x, int _y) : x(_x), y(_y) {}
int2 (const int2& o) : x(o.x), y(o.y) {} int2 (const int2& o) : x(o.x), y(o.y) {}
void operator+=(const int2 o) { x += o.x; y += o.y; } void operator+=(const int2 o) { x += o.x; y += o.y; }
// void stepX() { ++x; }
// void stepY() { ++y; }
}; };
int2 operator+(const int2& a, const int2& b) { return int2(a.x+b.x, a.y+b.y); }
float2 operator+(const float2& f, const int2& i) { return float2(f.x+i.x, f.y+i.y); }
} }
MarchingSquares::MarchingSquares() MarchingSquares::MarchingSquares()
@ -70,6 +65,7 @@ void MarchingSquares::ReadImage(const std::string& filename)
else if (row[x] >= 240) c = FREE; // white else if (row[x] >= 240) c = FREE; // white
else c = DESTROYABLE; // everything else else c = DESTROYABLE; // everything else
/// @todo extend image?
// mark borders as SOLID, such that the entities in the world cannot fall off // mark borders as SOLID, such that the entities in the world cannot fall off
if (x == 0 || x == width_ - 1 || y == 0 || y == height_ - 1) if (x == 0 || x == width_ - 1 || y == 0 || y == height_ - 1)
c = SOLID; c = SOLID;
@ -112,8 +108,8 @@ MarchingSquares::RunMarchingSquares() {
std::vector< std::pair<float2, float2> > lines; std::vector< std::pair<float2, float2> > lines;
int2 point(1, 1); int2 point(1, 1);
for (point.y = 1 ;point.y < height_; ++point.y) { for (point.y = 1 ;point.y < (int)height_; ++point.y) {
for (point.x = 1; point.x < width_; ++point.x) { for (point.x = 1; point.x < (int)width_; ++point.x) {
const int mask = getMaskAt(point.x, point.y); const int mask = getMaskAt(point.x, point.y);
@ -131,10 +127,10 @@ MarchingSquares::RunMarchingSquares() {
continue; continue;
// vertical/horizontal lines start with an edge // vertical/horizontal lines start with an edge
assert(mask != 3); // assert(mask != 3);
assert(mask != 12); // assert(mask != 12);
assert(mask != 5); // assert(mask != 5);
assert(mask != 10); // assert(mask != 10);
// cannot reach nonvisited bottomright corner // cannot reach nonvisited bottomright corner
/// @note you can. the last is not visited /// @note you can. the last is not visited
@ -185,7 +181,7 @@ void MarchingSquares::visitPoint(int x, int y, int mask, std::vector< bool >& vi
while (true) { while (true) {
i += int2(1, 0); i += int2(1, 0);
int next_mask = getMaskAt(i.x, i.y); int next_mask = getMaskAt(i.x, i.y);
if (i.x < width_ && i.y < height_ && if (i.x < (int)width_ && i.y < (int)height_ &&
( (horizontal_top && next_mask == 0x3) || ( (horizontal_top && next_mask == 0x3) ||
(horizontal_bottom && next_mask == 0xc) || (horizontal_bottom && next_mask == 0xc) ||
(vertical_left && next_mask == 0x5) || (vertical_left && next_mask == 0x5) ||
@ -203,7 +199,7 @@ void MarchingSquares::visitPoint(int x, int y, int mask, std::vector< bool >& vi
while (true) { while (true) {
i += int2(0, 1); i += int2(0, 1);
int next_mask = getMaskAt(i.x, i.y); int next_mask = getMaskAt(i.x, i.y);
if (i.x < width_ && i.y < height_ && if (i.x < (int)width_ && i.y < (int)height_ &&
( (horizontal_top && next_mask == 0x3) || ( (horizontal_top && next_mask == 0x3) ||
(horizontal_bottom && next_mask == 0xc) || (horizontal_bottom && next_mask == 0xc) ||
(vertical_left && next_mask == 0x5) || (vertical_left && next_mask == 0x5) ||

Write Preview
Loading…
Cancel
Save