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

Revert "Replaced Vector3D with integer as key to map."

Browse Source 
This reverts commit e82d6beca1.
This commit is contained in:
David Williams
2015-03-21 14:41:15 +01:00
parent 672c375a7a
commit d477bec540
5 changed files with 57 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
include/PolyVox/PagedVolume.h
View File

@@ -281,30 +281,18 @@ namespace PolyVox
PagedVolume& operator=(const PagedVolume& rhs); PagedVolume& operator=(const PagedVolume& rhs);
private: private:
Chunk* getChunk(int32_t key) const; Chunk* getChunk(int32_t uChunkX, int32_t uChunkY, int32_t uChunkZ) const;
uint32_t posToChunkKey(int32_t iXPos, int32_t iYPos, int32_t iZPos) const // Storing these properties individually has proved to be faster than keeping
{ // them in a Vector3DInt32 as it avoids constructions and comparison overheads.
// Bit-shifting of signed integer values has various issues with undefined or implementation-defined behaviour. // They are also at the start of the class in the hope that they will be pulled
// Therefore we cast to unsigned to avoid these (we only care about the bit pattern anyway, not the actual value). // into cache - I've got no idea if this actually makes a difference.
// See http://stackoverflow.com/a/4009922 for more details. mutable int32_t m_v3dLastAccessedChunkX = 0;
const uint32_t uXPos = static_cast<uint32_t>(iXPos); mutable int32_t m_v3dLastAccessedChunkY = 0;
const uint32_t uYPos = static_cast<uint32_t>(iYPos); mutable int32_t m_v3dLastAccessedChunkZ = 0;
const uint32_t uZPos = static_cast<uint32_t>(iZPos);
const uint32_t xKey = ((uXPos >> m_uChunkSideLengthPower) & 0x3FF) << 20;
const uint32_t yKey = ((uYPos >> m_uChunkSideLengthPower) & 0x3FF) << 10;
const uint32_t zKey = ((uZPos >> m_uChunkSideLengthPower) & 0x3FF);
const uint32_t key = 0x80000000 | xKey | yKey | zKey;
return key;
}
mutable int32_t m_v3dLastAccessedChunkKey = 0;
mutable Chunk* m_pLastAccessedChunk = nullptr; mutable Chunk* m_pLastAccessedChunk = nullptr;
mutable std::unordered_map<uint32_t, std::unique_ptr< Chunk > > m_mapChunks; mutable std::unordered_map<Vector3DInt32, std::unique_ptr< Chunk > > m_mapChunks;
mutable uint32_t m_uTimestamper = 0; mutable uint32_t m_uTimestamper = 0;
@@ -322,15 +310,6 @@ namespace PolyVox
}; };
} }
/*#define POS_TO_CHUNK_KEY(x, y, z, uChunkSideLengthPower) \
{ \
const int32_t chunkX = ((x >> uChunkSideLengthPower) & 0x3FF) << 20; \
const int32_t chunkY = ((y >> uChunkSideLengthPower) & 0x3FF) << 10; \
const int32_t chunkZ = ((z >> uChunkSideLengthPower) & 0x3FF); \
const int32_t key = (-2147483648) | chunkX | chunkY | chunkZ; \
}*/
#include "PolyVox/PagedVolume.inl" #include "PolyVox/PagedVolume.inl"
#include "PolyVox/PagedVolumeChunk.inl" #include "PolyVox/PagedVolumeChunk.inl"
#include "PolyVox/PagedVolumeSampler.inl" #include "PolyVox/PagedVolumeSampler.inl"

76
include/PolyVox/PagedVolume.inl
View File

