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

Moved contents of initialize() into constructor.

Browse Source
This commit is contained in:
David Williams
2015-03-05 23:51:16 +01:00
parent c804190d84
commit 2c0d9cb9e7
2 changed files with 12 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/PolyVox/PagedVolume.h
View File

@@ -282,11 +282,7 @@ namespace PolyVox
/// Assignment operator
PagedVolume& operator=(const PagedVolume& rhs);
private:
// FIXME - We can probably ove this into the constructor
void initialise();
private:
std::shared_ptr<Chunk> getChunk(int32_t uChunkX, int32_t uChunkY, int32_t uChunkZ) const;
void purgeNullPtrsFromAllChunks(void) const;
@@ -310,10 +306,10 @@ namespace PolyVox
typedef std::unordered_map<Vector3DInt32, std::shared_ptr< Chunk > > SharedPtrChunkMap;
mutable SharedPtrChunkMap m_pRecentlyUsedChunks;
mutable uint32_t m_uTimestamper;
mutable Vector3DInt32 m_v3dLastAccessedChunkPos;
mutable std::shared_ptr<Chunk> m_pLastAccessedChunk;
uint32_t m_uChunkCountLimit;
mutable uint32_t m_uTimestamper = 0;
mutable Vector3DInt32 m_v3dLastAccessedChunkPos = Vector3DInt32(0, 0, 0); //There are no invalid positions, but initially the m_pLastAccessedChunk pointer will be null
mutable std::shared_ptr<Chunk> m_pLastAccessedChunk = nullptr;
uint32_t m_uChunkCountLimit = 0;
// The size of the volume
//Region m_regValidRegionInChunks;