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

Reworked TriangleIterator 

Will now output vertex indices instead of vertex data (making it way
more useful)


Former-commit-id: c82d61ca0ac3f2908d57e167dade74af42282b06
This commit is contained in:
Lynix 2014-07-08 11:22:32 +02:00
parent 70e1327071
commit 5c2ae93d0b
2 changed files with 20 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,31 +8,21 @@
#define NAZARA_TRIANGLEITERATOR_HPP #define NAZARA_TRIANGLEITERATOR_HPP
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Math/Vector2.hpp>
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Utility/Enums.hpp> #include <Nazara/Utility/Enums.hpp>
#include <Nazara/Utility/IndexMapper.hpp> #include <Nazara/Utility/IndexMapper.hpp>
#include <Nazara/Utility/VertexMapper.hpp>
class NzSubMesh; class NzSubMesh;
class NAZARA_API NzTriangleIterator class NAZARA_API NzTriangleIterator
{ {
public: public:
NzTriangleIterator(NzSubMesh* subMesh, nzBufferAccess access = nzBufferAccess_ReadWrite); NzTriangleIterator(nzPrimitiveMode primitiveMode, const NzIndexBuffer* indexBuffer);
NzTriangleIterator(NzSubMesh* subMesh);
~NzTriangleIterator() = default; ~NzTriangleIterator() = default;
bool Advance(); bool Advance();
NzVector3f GetNormal(unsigned int i) const; nzUInt32 operator[](unsigned int i) const;
NzVector3f GetPosition(unsigned int i) const;
NzVector3f GetTangent(unsigned int i) const;
NzVector2f GetTexCoord(unsigned int i) const;
void SetNormal(unsigned int i, const NzVector3f& normal);
void SetPosition(unsigned int i, const NzVector3f& position);
void SetTangent(unsigned int i, const NzVector3f& tangent);
void SetTexCoord(unsigned int i, const NzVector2f& texCoords);
void Unmap(); void Unmap();
@ -40,7 +30,6 @@ class NAZARA_API NzTriangleIterator
nzPrimitiveMode m_primitiveMode; nzPrimitiveMode m_primitiveMode;
nzUInt32 m_triangleIndices[3]; nzUInt32 m_triangleIndices[3];
NzIndexMapper m_indexMapper; NzIndexMapper m_indexMapper;
NzVertexMapper m_vertexMapper;
unsigned int m_currentIndex; unsigned int m_currentIndex;
unsigned int m_indexCount; unsigned int m_indexCount;
}; };

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