@@ -115,15 +115,15 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
VoxelType PagedVolume<VoxelType>::getVoxel(int32_t uXPos, int32_t uYPos, int32_t uZPos) const VoxelType PagedVolume<VoxelType>::getVoxel(int32_t uXPos, int32_t uYPos, int32_t uZPos) const
{ {
const int32_t key = posToChunkKey(uXPos, uYPos, uZPos); const int32_t chunkX = uXPos >> m_uChunkSideLengthPower;
const int32_t chunkY = uYPos >> m_uChunkSideLengthPower;
// Only call get chunk if we can't reuse the chunk pointer from the last voxel access. const int32_t chunkZ = uZPos >> m_uChunkSideLengthPower;
auto pChunk = (key == m_v3dLastAccessedChunkKey) ? m_pLastAccessedChunk : getChunk(key);
const uint16_t xOffset = static_cast<uint16_t>(uXPos & m_iChunkMask); const uint16_t xOffset = static_cast<uint16_t>(uXPos & m_iChunkMask);
const uint16_t yOffset = static_cast<uint16_t>(uYPos & m_iChunkMask); const uint16_t yOffset = static_cast<uint16_t>(uYPos & m_iChunkMask);
const uint16_t zOffset = static_cast<uint16_t>(uZPos & m_iChunkMask); const uint16_t zOffset = static_cast<uint16_t>(uZPos & m_iChunkMask);
auto pChunk = getChunk(chunkX, chunkY, chunkZ);
return pChunk->getVoxel(xOffset, yOffset, zOffset); return pChunk->getVoxel(xOffset, yOffset, zOffset);
} }
@@ -147,15 +147,15 @@ namespace PolyVox
template <typename VoxelType> template <typename VoxelType>
void PagedVolume<VoxelType>::setVoxel(int32_t uXPos, int32_t uYPos, int32_t uZPos, VoxelType tValue) void PagedVolume<VoxelType>::setVoxel(int32_t uXPos, int32_t uYPos, int32_t uZPos, VoxelType tValue)
{ {
const int32_t key = posToChunkKey(uXPos, uYPos, uZPos); const int32_t chunkX = uXPos >> m_uChunkSideLengthPower;
const int32_t chunkY = uYPos >> m_uChunkSideLengthPower;
const int32_t chunkZ = uZPos >> m_uChunkSideLengthPower;
// Only call get chunk if we can't reuse the chunk pointer from the last voxel access. const uint16_t xOffset = static_cast<uint16_t>(uXPos - (chunkX << m_uChunkSideLengthPower));
auto pChunk = (key == m_v3dLastAccessedChunkKey) ? m_pLastAccessedChunk : getChunk(key); const uint16_t yOffset = static_cast<uint16_t>(uYPos - (chunkY << m_uChunkSideLengthPower));
const uint16_t zOffset = static_cast<uint16_t>(uZPos - (chunkZ << m_uChunkSideLengthPower));
const uint16_t xOffset = static_cast<uint16_t>(uXPos & m_iChunkMask);
const uint16_t yOffset = static_cast<uint16_t>(uYPos & m_iChunkMask);
const uint16_t zOffset = static_cast<uint16_t>(uZPos & m_iChunkMask);
auto pChunk = getChunk(chunkX, chunkY, chunkZ);
pChunk->setVoxel(xOffset, yOffset, zOffset, tValue); pChunk->setVoxel(xOffset, yOffset, zOffset, tValue);
} }
@@ -201,12 +201,8 @@ namespace PolyVox
for(int32_t y = v3dStart.getY(); y <= v3dEnd.getY(); y++) for(int32_t y = v3dStart.getY(); y <= v3dEnd.getY(); y++)
{ {
for(int32_t z = v3dStart.getZ(); z <= v3dEnd.getZ(); z++) for(int32_t z = v3dStart.getZ(); z <= v3dEnd.getZ(); z++)
{ {
const int32_t key = posToChunkKey(x, y, z); getChunk(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.
getChunk(key);
} }
} }
} }
@@ -220,7 +216,6 @@ namespace PolyVox
{ {
// Clear this pointer as all chunks are about to be removed. // Clear this pointer as all chunks are about to be removed.
m_pLastAccessedChunk = nullptr; m_pLastAccessedChunk = nullptr;
m_v3dLastAccessedChunkKey = 0;
// Erase all the most recently used chunks. // Erase all the most recently used chunks.
m_mapChunks.clear(); m_mapChunks.clear();
@@ -234,7 +229,6 @@ namespace PolyVox
{ {
// Clear this pointer in case the chunk it points at is flushed. // Clear this pointer in case the chunk it points at is flushed.
m_pLastAccessedChunk = nullptr; m_pLastAccessedChunk = nullptr;
m_v3dLastAccessedChunkKey = 0;
// Convert the start and end positions into chunk space coordinates // Convert the start and end positions into chunk space coordinates
Vector3DInt32 v3dStart; Vector3DInt32 v3dStart;
@@ -256,31 +250,32 @@ namespace PolyVox
{ {
for(int32_t z = v3dStart.getZ(); z <= v3dEnd.getZ(); z++) for(int32_t z = v3dStart.getZ(); z <= v3dEnd.getZ(); z++)
{ {
const int32_t key = posToChunkKey(x, y, z); m_mapChunks.erase(Vector3DInt32(x, y, z));
m_mapChunks.erase(key);
} }
} }
} }
} }
template <typename VoxelType> template <typename VoxelType>
typename PagedVolume<VoxelType>::Chunk* PagedVolume<VoxelType>::getChunk(int32_t key) const typename PagedVolume<VoxelType>::Chunk* PagedVolume<VoxelType>::getChunk(int32_t uChunkX, int32_t uChunkY, int32_t uChunkZ) 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 //Check if we have the same chunk as last time, if so there's no need to even update
// 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 //the time stamp. If we updated it everytime then that would be every time we touched
// is). We could (and previously did) include a simple check for this in this function. However, this function would then usually return //a voxel, which would overflow a uint32_t and require us to use a uint64_t instead.
// immediatly (which was good) but we still paid the overhead of a function call, probably because this function is not inlined due to //This check should also provide a significant speed boost as usually it is true.
// being quite large. Therefore we decided the check against the previous accessed chunk should always be done *before* calling this if ((uChunkX == m_v3dLastAccessedChunkX) &&
// function, and we add an assert here to try and catch if the user forgets to do it. Note that this is an internal function so the (uChunkY == m_v3dLastAccessedChunkY) &&
// 'user' here is actually PolyVox developers and not the developers of applications using PolyVox. (uChunkZ == m_v3dLastAccessedChunkZ) &&
// (m_pLastAccessedChunk != 0))
// 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). return m_pLastAccessedChunk;
POLYVOX_ASSERT(key != m_v3dLastAccessedChunkKey, "This should have been checked as an optimization before calling getChunk()."); }
Vector3DInt32 v3dChunkPos(uChunkX, uChunkY, uChunkZ);
// 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(key); auto itChunk = m_mapChunks.find(v3dChunkPos);
// Check whether the chunk was found. // Check whether the chunk was found.
if ((itChunk) != m_mapChunks.end()) if ((itChunk) != m_mapChunks.end())
@@ -293,14 +288,10 @@ 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 uChunkY = (key >> 10) & 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.
Vector3DInt32 v3dChunkPos(uChunkX, uChunkY, uChunkZ);
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(key, std::unique_ptr<Chunk>(pChunk))); m_mapChunks.insert(std::make_pair(v3dChunkPos, 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)
@@ -322,10 +313,9 @@ namespace PolyVox
m_pLastAccessedChunk = pChunk; m_pLastAccessedChunk = pChunk;
//m_v3dLastAccessedChunkPos = v3dChunkPos; //m_v3dLastAccessedChunkPos = v3dChunkPos;
/*m_v3dLastAccessedChunkX = uChunkX; m_v3dLastAccessedChunkX = uChunkX;
m_v3dLastAccessedChunkY = uChunkY; m_v3dLastAccessedChunkY = uChunkY;
m_v3dLastAccessedChunkZ = uChunkZ;*/ m_v3dLastAccessedChunkZ = uChunkZ;
m_v3dLastAccessedChunkKey = key;
return pChunk; return pChunk;
} }

