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

VertexMapper: GetComponentPtr no longer trigger an error/assert

This commit is contained in:
Lynix 2017-10-19 21:01:07 +02:00
parent 302a65a8aa
commit e0bdd35280
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog.md
View File

@ -1,10 +1,7 @@
# Upcoming version: # Upcoming version:
Additions/Changes: Nazara Engine:
- - VertexMapper:GetComponentPtr no longer throw an error if component is disabled or incompatible with template type, instead a null pointer is returned.
Fixes:
-
# 0.4: # 0.4:

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

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