sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test fixes for linux

Browse Source 
Former-commit-id: 9d58eba0f30eb968161b212541f2411263162293
This commit is contained in:
Youri Hubaut
2015-09-19 17:11:31 +02:00
parent a4032abe63
commit 438e45c08e
7 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Nazara/Utility/Algorithm.cpp
View File

@@ -247,18 +247,18 @@ namespace
m_misses = 0;
}
int GetMissCount()
int GetMissCount() const
{
return m_misses;
}
int GetVertex(int which)
int GetVertex(int which) const
{
return m_cache[which];
}
private:
int FindVertex(int v)
int FindVertex(int v) const
{
for (int i = 0; i < 32; ++i)
{
@@ -328,9 +328,9 @@ namespace
}
private:
float CalculateVertexScore(unsigned int vertex)
float CalculateVertexScore(unsigned int vertex) const
{
VertexCacheData *v = &m_vertices[vertex];
const VertexCacheData* v = &m_vertices[vertex];
if (v->remaining_valence <= 0)
// No tri needs this vertex!
return -1.0f;
@@ -545,7 +545,7 @@ namespace
float sum = 0.f;
for (unsigned int i = 0; i < 3; ++i)
{
VertexCacheData *v = &m_vertices[t->verts[i]];
VertexCacheData* v = &m_vertices[t->verts[i]];
float sc = v->current_score;
if (!v->calculated)
sc = CalculateVertexScore(t->verts[i]);
@@ -572,13 +572,13 @@ namespace
if (vert < 0)
continue;
VertexCacheData *v = &m_vertices[vert];
const VertexCacheData* v = &m_vertices[vert];
// iterate through all *active* triangles of this vertex
for (int j=0; j<v->remaining_valence; j++)
for (int j = 0; j < v->remaining_valence; j++)
{
int tri = v->tri_indices[j];
TriangleCacheData *t = &m_triangles[tri];
TriangleCacheData* t = &m_triangles[tri];
if (!t->calculated)
// calculate triangle score
TriangleScoreRecalculation(tri);