tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Tile::parent() for negative x coords

Browse Source
This commit is contained in:
Konstantin Käfer
2014-03-21 13:17:42 +01:00
parent 4dc6aa9aec
commit a4cda4ce20
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/llmr/map/tile.hpp
View File

@@ -18,7 +18,7 @@ public:
int8_t z = 0;
int32_t x = 0, y = 0;
inline ID(uint8_t z, uint32_t x, uint32_t y)
inline ID(int8_t z, int32_t x, int32_t y)
: z(z), x(x), y(y) {
}
@@ -31,7 +31,7 @@ public:
return z == rhs.z && x == rhs.x && y == rhs.y;
}
ID parent(int32_t z) const;
ID parent(int8_t z) const;
void normalize();
ID normalized() const;
std::forward_list<ID> children(int32_t z) const;

15
src/map/tile.cpp
View File

@@ -8,15 +8,14 @@ Tile::Tile(const ID& id)
: id(id) {
}
Tile::ID Tile::ID::parent(int32_t parent_z) const {
Tile::ID Tile::ID::parent(int8_t parent_z) const {
assert(parent_z < z);
ID pos(z, x, y);
while (pos.z > parent_z) {
--pos.z;
pos.x = floor(pos.x / 2);
pos.y = floor(pos.y / 2);
}
return pos;
int32_t dim = pow(2, z - parent_z);
return Tile::ID{
static_cast<int8_t>(parent_z),
static_cast<int32_t>(floor((float)x / dim)),
static_cast<int32_t>(y / dim)
};
}
std::forward_list<Tile::ID> Tile::ID::children(int32_t child_z) const {