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

Made use of IndexMapper 

Former-commit-id: 6496ac4a5a5393363212ee6d452b2ba488aa3354
This commit is contained in:
Lynix 2013-01-03 21:28:54 +01:00
parent 9c76c78c0c
commit f43137dc4e
1 changed files with 15 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp
View File

@ -7,6 +7,7 @@
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Basic.hpp>
#include <Nazara/Utility/BufferMapper.hpp> #include <Nazara/Utility/BufferMapper.hpp>
#include <Nazara/Utility/Config.hpp> #include <Nazara/Utility/Config.hpp>
#include <Nazara/Utility/IndexMapper.hpp>
#include <Nazara/Utility/Mesh.hpp> #include <Nazara/Utility/Mesh.hpp>
#include <Nazara/Utility/SkeletalMesh.hpp> #include <Nazara/Utility/SkeletalMesh.hpp>
#include <Nazara/Utility/Skeleton.hpp> #include <Nazara/Utility/Skeleton.hpp>
@ -189,31 +190,15 @@ bool NzMD5MeshParser::Parse(NzMesh* mesh)
bool largeIndices = (vertexCount > std::numeric_limits<nzUInt16>::max()); bool largeIndices = (vertexCount > std::numeric_limits<nzUInt16>::max());
std::unique_ptr<NzIndexBuffer> indexBuffer(new NzIndexBuffer(indexCount, largeIndices, m_parameters.storage)); std::unique_ptr<NzIndexBuffer> indexBuffer(new NzIndexBuffer(indexCount, largeIndices, m_parameters.storage));
NzBufferMapper<NzIndexBuffer> indexMapper(indexBuffer.get(), nzBufferAccess_DiscardAndWrite); NzIndexMapper indexMapper(indexBuffer.get(), nzBufferAccess_DiscardAndWrite);
if (largeIndices) unsigned int index = 0;
for (const Mesh::Triangle& triangle : md5Mesh.triangles)
{ {
nzUInt32* index = reinterpret_cast<nzUInt32*>(indexMapper.GetPointer()); // On les respécifie dans le bon ordre
indexMapper.Set(index++, triangle.x);
for (const Mesh::Triangle& triangle : md5Mesh.triangles) indexMapper.Set(index++, triangle.z);
{ indexMapper.Set(index++, triangle.y);
// On les respécifie dans le bon ordre
*index++ = triangle.x;
*index++ = triangle.z;
*index++ = triangle.y;
}
}
else
{
nzUInt16* index = reinterpret_cast<nzUInt16*>(indexMapper.GetPointer());
for (const Mesh::Triangle& triangle : md5Mesh.triangles)
{
// On les respécifie dans le bon ordre
*index++ = triangle.x;
*index++ = triangle.z;
*index++ = triangle.y;
}
} }
indexMapper.Unmap(); indexMapper.Unmap();
@ -307,31 +292,15 @@ bool NzMD5MeshParser::Parse(NzMesh* mesh)
bool largeIndices = (vertexCount > std::numeric_limits<nzUInt16>::max()); bool largeIndices = (vertexCount > std::numeric_limits<nzUInt16>::max());
std::unique_ptr<NzIndexBuffer> indexBuffer(new NzIndexBuffer(indexCount, largeIndices, m_parameters.storage)); std::unique_ptr<NzIndexBuffer> indexBuffer(new NzIndexBuffer(indexCount, largeIndices, m_parameters.storage));
NzBufferMapper<NzIndexBuffer> indexMapper(indexBuffer.get(), nzBufferAccess_DiscardAndWrite); NzIndexMapper indexMapper(indexBuffer.get(), nzBufferAccess_DiscardAndWrite);
if (largeIndices) unsigned int index = 0;
for (const Mesh::Triangle& triangle : md5Mesh.triangles)
{ {
nzUInt32* index = reinterpret_cast<nzUInt32*>(indexMapper.GetPointer()); // On les respécifie dans le bon ordre
indexMapper.Set(index++, triangle.x);
for (const Mesh::Triangle& triangle : md5Mesh.triangles) indexMapper.Set(index++, triangle.z);
{ indexMapper.Set(index++, triangle.y);
// On les respécifie dans le bon ordre
*index++ = triangle.x;
*index++ = triangle.z;
*index++ = triangle.y;
}
}
else
{
nzUInt16* index = reinterpret_cast<nzUInt16*>(indexMapper.GetPointer());
for (const Mesh::Triangle& triangle : md5Mesh.triangles)
{
// On les respécifie dans le bon ordre
*index++ = triangle.x;
*index++ = triangle.z;
*index++ = triangle.y;
}
} }
indexMapper.Unmap(); indexMapper.Unmap();