@ -6,23 +6,21 @@
#include <Nazara/Utility/SubMesh.hpp> #include <Nazara/Utility/SubMesh.hpp>
#include <Nazara/Utility/Debug.hpp> #include <Nazara/Utility/Debug.hpp>
NzTriangleIterator::NzTriangleIterator(NzSubMesh* subMesh, nzBufferAccess access) : NzTriangleIterator::NzTriangleIterator(nzPrimitiveMode primitiveMode, const NzIndexBuffer* indexBuffer) :
m_primitiveMode(subMesh->GetPrimitiveMode()), m_primitiveMode(primitiveMode),
m_indexMapper(subMesh->GetIndexBuffer(), nzBufferAccess_ReadOnly), m_indexMapper(indexBuffer, nzBufferAccess_ReadOnly)
m_vertexMapper(subMesh)
{ {
NazaraUnused(access);
m_currentIndex = 3; m_currentIndex = 3;
m_triangleIndices[0] = m_indexMapper.Get(0); m_triangleIndices[0] = m_indexMapper.Get(0);
m_triangleIndices[1] = m_indexMapper.Get(1); m_triangleIndices[1] = m_indexMapper.Get(1);
m_triangleIndices[2] = m_indexMapper.Get(2); m_triangleIndices[2] = m_indexMapper.Get(2);
const NzIndexBuffer* indexBuffer = m_indexMapper.GetBuffer(); m_indexCount = indexBuffer->GetIndexCount();
if (indexBuffer) }
m_indexCount = indexBuffer->GetIndexCount();
else NzTriangleIterator::NzTriangleIterator(NzSubMesh* subMesh) :
m_indexCount = subMesh->GetVertexCount(); NzTriangleIterator(subMesh->GetPrimitiveMode(), subMesh->GetIndexBuffer())
{
} }
bool NzTriangleIterator::Advance() bool NzTriangleIterator::Advance()
@ -59,113 +57,24 @@ bool NzTriangleIterator::Advance()
return true; return true;
} }
NzVector3f NzTriangleIterator::GetNormal(unsigned int i) const nzUInt32 NzTriangleIterator::operator[](unsigned int i) const
{ {
#if NAZARA_UTILITY_SAFE #if NAZARA_UTILITY_SAFE
if (i > 2) if (i >= 3)
{ {
NazaraError("Index out of range: (" + NzString::Number(i) + " > 2)"); NzStringStream ss;
return NzVector3f(); ss << "Index out of range: (" << i << " >= 3)";
NazaraError(ss);
throw std::domain_error(ss.ToString());
} }
#endif #endif
return m_vertexMapper.GetNormal(m_triangleIndices[i]); return m_triangleIndices[i];
}
NzVector3f NzTriangleIterator::GetPosition(unsigned int i) const
{
#if NAZARA_UTILITY_SAFE
if (i > 2)
{
NazaraError("Index out of range: (" + NzString::Number(i) + " > 2)");
return NzVector3f();
}
#endif
return m_vertexMapper.GetPosition(m_triangleIndices[i]);
}
NzVector3f NzTriangleIterator::GetTangent(unsigned int i) const
{
#if NAZARA_UTILITY_SAFE
if (i > 2)
{
NazaraError("Index out of range: (" + NzString::Number(i) + " > 2)");
return NzVector3f();
}
#endif
return m_vertexMapper.GetTangent(m_triangleIndices[i]);
}
NzVector2f NzTriangleIterator::GetTexCoord(unsigned int i) const
{
#if NAZARA_UTILITY_SAFE
if (i > 2)
{
NazaraError("Index out of range: (" + NzString::Number(i) + " > 2)");
return NzVector2f();
}
#endif
return m_vertexMapper.GetTexCoord(m_triangleIndices[i]);
}
void NzTriangleIterator::SetNormal(unsigned int i, const NzVector3f& normal)
{
#if NAZARA_UTILITY_SAFE
if (i > 2)
{
NazaraError("Index out of range: (" + NzString::Number(i) + " > 2)");
return;
}
#endif
m_vertexMapper.SetNormal(m_triangleIndices[i], normal);
}
void NzTriangleIterator::SetPosition(unsigned int i, const NzVector3f& position)
{
#if NAZARA_UTILITY_SAFE
if (i > 2)
{
NazaraError("Index out of range: (" + NzString::Number(i) + " > 2)");
return;
}
#endif
m_vertexMapper.SetPosition(m_triangleIndices[i], position);
}
void NzTriangleIterator::SetTangent(unsigned int i, const NzVector3f& tangent)
{
#if NAZARA_UTILITY_SAFE
if (i > 2)
{
NazaraError("Index out of range: (" + NzString::Number(i) + " > 2)");
return;
}
#endif
m_vertexMapper.SetTangent(m_triangleIndices[i], tangent);
}
void NzTriangleIterator::SetTexCoord(unsigned int i, const NzVector2f& texCoords)
{
#if NAZARA_UTILITY_SAFE
if (i > 2)
{
NazaraError("Index out of range: (" + NzString::Number(i) + " > 2)");
return;
}
#endif
m_vertexMapper.SetTexCoord(m_triangleIndices[i], texCoords);
} }
void NzTriangleIterator::Unmap() void NzTriangleIterator::Unmap()
{ {
// Peut très bien être appellé plusieurs fois de suite, seul le premier appel sera pris en compte // Peut très bien être appellé plusieurs fois de suite, seul le premier appel sera pris en compte
m_indexMapper.Unmap(); m_indexMapper.Unmap();
m_vertexMapper.Unmap();
} }