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

Decided to always use a 64-bit chunk key, rather than trying to make it configurable.

Browse Source
This commit is contained in:
David Williams
2015-03-20 23:09:38 +01:00
parent 6419c5827b
commit 69f6f4ac37
3 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/PolyVox/PagedVolume.inl
View File

@ -115,7 +115,7 @@ namespace PolyVox
template <typename VoxelType>
VoxelType PagedVolume<VoxelType>::getVoxel(int32_t uXPos, int32_t uYPos, int32_t uZPos) const
{
const PagedVolumeChunkKeyIntType key = posToChunkKey(uXPos, uYPos, uZPos);
const int64_t 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 <typename VoxelType>
void PagedVolume<VoxelType>::setVoxel(int32_t uXPos, int32_t uYPos, int32_t uZPos, VoxelType tValue)
{
const PagedVolumeChunkKeyIntType key = posToChunkKey(uXPos, uYPos, uZPos);
const int64_t 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 PagedVolumeChunkKeyIntType key = posToChunkKey(x, y, z);
const int64_t 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 PagedVolumeChunkKeyIntType key = posToChunkKey(x, y, z);
const int64_t key = posToChunkKey(x, y, z);
m_mapChunks.erase(key);
}
}
@ -264,7 +264,7 @@ namespace PolyVox
}
template <typename VoxelType>
typename PagedVolume<VoxelType>::Chunk* PagedVolume<VoxelType>::getChunk(PagedVolumeChunkKeyIntType iKeyAsInt32) const
typename PagedVolume<VoxelType>::Chunk* PagedVolume<VoxelType>::getChunk(int64_t 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