From 6419c5827bc99d91dd5e96acd17bd507a30dc106 Mon Sep 17 00:00:00 2001 From: David Williams Date: Fri, 20 Mar 2015 16:59:25 +0100 Subject: [PATCH] Added typedef for chunk key type. --- include/PolyVox/Impl/Config.h | 4 ++++ include/PolyVox/PagedVolume.h | 18 +++++++++--------- include/PolyVox/PagedVolume.inl | 10 +++++----- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/include/PolyVox/Impl/Config.h b/include/PolyVox/Impl/Config.h index 1959a6d2..388f25d6 100644 --- a/include/PolyVox/Impl/Config.h +++ b/include/PolyVox/Impl/Config.h @@ -24,6 +24,8 @@ freely, subject to the following restrictions: #ifndef __PolyVox_Config_H__ #define __PolyVox_Config_H__ +#include + //#define POLYVOX_LOG_TRACE_ENABLED //#define POLYVOX_LOG_DEBUG_ENABLED #define POLYVOX_LOG_INFO_ENABLED @@ -34,4 +36,6 @@ freely, subject to the following restrictions: //#define POLYVOX_ASSERTS_ENABLED #define POLYVOX_THROW_ENABLED +typedef int32_t PagedVolumeChunkKeyIntType; + #endif diff --git a/include/PolyVox/PagedVolume.h b/include/PolyVox/PagedVolume.h index c53a8426..5477b6d1 100644 --- a/include/PolyVox/PagedVolume.h +++ b/include/PolyVox/PagedVolume.h @@ -284,17 +284,17 @@ namespace PolyVox struct ChunkKey { ChunkKey(int32_t x, int32_t y, int32_t z) : iZPos(z), iYPos(y), iXPos(x), iValid(~0) {} - int32_t iZPos : 10; - int32_t iYPos : 10; - int32_t iXPos : 10; + PagedVolumeChunkKeyIntType iZPos : 10; + PagedVolumeChunkKeyIntType iYPos : 10; + PagedVolumeChunkKeyIntType iXPos : 10; // Should only be true when the last access chunk pointer is valid, // so we don't need to have a seperate check for that before using it. - int32_t iValid : 2; + PagedVolumeChunkKeyIntType iValid : 2; }; - static_assert(sizeof(ChunkKey) == sizeof(int32_t), ""); + static_assert(sizeof(ChunkKey) == sizeof(PagedVolumeChunkKeyIntType), ""); - int32_t posToChunkKey(int32_t iXPos, int32_t iYPos, int32_t iZPos) const + PagedVolumeChunkKeyIntType posToChunkKey(int32_t iXPos, int32_t iYPos, int32_t iZPos) const { iXPos = iXPos >> m_uChunkSideLengthPower; iYPos = iYPos >> m_uChunkSideLengthPower; @@ -314,14 +314,14 @@ namespace PolyVox // If this kind of casting ever causes problems there are // other solutions here: http://stackoverflow.com/a/2468738 - int32_t iKeyAsInt32 = force_cast(chunkKey); + PagedVolumeChunkKeyIntType iKeyAsInt32 = force_cast(chunkKey); return iKeyAsInt32; } - Chunk* getChunk(int32_t iKeyAsInt32) const; + Chunk* getChunk(PagedVolumeChunkKeyIntType iKeyAsInt32) const; - mutable int32_t m_v3dLastAccessedChunkKey = 0; + mutable PagedVolumeChunkKeyIntType m_v3dLastAccessedChunkKey = 0; mutable Chunk* m_pLastAccessedChunk = nullptr; mutable std::unordered_map > m_mapChunks; diff --git a/include/PolyVox/PagedVolume.inl b/include/PolyVox/PagedVolume.inl index 5223e49b..15c831fd 100644 --- a/include/PolyVox/PagedVolume.inl +++ b/include/PolyVox/PagedVolume.inl @@ -115,7 +115,7 @@ namespace PolyVox template VoxelType PagedVolume::getVoxel(int32_t uXPos, int32_t uYPos, int32_t uZPos) const { - const int32_t key = posToChunkKey(uXPos, uYPos, uZPos); + const PagedVolumeChunkKeyIntType key = posToChunkKey(uXPos, uYPos, uZPos); // Only call get chunk if we can't reuse the chunk pointer from the last voxel access. auto pChunk = (key == m_v3dLastAccessedChunkKey) ? m_pLastAccessedChunk : getChunk(key); @@ -147,7 +147,7 @@ namespace PolyVox template void PagedVolume::setVoxel(int32_t uXPos, int32_t uYPos, int32_t uZPos, VoxelType tValue) { - const int32_t key = posToChunkKey(uXPos, uYPos, uZPos); + const PagedVolumeChunkKeyIntType key = posToChunkKey(uXPos, uYPos, uZPos); // Only call get chunk if we can't reuse the chunk pointer from the last voxel access. auto pChunk = (key == m_v3dLastAccessedChunkKey) ? m_pLastAccessedChunk : getChunk(key); @@ -202,7 +202,7 @@ namespace PolyVox { for(int32_t z = v3dStart.getZ(); z <= v3dEnd.getZ(); z++) { - const int32_t key = posToChunkKey(x, y, z); + const PagedVolumeChunkKeyIntType key = posToChunkKey(x, y, z); // Note that we don't check against the last chunk here. We're // not accessing the voxels, we just want to pull them into memory. @@ -256,7 +256,7 @@ namespace PolyVox { for(int32_t z = v3dStart.getZ(); z <= v3dEnd.getZ(); z++) { - const int32_t key = posToChunkKey(x, y, z); + const PagedVolumeChunkKeyIntType key = posToChunkKey(x, y, z); m_mapChunks.erase(key); } } @@ -264,7 +264,7 @@ namespace PolyVox } template - typename PagedVolume::Chunk* PagedVolume::getChunk(int32_t iKeyAsInt32) const + typename PagedVolume::Chunk* PagedVolume::getChunk(PagedVolumeChunkKeyIntType iKeyAsInt32) const { // This function is relatively large and slow because it involves searching for a chunk and creating it if it is not found. A natural // optimization is to only do this work if the chunk we are accessing is not the same as the last chunk we accessed (which it usually