summaryrefslogtreecommitdiff
path: root/src/mesh.cpp
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-08-18 18:18:25 +0200
committerGitHub <noreply@github.com>2017-08-18 18:18:25 +0200
commitc42753338924bb29c61081c9f269772f89bcd808 (patch)
tree3ccbf49ad802c57a1288ea978268315b68d8e65f /src/mesh.cpp
parentfb196be8cf8606cfab144e2fe62d9c9d1f50932f (diff)
downloadminetest-c42753338924bb29c61081c9f269772f89bcd808.tar.gz
minetest-c42753338924bb29c61081c9f269772f89bcd808.tar.bz2
minetest-c42753338924bb29c61081c9f269772f89bcd808.zip
Modernize various files (src/m*) (#6267)
* Modernize various files (src/m*) * range-based for loops * code style * C++ headers instead of C headers * Default operators * empty function Thanks to clang-tidy
Diffstat (limited to 'src/mesh.cpp')
-rw-r--r--src/mesh.cpp37
1 files changed, 14 insertions, 23 deletions
diff --git a/src/mesh.cpp b/src/mesh.cpp
index 3ab67510a..218e2d0b2 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -453,11 +453,7 @@ scene::IMesh* convertNodeboxesToMesh(const std::vector<aabb3f> &boxes,
video::SColor c(255,255,255,255);
- for (std::vector<aabb3f>::const_iterator
- i = boxes.begin();
- i != boxes.end(); ++i)
- {
- aabb3f box = *i;
+ for (aabb3f box : boxes) {
box.repair();
box.MinEdge.X -= expand;
@@ -614,9 +610,8 @@ class f_lru
public:
f_lru(vcache *v, tcache *t): vc(v), tc(t)
{
- for (u16 i = 0; i < cachesize; i++)
- {
- cache[i] = -1;
+ for (int &i : cache) {
+ i = -1;
}
}
@@ -671,15 +666,14 @@ public:
}
// Update triangle scores
- for (u16 i = 0; i < cachesize; i++)
- {
- if (cache[i] == -1)
+ for (int i : cache) {
+ if (i == -1)
break;
- const u16 trisize = vc[cache[i]].tris.size();
+ const u16 trisize = vc[i].tris.size();
for (u16 t = 0; t < trisize; t++)
{
- tcache *tri = &tc[vc[cache[i]].tris[t]];
+ tcache *tri = &tc[vc[i].tris[t]];
tri->score =
vc[tri->ind[0]].score +
@@ -689,7 +683,7 @@ public:
if (tri->score > hiscore)
{
hiscore = tri->score;
- highest = vc[cache[i]].tris[t];
+ highest = vc[i].tris[t];
}
}
}
@@ -876,9 +870,8 @@ scene::IMesh* createForsythOptimizedMesh(const scene::IMesh *mesh)
tc[highest].drawn = true;
- for (u16 j = 0; j < 3; j++)
- {
- vcache *vert = &vc[tc[highest].ind[j]];
+ for (u16 j : tc[highest].ind) {
+ vcache *vert = &vc[j];
for (u16 t = 0; t < vert->tris.size(); t++)
{
if (highest == vert->tris[t])
@@ -988,9 +981,8 @@ scene::IMesh* createForsythOptimizedMesh(const scene::IMesh *mesh)
tc[highest].drawn = true;
- for (u16 j = 0; j < 3; j++)
- {
- vcache *vert = &vc[tc[highest].ind[j]];
+ for (u16 j : tc[highest].ind) {
+ vcache *vert = &vc[j];
for (u16 t = 0; t < vert->tris.size(); t++)
{
if (highest == vert->tris[t])
@@ -1101,9 +1093,8 @@ scene::IMesh* createForsythOptimizedMesh(const scene::IMesh *mesh)
tc[highest].drawn = true;
- for (u16 j = 0; j < 3; j++)
- {
- vcache *vert = &vc[tc[highest].ind[j]];
+ for (u16 j : tc[highest].ind) {
+ vcache *vert = &vc[j];
for (u16 t = 0; t < vert->tris.size(); t++)
{
if (highest == vert->tris[t])