From f434266a88568975059f51443bfd7125baeb3838 Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 13 May 2013 12:53:56 +0200 Subject: [PATCH] Fixed IndexMapper with constant sequential buffer Former-commit-id: 195d03c1db72edfdfa4d407f7c1adb983bd266c6 --- src/Nazara/Utility/IndexMapper.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/Nazara/Utility/IndexMapper.cpp b/src/Nazara/Utility/IndexMapper.cpp index 66b9e7986..402810d55 100644 --- a/src/Nazara/Utility/IndexMapper.cpp +++ b/src/Nazara/Utility/IndexMapper.cpp @@ -78,26 +78,20 @@ NzIndexMapper::NzIndexMapper(NzIndexBuffer* indexBuffer, nzBufferAccess access) } NzIndexMapper::NzIndexMapper(const NzIndexBuffer* indexBuffer, nzBufferAccess access) : -m_mapper(indexBuffer, access) +m_setter(SetterError) { if (indexBuffer && !indexBuffer->IsSequential()) { + if (!m_mapper.Map(indexBuffer, access)) + NazaraError("Failed to map buffer"); ///TODO: Unexcepted + if (indexBuffer->HasLargeIndices()) - { m_getter = Getter32; - m_setter = SetterError; - } else - { m_getter = Getter16; - m_setter = SetterError; - } } else - { m_getter = GetterSequential; - m_setter = SetterError; - } } NzIndexMapper::NzIndexMapper(const NzSubMesh* subMesh) :