oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-02 16:38:41 +00:00
Code Wiki Activity

Modernize various files

Browse source 
* range-based for loops
* emplace_back instead of push_back
* code style
* C++ headers instead of C headers
* Default operators
* empty stl function
This commit is contained in:
Loic Blot 2017-08-18 07:44:42 +02:00
parent 13e995b811
commit 55ab4264dc
No known key found for this signature in database
GPG key ID: EFAA458E8C153987
12 changed files with 100 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/face_position_cache.cpp
View file

@ -40,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.push_back(v3s16(0,0,0));
c.emplace_back(0,0,0);
return c;
}
if (d == 1) {
// This is an optimized sequence of coordinates.
c.push_back(v3s16( 0, 1, 0)); // Top
c.push_back(v3s16( 0, 0, 1)); // Back
c.push_back(v3s16(-1, 0, 0)); // Left
c.push_back(v3s16( 1, 0, 0)); // Right
c.push_back(v3s16( 0, 0,-1)); // Front
c.push_back(v3s16( 0,-1, 0)); // Bottom
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
// 6
c.push_back(v3s16(-1, 0, 1)); // Back left
c.push_back(v3s16( 1, 0, 1)); // Back right
c.push_back(v3s16(-1, 0,-1)); // Front left
c.push_back(v3s16( 1, 0,-1)); // Front right
c.push_back(v3s16(-1,-1, 0)); // Bottom left
c.push_back(v3s16( 1,-1, 0)); // Bottom right
c.push_back(v3s16( 0,-1, 1)); // Bottom back
c.push_back(v3s16( 0,-1,-1)); // Bottom front
c.push_back(v3s16(-1, 1, 0)); // Top left
c.push_back(v3s16( 1, 1, 0)); // Top right
c.push_back(v3s16( 0, 1, 1)); // Top back
c.push_back(v3s16( 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.push_back(v3s16(-1, 1, 1)); // Top back-left
c.push_back(v3s16( 1, 1, 1)); // Top back-right
c.push_back(v3s16(-1, 1,-1)); // Top front-left
c.push_back(v3s16( 1, 1,-1)); // Top front-right
c.push_back(v3s16(-1,-1, 1)); // Bottom back-left
c.push_back(v3s16( 1,-1, 1)); // Bottom back-right
c.push_back(v3s16(-1,-1,-1)); // Bottom front-left
c.push_back(v3s16( 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;
}
@ -81,20 +81,20 @@ const std::vector<v3s16> &FacePositionCache::generateFacePosition(u16 d)
for (s16 y = 0; y <= d - 1; y++) {
// Left and right side, including borders
for (s16 z =- d; z <= d; z++) {
c.push_back(v3s16( d, y, z));
c.push_back(v3s16(-d, y, z));
c.emplace_back(d, y, z);
c.emplace_back(-d, y, z);
if (y != 0) {
c.push_back(v3s16( d, -y, z));
c.push_back(v3s16(-d, -y, z));
c.emplace_back(d, -y, z);
c.emplace_back(-d, -y, z);
}
}
// Back and front side, excluding borders
for (s16 x = -d + 1; x <= d - 1; x++) {
c.push_back(v3s16(x, y, d));
c.push_back(v3s16(x, y, -d));
c.emplace_back(x, y, d);
c.emplace_back(x, y, -d);
if (y != 0) {
c.push_back(v3s16(x, -y, d));
c.push_back(v3s16(x, -y, -d));
c.emplace_back(x, -y, d);
c.emplace_back(x, -y, -d);
}
}
}
@ -103,8 +103,8 @@ const std::vector<v3s16> &FacePositionCache::generateFacePosition(u16 d)
// -d < x < d, y = +-d, -d < z < d
for (s16 x = -d; x <= d; x++)
for (s16 z = -d; z <= d; z++) {
c.push_back(v3s16(x, -d, z));
c.push_back(v3s16(x, d, z));
c.emplace_back(x, -d, z);
c.emplace_back(x, d, z);
}
return c;
}