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

Added TriangleIterator::Unmap() 

Former-commit-id: 8ef858c5374c6701c087d0f4b1644bb6704e1131
This commit is contained in:
Lynix 2013-01-04 16:32:14 +01:00
parent be7afed144
commit 5eac4de406
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Utility/TriangleIterator.hpp
View File

@ -34,6 +34,8 @@ class NAZARA_API NzTriangleIterator
void SetTangent(unsigned int i, const NzVector3f& tangent); void SetTangent(unsigned int i, const NzVector3f& tangent);
void SetTexCoords(unsigned int i, const NzVector2f& texCoords); void SetTexCoords(unsigned int i, const NzVector2f& texCoords);
void Unmap();
private: private:
nzPrimitiveType m_primitiveType; nzPrimitiveType m_primitiveType;
nzUInt32 m_triangleIndices[3]; nzUInt32 m_triangleIndices[3];

11
src/Nazara/Utility/TriangleIterator.cpp
View File

@ -29,9 +29,7 @@ bool NzTriangleIterator::Advance()
{ {
if (m_currentIndex >= m_indexCount) if (m_currentIndex >= m_indexCount)
{ {
///FIXME: Que faire si Advance() est appelé deux fois Unmap();
m_indexMapper.Unmap();
m_vertexMapper.Unmap();
return false; return false;
} }
@ -164,3 +162,10 @@ void NzTriangleIterator::SetTexCoords(unsigned int i, const NzVector2f& texCoord
m_vertexMapper.SetTexCoords(m_triangleIndices[i], texCoords); m_vertexMapper.SetTexCoords(m_triangleIndices[i], texCoords);
} }
void NzTriangleIterator::Unmap()
{
// Peut très bien être appellé plusieurs fois de suite, seul le premier appel sera pris en compte
m_indexMapper.Unmap();
m_vertexMapper.Unmap();
}

3
src/Nazara/Utility/VertexMapper.cpp
View File

@ -326,6 +326,9 @@ void NzVertexMapper::SetTexCoords(unsigned int i, const NzVector2f& texCoords)
void NzVertexMapper::Unmap() void NzVertexMapper::Unmap()
{ {
if (m_impl)
{
delete m_impl; delete m_impl;
m_impl = nullptr; m_impl = nullptr;
}
} }