diff options
author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2020-11-04 16:57:41 +0100 |
---|---|---|
committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2020-11-04 16:57:41 +0100 |
commit | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (patch) | |
tree | 7f1eaf8b94694c8e24e206909ba8f55a1ebfbb3e /src/face_position_cache.cpp | |
parent | 244713971a976e43e8740b6a9d9d122e37020ef2 (diff) | |
download | dragonfireclient-6ccb5835ff55d85156be91473c598eca9d6cb9a6.tar.xz |
Revert "Make Lint Happy"
This reverts commit ad148587dcf5244c2d2011dba339786c765c54c4.
Diffstat (limited to 'src/face_position_cache.cpp')
-rw-r--r-- | src/face_position_cache.cpp | 63 |
1 files changed, 32 insertions, 31 deletions
diff --git a/src/face_position_cache.cpp b/src/face_position_cache.cpp index 8b222aa29..7a8f235fa 100644 --- a/src/face_position_cache.cpp +++ b/src/face_position_cache.cpp @@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "face_position_cache.h" #include "threading/mutex_auto_lock.h" + std::unordered_map<u16, std::vector<v3s16>> FacePositionCache::cache; std::mutex FacePositionCache::cache_mutex; @@ -39,39 +40,39 @@ const std::vector<v3s16> &FacePositionCache::generateFacePosition(u16 d) cache[d] = std::vector<v3s16>(); std::vector<v3s16> &c = cache[d]; if (d == 0) { - c.emplace_back(0, 0, 0); + c.emplace_back(0,0,0); return c; } if (d == 1) { // This is an optimized sequence of coordinates. - c.emplace_back(0, 1, 0); // Top - c.emplace_back(0, 0, 1); // Back + c.emplace_back(0, 1, 0); // Top + c.emplace_back(0, 0, 1); // Back c.emplace_back(-1, 0, 0); // Left - c.emplace_back(1, 0, 0); // Right - c.emplace_back(0, 0, -1); // Front - c.emplace_back(0, -1, 0); // Bottom + c.emplace_back(1, 0, 0); // Right + c.emplace_back(0, 0,-1); // Front + c.emplace_back(0,-1, 0); // Bottom // 6 - c.emplace_back(-1, 0, 1); // Back left - c.emplace_back(1, 0, 1); // Back right - c.emplace_back(-1, 0, -1); // Front left - c.emplace_back(1, 0, -1); // Front right - c.emplace_back(-1, -1, 0); // Bottom left - c.emplace_back(1, -1, 0); // Bottom right - c.emplace_back(0, -1, 1); // Bottom back - c.emplace_back(0, -1, -1); // Bottom front - c.emplace_back(-1, 1, 0); // Top left - c.emplace_back(1, 1, 0); // Top right - c.emplace_back(0, 1, 1); // Top back - c.emplace_back(0, 1, -1); // Top front + c.emplace_back(-1, 0, 1); // Back left + c.emplace_back(1, 0, 1); // Back right + c.emplace_back(-1, 0,-1); // Front left + c.emplace_back(1, 0,-1); // Front right + c.emplace_back(-1,-1, 0); // Bottom left + c.emplace_back(1,-1, 0); // Bottom right + c.emplace_back(0,-1, 1); // Bottom back + c.emplace_back(0,-1,-1); // Bottom front + c.emplace_back(-1, 1, 0); // Top left + c.emplace_back(1, 1, 0); // Top right + c.emplace_back(0, 1, 1); // Top back + c.emplace_back(0, 1,-1); // Top front // 18 - c.emplace_back(-1, 1, 1); // Top back-left - c.emplace_back(1, 1, 1); // Top back-right - c.emplace_back(-1, 1, -1); // Top front-left - c.emplace_back(1, 1, -1); // Top front-right - c.emplace_back(-1, -1, 1); // Bottom back-left - c.emplace_back(1, -1, 1); // Bottom back-right - c.emplace_back(-1, -1, -1); // Bottom front-left - c.emplace_back(1, -1, -1); // Bottom front-right + c.emplace_back(-1, 1, 1); // Top back-left + c.emplace_back(1, 1, 1); // Top back-right + c.emplace_back(-1, 1,-1); // Top front-left + c.emplace_back(1, 1,-1); // Top front-right + c.emplace_back(-1,-1, 1); // Bottom back-left + c.emplace_back(1,-1, 1); // Bottom back-right + c.emplace_back(-1,-1,-1); // Bottom front-left + c.emplace_back(1,-1,-1); // Bottom front-right // 26 return c; } @@ -79,7 +80,7 @@ const std::vector<v3s16> &FacePositionCache::generateFacePosition(u16 d) // Take blocks in all sides, starting from y=0 and going +-y for (s16 y = 0; y <= d - 1; y++) { // Left and right side, including borders - for (s16 z = -d; z <= d; z++) { + for (s16 z =- d; z <= d; z++) { c.emplace_back(d, y, z); c.emplace_back(-d, y, z); if (y != 0) { @@ -101,9 +102,9 @@ const std::vector<v3s16> &FacePositionCache::generateFacePosition(u16 d) // Take the bottom and top face with borders // -d < x < d, y = +-d, -d < z < d for (s16 x = -d; x <= d; x++) - for (s16 z = -d; z <= d; z++) { - c.emplace_back(x, -d, z); - c.emplace_back(x, d, z); - } + for (s16 z = -d; z <= d; z++) { + c.emplace_back(x, -d, z); + c.emplace_back(x, d, z); + } return c; } |