AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed incorrect array indexing.

Browse Source
This commit is contained in:
David Williams 2014-08-25 23:07:29 +02:00
parent 09e68d923e
commit 25860122b0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/PolyVoxCore/include/PolyVoxCore/Array.h
View File

@ -95,7 +95,7 @@ namespace PolyVox
{ {
static_assert(noOfDims == 3, "This accessor can only be used with a three-dimensional array"); static_assert(noOfDims == 3, "This accessor can only be used with a three-dimensional array");
POLYVOX_ASSERT(x < m_uDimensions[0] && y < m_uDimensions[1] && z < m_uDimensions[2], "Array access is out-of-range."); POLYVOX_ASSERT(x < m_uDimensions[0] && y < m_uDimensions[1] && z < m_uDimensions[2], "Array access is out-of-range.");
return m_pElements[z * m_uDimensions[1] * m_uDimensions[1] + y * m_uDimensions[0] + x]; return m_pElements[z * m_uDimensions[0] * m_uDimensions[1] + y * m_uDimensions[0] + x];
} }
uint32_t getDimension(uint32_t dimension) uint32_t getDimension(uint32_t dimension)

8
tests/TestArray.cpp
View File

@ -31,9 +31,9 @@ using namespace PolyVox;
void TestArray::testCArraySpeed() void TestArray::testCArraySpeed()
{ {
const int width = 32; const int width = 64;
const int height = 32; const int height = 32;
const int depth = 32; const int depth = 16;
int cArray[width][height][depth]; int cArray[width][height][depth];
@ -58,9 +58,9 @@ void TestArray::testCArraySpeed()
void TestArray::testPolyVoxArraySpeed() void TestArray::testPolyVoxArraySpeed()
{ {
const int width = 32; const int width = 64;
const int height = 32; const int height = 32;
const int depth = 32; const int depth = 16;
Array<3, int> polyvoxArray(width, height, depth); Array<3, int> polyvoxArray(width, height, depth);