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

Unit tests now test FilePager.

Browse Source
This commit is contained in:
Daviw Williams 2013-06-28 16:16:08 +02:00
parent 839f366174
commit e38aa3b1b9
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h
View File

@ -86,6 +86,11 @@ namespace PolyVox
typedef DensityU8 Density8; //Backwards compatibility typedef DensityU8 Density8; //Backwards compatibility
typedef DensityU16 Density16; //Backwards compatibility typedef DensityU16 Density16; //Backwards compatibility
////////////////////////////////////////////////////////////////////////////////
// FilePager
////////////////////////////////////////////////////////////////////////////////
template <typename VoxelType> class FilePager;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LargeVolume // LargeVolume
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -112,6 +117,11 @@ namespace PolyVox
typedef MaterialDensityPair<uint8_t, 4, 4> MaterialDensityPair44; typedef MaterialDensityPair<uint8_t, 4, 4> MaterialDensityPair44;
typedef MaterialDensityPair<uint16_t, 8, 8> MaterialDensityPair88; typedef MaterialDensityPair<uint16_t, 8, 8> MaterialDensityPair88;
////////////////////////////////////////////////////////////////////////////////
// Pager
////////////////////////////////////////////////////////////////////////////////
template <typename VoxelType> class Pager;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// PositionMaterial // PositionMaterial
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

10
tests/testvolume.cpp
View File

@ -23,6 +23,7 @@ freely, subject to the following restrictions:
#include "testvolume.h" #include "testvolume.h"
#include "PolyVoxCore/FilePager.h"
#include "PolyVoxCore/LargeVolume.h" #include "PolyVoxCore/LargeVolume.h"
#include "PolyVoxCore/MinizCompressor.h" #include "PolyVoxCore/MinizCompressor.h"
#include "PolyVoxCore/RawVolume.h" #include "PolyVoxCore/RawVolume.h"
@ -273,15 +274,15 @@ TestVolume::TestVolume()
//m_pCompressor = new RLECompressor<int32_t, uint16_t>; //m_pCompressor = new RLECompressor<int32_t, uint16_t>;
m_pCompressor = new MinizCompressor; m_pCompressor = new MinizCompressor;
m_pFilePager = new FilePager<int32_t>("./");
//Create the volumes //Create the volumes
m_pRawVolume = new RawVolume<int32_t>(region); m_pRawVolume = new RawVolume<int32_t>(region);
m_pSimpleVolume = new SimpleVolume<int32_t>(region); m_pSimpleVolume = new SimpleVolume<int32_t>(region);
m_pLargeVolume = new LargeVolume<int32_t>(region, m_pCompressor, 0, 32); m_pLargeVolume = new LargeVolume<int32_t>(region, m_pCompressor, m_pFilePager, 32);
// LargeVolume currently fails a test if compression is enabled. It m_pLargeVolume->setMaxNumberOfBlocksInMemory(32);
// may be related to accessing the data through more than one sampler? m_pLargeVolume->setMaxNumberOfUncompressedBlocks(16);
//m_pLargeVolume->setCompressionEnabled(false);
//Fill the volume with some data //Fill the volume with some data
for(int z = region.getLowerZ(); z <= region.getUpperZ(); z++) for(int z = region.getLowerZ(); z <= region.getUpperZ(); z++)
@ -305,6 +306,7 @@ TestVolume::~TestVolume()
delete m_pSimpleVolume; delete m_pSimpleVolume;
delete m_pLargeVolume; delete m_pLargeVolume;
delete m_pFilePager;
delete m_pCompressor; delete m_pCompressor;
} }

2
tests/testvolume.h
View File

@ -66,6 +66,8 @@ private slots:
private: private:
PolyVox::Compressor* m_pCompressor; PolyVox::Compressor* m_pCompressor;
PolyVox::FilePager<int32_t>* m_pFilePager;
PolyVox::RawVolume<int32_t>* m_pRawVolume; PolyVox::RawVolume<int32_t>* m_pRawVolume;
PolyVox::SimpleVolume<int32_t>* m_pSimpleVolume; PolyVox::SimpleVolume<int32_t>* m_pSimpleVolume;
PolyVox::LargeVolume<int32_t>* m_pLargeVolume; PolyVox::LargeVolume<int32_t>* m_pLargeVolume;