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

Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine

Browse Source 
Former-commit-id: f8a87ba041804b41dbc35db1fb2f99ec51702b8e [formerly 0adbfb8a3baf6330953b0247f4ad5a72af051633]
Former-commit-id: 54fbeafa8fb8034f945086ea06a20c34fb2bfb4d
This commit is contained in:
Lynix
2016-06-09 08:49:14 +02:00
parent f80dc7cf45 d08ac3fed1
commit c2d0ebd15e
161 changed files with 7841 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Nazara/Utility/AlgorithmUtility.cpp
View File

@@ -333,21 +333,20 @@ namespace Nz
}
private:
float CalculateVertexScore(unsigned int vertex) const
float CalculateVertexScore(VertexCacheData& vertex) const
{
const VertexCacheData* v = &m_vertices[vertex];
if (v->remaining_valence <= 0)
if (vertex.remaining_valence <= 0)
// No tri needs this vertex!
return -1.0f;
float ret = 0.0f;
if (v->position_in_cache < 0)
if (vertex.position_in_cache < 0)
{
// Vertex is not in FIFO cache - no score.
}
else
{
if (v->position_in_cache < 3)
if (vertex.position_in_cache < 3)
{
// This vertex was used in the last triangle,
// so it has a fixed score, whichever of the three
@@ -360,14 +359,14 @@ namespace Nz
{
// Points for being high in the cache.
const float Scaler = 1.0f / (32 - 3);
ret = 1.0f - (v->position_in_cache - 3) * Scaler;
ret = 1.0f - (vertex.position_in_cache - 3) * Scaler;
ret = std::pow(ret, m_cacheDecayPower);
}
}
// Bonus points for having a low number of tris still to
// use the vert, so we get rid of lone verts quickly.
float valence_boost = std::pow(static_cast<float>(v->remaining_valence), -m_valenceBoostPower);
float valence_boost = std::pow(static_cast<float>(vertex.remaining_valence), -m_valenceBoostPower);
ret += m_valenceBoostScale * valence_boost;
return ret;
@@ -378,8 +377,8 @@ namespace Nz
int FullScoreRecalculation()
{
// calculate score for all vertices
for (unsigned int i = 0; i < m_vertices.size(); ++i)
m_vertices[i].current_score = CalculateVertexScore(i);
for (VertexCacheData& vertex : m_vertices)
vertex.current_score = CalculateVertexScore(vertex);
// calculate scores for all active triangles
float max_score = std::numeric_limits<float>::lowest();
@@ -548,13 +547,13 @@ namespace Nz
float sum = 0.f;
for (unsigned int i = 0; i < 3; ++i)
{
VertexCacheData* v = &m_vertices[t->verts[i]];
float sc = v->current_score;
if (!v->calculated)
sc = CalculateVertexScore(t->verts[i]);
VertexCacheData& v = m_vertices[t->verts[i]];
float sc = v.current_score;
if (!v.calculated)
sc = CalculateVertexScore(v);
v->current_score = sc;
v->calculated = true;
v.current_score = sc;
v.calculated = true;
sum += sc;
}

2
src/Nazara/Utility/Animation.cpp
View File

@@ -37,6 +37,8 @@ namespace Nz
Animation::~Animation()
{
OnAnimationRelease(this);
Destroy();
}
bool Animation::AddSequence(const Sequence& sequence)

6
src/Nazara/Utility/Formats/MD5AnimParser.cpp
View File

@@ -285,7 +285,8 @@ namespace Nz
if (!Advance())
return false;
if (std::sscanf(&m_currentLine[0], "( %f %f %f ) ( %f %f %f )", &m_joints[i].bindPos.x, &m_joints[i].bindPos.y, &m_joints[i].bindPos.z,
// Space is important for the buffer of \n
if (std::sscanf(&m_currentLine[0], " ( %f %f %f ) ( %f %f %f )", &m_joints[i].bindPos.x, &m_joints[i].bindPos.y, &m_joints[i].bindPos.z,
&m_joints[i].bindOrient.x, &m_joints[i].bindOrient.y, &m_joints[i].bindOrient.z) != 6)
{
UnrecognizedLine(true);
@@ -324,7 +325,8 @@ namespace Nz
return false;
Vector3f min, max;
if (std::sscanf(&m_currentLine[0], "( %f %f %f ) ( %f %f %f )", &min.x, &min.y, &min.z, &max.x, &max.y, &max.z) != 6)
// Space is important for the buffer of \n
if (std::sscanf(&m_currentLine[0], " ( %f %f %f ) ( %f %f %f )", &min.x, &min.y, &min.z, &max.x, &max.y, &max.z) != 6)
{
UnrecognizedLine(true);
return false;