More work on SimpleVolume.

This commit is contained in:
David Williams
2011-04-30 12:34:13 +01:00
parent 0e27b2fb50
commit 87d97436ea
2 changed files with 26 additions and 37 deletions

View File

@ -28,10 +28,7 @@ freely, subject to the following restrictions:
#include "PolyVoxForwardDeclarations.h"
#include <limits>
#include <map>
#include <set>
#include <memory>
#include <vector>
namespace PolyVox
{
@ -186,8 +183,6 @@ private:
Block* getUncompressedBlock(int32_t uBlockX, int32_t uBlockY, int32_t uBlockZ) const;
//The block data
//mutable std::map<Vector3DInt32, Block > m_pBlocks;
Block* m_pBlocks;
//We don't store an actual Block for the border, just the uncompressed data. This is partly because the border
@ -200,6 +195,12 @@ private:
Region m_regValidRegion;
Region m_regValidRegionInBlocks;
//Volume size measured in blocks.
uint32_t m_uNoOfBlocksInVolume;
uint16_t m_uWidthInBlocks;
uint16_t m_uHeightInBlocks;
uint16_t m_uDepthInBlocks;
//The size of the blocks
uint16_t m_uBlockSideLength;
uint8_t m_uBlockSideLengthPower;