Merged in RLE branch.
This commit is contained in:
@ -35,8 +35,7 @@ void TestArray::testReadWrite()
|
||||
int height = 10;
|
||||
int depth = 20;
|
||||
|
||||
uint32_t dimensions[3] = {width, height, depth}; // Array dimensions
|
||||
Array<3, int> myArray(dimensions);
|
||||
Array<3, int> myArray(ArraySizes(width)(height)(depth));
|
||||
|
||||
int ct = 1;
|
||||
int expectedTotal = 0;
|
||||
|
@ -31,23 +31,21 @@ using namespace PolyVox;
|
||||
|
||||
void TestVolume::testSize()
|
||||
{
|
||||
const uint16_t g_uVolumeSideLength = 128;
|
||||
Volume<uint8_t> volData(g_uVolumeSideLength, g_uVolumeSideLength, g_uVolumeSideLength);
|
||||
const int32_t g_uVolumeSideLength = 128;
|
||||
Volume<uint8_t> volData(Region(Vector3DInt32(0,0,0), Vector3DInt32(g_uVolumeSideLength-1, g_uVolumeSideLength-1, g_uVolumeSideLength-1)));
|
||||
|
||||
//Note: Deliberatly go past each edge by one to test if the bounds checking works.
|
||||
for (uint16_t z = 0; z < g_uVolumeSideLength + 1; z++)
|
||||
for (int32_t z = 0; z < g_uVolumeSideLength + 1; z++)
|
||||
{
|
||||
for (uint16_t y = 0; y < g_uVolumeSideLength + 1; y++)
|
||||
for (int32_t y = 0; y < g_uVolumeSideLength + 1; y++)
|
||||
{
|
||||
for (uint16_t x = 0; x < g_uVolumeSideLength + 1; x++)
|
||||
for (int32_t x = 0; x < g_uVolumeSideLength + 1; x++)
|
||||
{
|
||||
volData.setVoxelAt(x,y,z,255);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
volData.tidyUpMemory(0);
|
||||
|
||||
QCOMPARE(volData.getWidth(), g_uVolumeSideLength);
|
||||
QCOMPARE(volData.getHeight(), g_uVolumeSideLength);
|
||||
QCOMPARE(volData.getDepth(), g_uVolumeSideLength);
|
||||
|
Reference in New Issue
Block a user