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

VertexDeclaration: Add check for duplicates

This commit is contained in:
Lynix 2020-03-08 18:10:23 +01:00
parent 28cf4ed6e3
commit 4cf24cde7d
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Utility/VertexDeclaration.inl
View File

@ -10,7 +10,7 @@
namespace Nz namespace Nz
{ {
inline auto Nz::VertexDeclaration::FindComponent(VertexComponent vertexComponent, std::size_t componentIndex) const -> const Component* inline auto VertexDeclaration::FindComponent(VertexComponent vertexComponent, std::size_t componentIndex) const -> const Component*
{ {
assert(componentIndex == 0 || vertexComponent == VertexComponent_Userdata); assert(componentIndex == 0 || vertexComponent == VertexComponent_Userdata);

17
src/Nazara/Utility/VertexDeclaration.cpp
View File

@ -17,20 +17,31 @@ namespace Nz
VertexDeclaration::VertexDeclaration(VertexInputRate inputRate, std::initializer_list<ComponentEntry> components) : VertexDeclaration::VertexDeclaration(VertexInputRate inputRate, std::initializer_list<ComponentEntry> components) :
m_inputRate(inputRate) m_inputRate(inputRate)
{ {
ErrorFlags errFlags(ErrorFlag_ThrowException);
std::size_t offset = 0; std::size_t offset = 0;
m_components.reserve(components.size()); m_components.reserve(components.size());
for (const ComponentEntry& entry : components) for (const ComponentEntry& entry : components)
{ {
NazaraAssert(IsTypeSupported(entry.type), "Component type 0x" + String::Number(entry.type, 16) + " is not supported by vertex declarations");
NazaraAssert(entry.componentIndex == 0 || entry.component == VertexComponent_Userdata, "Only userdata components can have non-zero component indexes");
if (entry.component != VertexComponent_Unused)
{
// Check for duplicates
for (const Component& component : m_components)
{
if (component.component == entry.component && component.componentIndex == entry.componentIndex)
NazaraError("Duplicate component type found");
}
}
auto& component = m_components.emplace_back(); auto& component = m_components.emplace_back();
component.component = entry.component; component.component = entry.component;
component.componentIndex = entry.componentIndex; component.componentIndex = entry.componentIndex;
component.offset = offset; component.offset = offset;
component.type = entry.type; component.type = entry.type;
NazaraAssert(IsTypeSupported(component.type), "Component type 0x" + String::Number(component.type, 16) + " is not supported by vertex declarations");
NazaraAssert(component.componentIndex == 0 || component.component == VertexComponent_Userdata, "Only userdata components can have non-zero component indexes");
offset += Utility::ComponentStride[component.type]; offset += Utility::ComponentStride[component.type];
} }