20
include/PolyVox/PagedVolumeSampler.inl
View File

@@ -97,18 +97,20 @@ namespace PolyVox
// Base version updates position and validity flags. // Base version updates position and validity flags.
BaseVolume<VoxelType>::template Sampler< PagedVolume<VoxelType> >::setPosition(xPos, yPos, zPos); BaseVolume<VoxelType>::template Sampler< PagedVolume<VoxelType> >::setPosition(xPos, yPos, zPos);
const int32_t key = this->mVolume->posToChunkKey(xPos, yPos, zPos); // Then we update the voxel pointer
const int32_t uXChunk = this->mXPosInVolume >> this->mVolume->m_uChunkSideLengthPower;
const int32_t uYChunk = this->mYPosInVolume >> this->mVolume->m_uChunkSideLengthPower;
const int32_t uZChunk = this->mZPosInVolume >> this->mVolume->m_uChunkSideLengthPower;
// Then we update the voxel pointer. const uint16_t uXPosInChunk = static_cast<uint16_t>(this->mXPosInVolume - (uXChunk << this->mVolume->m_uChunkSideLengthPower));
auto pCurrentChunk = (key == this->mVolume->m_v3dLastAccessedChunkKey) ? this->mVolume->m_pLastAccessedChunk : this->mVolume->getChunk(key); const uint16_t uYPosInChunk = static_cast<uint16_t>(this->mYPosInVolume - (uYChunk << this->mVolume->m_uChunkSideLengthPower));
const uint16_t uZPosInChunk = static_cast<uint16_t>(this->mZPosInVolume - (uZChunk << this->mVolume->m_uChunkSideLengthPower));
const uint16_t xOffset = static_cast<uint16_t>(xPos & this->mVolume->m_iChunkMask); const uint32_t uVoxelIndexInChunk = uXPosInChunk +
const uint16_t yOffset = static_cast<uint16_t>(yPos & this->mVolume->m_iChunkMask); uYPosInChunk * this->mVolume->m_uChunkSideLength +
const uint16_t zOffset = static_cast<uint16_t>(zPos & this->mVolume->m_iChunkMask); uZPosInChunk * this->mVolume->m_uChunkSideLength * this->mVolume->m_uChunkSideLength;
const uint32_t uVoxelIndexInChunk = xOffset + auto pCurrentChunk = this->mVolume->getChunk(uXChunk, uYChunk, uZChunk);
yOffset * this->mVolume->m_uChunkSideLength +
zOffset * this->mVolume->m_uChunkSideLength * this->mVolume->m_uChunkSideLength;
mCurrentVoxel = pCurrentChunk->m_tData + uVoxelIndexInChunk; mCurrentVoxel = pCurrentChunk->m_tData + uVoxelIndexInChunk;
} }

