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

Reworked VertexMapper to make it way more generic

Browse Source 
Will work with any attribute and vertex declaration


Former-commit-id: ca99734bd8a9c3e57c99b1cc338f03e79dda55f6
This commit is contained in:
Lynix
2014-07-08 11:21:41 +02:00
parent af1d2d9146
commit 70e1327071
3 changed files with 53 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/Nazara/Utility/VertexMapper.hpp
View File

@@ -8,11 +8,13 @@
#define NAZARA_VERTEXMAPPER_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/SparsePtr.hpp>
#include <Nazara/Math/Vector2.hpp>
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Utility/BufferMapper.hpp>
#include <Nazara/Utility/Enums.hpp>
#include <Nazara/Utility/Mesh.hpp>
#include <Nazara/Utility/VertexDeclaration.hpp>
class NzSubMesh;
@@ -22,23 +24,17 @@ class NAZARA_API NzVertexMapper
NzVertexMapper(NzSubMesh* subMesh);
~NzVertexMapper();
NzVector3f GetNormal(unsigned int i) const;
NzVector3f GetPosition(unsigned int i) const;
NzVector3f GetTangent(unsigned int i) const;
NzVector2f GetTexCoord(unsigned int i) const;
unsigned int GetVertexCount();
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& texCoord);
template<typename T> NzSparsePtr<T> GetAttributePtr(nzAttributeUsage attribute);
unsigned int GetVertexCount() const;
void Unmap();
private:
NzBufferMapper<NzVertexBuffer> m_mapper;
NzMeshVertex* m_vertices;
NzVertexDeclarationConstRef m_declaration;
unsigned int m_vertexCount;
};
#include <Nazara/Utility/VertexMapper.inl>
#endif // NAZARA_VERTEXMAPPER_HPP

27
include/Nazara/Utility/VertexMapper.inl Normal file
View File

@@ -0,0 +1,27 @@
// Copyright (C) 2014 Jérôme Leclercq
// This file is part of the "Nazara Engine - Utility module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Utility/Debug.hpp>
template <typename T>
NzSparsePtr<T> NzVertexMapper::GetAttributePtr(nzAttributeUsage attribute)
{
bool enabled;
nzAttributeType type;
unsigned int offset;
m_declaration->GetAttribute(attribute, &enabled, &type, &offset);
if (enabled)
{
///TODO: Vérifier le rapport entre le type de l'attribut et le type template ?
return NzSparsePtr<T>(static_cast<nzUInt8*>(m_mapper.GetPointer()) + offset, m_declaration->GetStride());
}
else
{
NazaraError("Attribute 0x" + NzString::Number(attribute, 16) + " is not enabled");
return NzSparsePtr<T>();
}
}
#include <Nazara/Utility/DebugOff.hpp>