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
This commit is contained in:
Jérôme Leclercq
2017-10-20 16:36:45 +02:00
parent a982215ab7 995dfddafa
commit 2951b7811e
5 changed files with 241 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ namespace Nz
* If the declaration has a Vector3f Normals component enabled, Normals are generated.
* If the declaration has a Vector3f Tangents component enabled, Tangents are generated.
*/
VertexDeclaration* vertexDeclaration = VertexDeclaration::Get(VertexLayout_XYZ_Normal_UV_Tangent);
VertexDeclarationConstRef vertexDeclaration = VertexDeclaration::Get(VertexLayout_XYZ_Normal_UV_Tangent);
bool IsValid() const;
};

9
include/Nazara/Utility/VertexMapper.inl
View File

@@ -21,17 +21,10 @@ namespace Nz
std::size_t offset;
declaration->GetComponent(component, &enabled, &type, &offset);
if (enabled)
{
NazaraAssert(GetComponentTypeOf<T>() == type, "Attribute type does not match template type");
if (enabled && GetComponentTypeOf<T>() == type)
return SparsePtr<T>(static_cast<UInt8*>(m_mapper.GetPointer()) + offset, declaration->GetStride());
}
else
{
NazaraError("Attribute 0x" + String::Number(component, 16) + " is not enabled");
return SparsePtr<T>();
}
}
inline const VertexBuffer* VertexMapper::GetVertexBuffer() const