4
tests/testvolume.cpp
View File

@@ -278,7 +278,7 @@ TestVolume::~TestVolume()
* RawVolume Tests * RawVolume Tests
*/ */
/*void TestVolume::testRawVolumeDirectAccessAllInternalForwards() void TestVolume::testRawVolumeDirectAccessAllInternalForwards()
{ {
int32_t result = 0; int32_t result = 0;
@@ -364,7 +364,7 @@ void TestVolume::testRawVolumeSamplersWithExternalBackwards()
result = testSamplersWithWrappingBackwards(m_pRawVolume, m_regExternal); result = testSamplersWithWrappingBackwards(m_pRawVolume, m_regExternal);
} }
QCOMPARE(result, static_cast<int32_t>(-993539594)); QCOMPARE(result, static_cast<int32_t>(-993539594));
}*/ }
/* /*
* PagedVolume Tests * PagedVolume Tests

4
tests/testvolume.h
View File

@@ -38,14 +38,14 @@ public:
~TestVolume(); ~TestVolume();
private slots: private slots:
/*void testRawVolumeDirectAccessAllInternalForwards(); void testRawVolumeDirectAccessAllInternalForwards();
void testRawVolumeSamplersAllInternalForwards(); void testRawVolumeSamplersAllInternalForwards();
void testRawVolumeDirectAccessWithExternalForwards(); void testRawVolumeDirectAccessWithExternalForwards();
void testRawVolumeSamplersWithExternalForwards(); void testRawVolumeSamplersWithExternalForwards();
void testRawVolumeDirectAccessAllInternalBackwards(); void testRawVolumeDirectAccessAllInternalBackwards();
void testRawVolumeSamplersAllInternalBackwards(); void testRawVolumeSamplersAllInternalBackwards();
void testRawVolumeDirectAccessWithExternalBackwards(); void testRawVolumeDirectAccessWithExternalBackwards();
void testRawVolumeSamplersWithExternalBackwards();*/ void testRawVolumeSamplersWithExternalBackwards();
void testPagedVolumeDirectAccessAllInternalForwards(); void testPagedVolumeDirectAccessAllInternalForwards();
void testPagedVolumeSamplersAllInternalForwards(); void testPagedVolumeSamplersAllInternalForwards();