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

Revert "Work on using a bitfield to set up chunk key."

Browse Source 
This reverts commit 8bd8f8ba7a91de21fd56d4350f3bf8403a84c4b3.
This commit is contained in:
David Williams 2015-03-21 14:41:10 +01:00
parent 5fc0317260
commit 672c375a7a
3 changed files with 23 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/PolyVox/Impl/Utility.h
View File

@ -30,14 +30,6 @@ freely, subject to the following restrictions:
namespace PolyVox namespace PolyVox
{ {
// Cast any type to any other type with no safety checks.
// Should only be used if you really know what you are doing!
template<typename to, typename from>
inline to force_cast(from input)
{
return *(reinterpret_cast<to*>(&input));
}
inline bool isPowerOf2(uint32_t uInput) inline bool isPowerOf2(uint32_t uInput)
{ {
if (uInput == 0) if (uInput == 0)

48
include/PolyVox/PagedVolume.h
View File

@ -281,46 +281,26 @@ namespace PolyVox
PagedVolume& operator=(const PagedVolume& rhs); PagedVolume& operator=(const PagedVolume& rhs);
private: private:
struct ChunkKey Chunk* getChunk(int32_t key) const;
uint32_t posToChunkKey(int32_t iXPos, int32_t iYPos, int32_t iZPos) const
{ {
ChunkKey(int32_t x, int32_t y, int32_t z) : iZPos(z), iYPos(y), iXPos(x), iValid(~0) {} // Bit-shifting of signed integer values has various issues with undefined or implementation-defined behaviour.
int32_t iZPos : 10; // Therefore we cast to unsigned to avoid these (we only care about the bit pattern anyway, not the actual value).
int32_t iYPos : 10; // See http://stackoverflow.com/a/4009922 for more details.
int32_t iXPos : 10; const uint32_t uXPos = static_cast<uint32_t>(iXPos);
const uint32_t uYPos = static_cast<uint32_t>(iYPos);
const uint32_t uZPos = static_cast<uint32_t>(iZPos);
// Should only be true when the last access chunk pointer is valid, const uint32_t xKey = ((uXPos >> m_uChunkSideLengthPower) & 0x3FF) << 20;
// so we don't need to have a seperate check for that before using it. const uint32_t yKey = ((uYPos >> m_uChunkSideLengthPower) & 0x3FF) << 10;
int32_t iValid : 2; const uint32_t zKey = ((uZPos >> m_uChunkSideLengthPower) & 0x3FF);
};
static_assert(sizeof(ChunkKey) == sizeof(int32_t), "");
int32_t posToChunkKey(int32_t iXPos, int32_t iYPos, int32_t iZPos) const const uint32_t key = 0x80000000 | xKey | yKey | zKey;
{
iXPos = iXPos >> m_uChunkSideLengthPower;
iYPos = iYPos >> m_uChunkSideLengthPower;
iZPos = iZPos >> m_uChunkSideLengthPower;
ChunkKey chunkKey(iXPos, iYPos, iZPos); return key;
//chunkKey.iValid = ~0;
//chunkKey.iValid = 2;
// In general, bit shifting signed integers is dubious because of potential undefined or implementation defied behaviour.
// However, it seems that in practice most compilers and architectures work in the same way (http://stackoverflow.com/a/6488645).
static_assert((int32_t(-3) / 4) == 0, "fdfs");
static_assert((int32_t(-3) >> 2) == -1, "fdfs");
/*chunkKey.iXPos = iXPos;
chunkKey.iYPos = iYPos;
chunkKey.iZPos = iZPos;*/
// If this kind of casting ever causes problems there are
// other solutions here: http://stackoverflow.com/a/2468738
int32_t iKeyAsInt32 = force_cast<int32_t>(chunkKey);
return iKeyAsInt32;
} }
Chunk* getChunk(int32_t iKeyAsInt32) const;
mutable int32_t m_v3dLastAccessedChunkKey = 0; mutable int32_t m_v3dLastAccessedChunkKey = 0;
mutable Chunk* m_pLastAccessedChunk = nullptr; mutable Chunk* m_pLastAccessedChunk = nullptr;

21
include/PolyVox/PagedVolume.inl
View File

@ -264,7 +264,7 @@ namespace PolyVox
} }
template <typename VoxelType> template <typename VoxelType>
typename PagedVolume<VoxelType>::Chunk* PagedVolume<VoxelType>::getChunk(int32_t iKeyAsInt32) const typename PagedVolume<VoxelType>::Chunk* PagedVolume<VoxelType>::getChunk(int32_t key) 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 // 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 // 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
@ -276,11 +276,11 @@ namespace PolyVox
// //
// A second benefit of only calling this function when really necessary is that we can minimize the number of times we update the // A second benefit of only calling this function when really necessary is that we can minimize the number of times we update the
// timestamp. This reduces the chance of timestamp overflow (particularly if it is only 32-bit). // timestamp. This reduces the chance of timestamp overflow (particularly if it is only 32-bit).
POLYVOX_ASSERT(iKeyAsInt32 != m_v3dLastAccessedChunkKey, "This should have been checked as an optimization before calling getChunk()."); POLYVOX_ASSERT(key != m_v3dLastAccessedChunkKey, "This should have been checked as an optimization before calling getChunk().");
// The chunk was not the same as last time, but we can now hope it is in the set of most recently used chunks. // The chunk was not the same as last time, but we can now hope it is in the set of most recently used chunks.
Chunk* pChunk = nullptr; Chunk* pChunk = nullptr;
auto itChunk = m_mapChunks.find(iKeyAsInt32); auto itChunk = m_mapChunks.find(key);
// Check whether the chunk was found. // Check whether the chunk was found.
if ((itChunk) != m_mapChunks.end()) if ((itChunk) != m_mapChunks.end())
@ -293,17 +293,14 @@ namespace PolyVox
// If we still haven't found the chunk then it's time to create a new one and page it in from disk. // If we still haven't found the chunk then it's time to create a new one and page it in from disk.
if (!pChunk) if (!pChunk)
{ {
/*const int32_t uChunkX = (key >> 20) & 0x3FF; const int32_t uChunkX = (key >> 20) & 0x3FF;
const int32_t uChunkY = (key >> 10) & 0x3FF; const int32_t uChunkY = (key >> 10) & 0x3FF;
const int32_t uChunkZ = (key ) & 0x3FF;*/ const int32_t uChunkZ = (key ) & 0x3FF;
// The chunk was not found so we will create a new one. // The chunk was not found so we will create a new one.
/*ChunkKeyConverter converter; Vector3DInt32 v3dChunkPos(uChunkX, uChunkY, uChunkZ);
converter.i = key;*/
ChunkKey realKey = force_cast<ChunkKey>(iKeyAsInt32);
Vector3DInt32 v3dChunkPos(realKey.iXPos, realKey.iYPos, realKey.iZPos);
pChunk = new PagedVolume<VoxelType>::Chunk(v3dChunkPos, m_uChunkSideLength, m_pPager); pChunk = new PagedVolume<VoxelType>::Chunk(v3dChunkPos, m_uChunkSideLength, m_pPager);
pChunk->m_uChunkLastAccessed = ++m_uTimestamper; // Important, as we may soon delete the oldest chunk pChunk->m_uChunkLastAccessed = ++m_uTimestamper; // Important, as we may soon delete the oldest chunk
m_mapChunks.insert(std::make_pair(iKeyAsInt32, std::unique_ptr<Chunk>(pChunk))); m_mapChunks.insert(std::make_pair(key, std::unique_ptr<Chunk>(pChunk)));
// As we are loading a new chunk we should try to ensure we don't go over our target memory usage. // As we are loading a new chunk we should try to ensure we don't go over our target memory usage.
while (m_mapChunks.size() > m_uChunkCountLimit) while (m_mapChunks.size() > m_uChunkCountLimit)
@ -328,7 +325,7 @@ namespace PolyVox
/*m_v3dLastAccessedChunkX = uChunkX; /*m_v3dLastAccessedChunkX = uChunkX;
m_v3dLastAccessedChunkY = uChunkY; m_v3dLastAccessedChunkY = uChunkY;
m_v3dLastAccessedChunkZ = uChunkZ;*/ m_v3dLastAccessedChunkZ = uChunkZ;*/
m_v3dLastAccessedChunkKey = iKeyAsInt32; m_v3dLastAccessedChunkKey = key;
return pChunk; return pChunk;
} }