diff --git a/include/PolyVox/AmbientOcclusionCalculator.h b/include/PolyVox/AmbientOcclusionCalculator.h index bdd10de7..2fded9f9 100644 --- a/include/PolyVox/AmbientOcclusionCalculator.h +++ b/include/PolyVox/AmbientOcclusionCalculator.h @@ -33,7 +33,7 @@ freely, subject to the following restrictions: //These two should not be here! #include "PolyVox/Material.h" -#include "PolyVox/RawVolume.h" +#include "PolyVox/PagedVolume.h" #include @@ -45,7 +45,7 @@ namespace PolyVox * Ambient occlusion */ - template + template class AmbientOcclusionCalculatorRaycastCallback { public: @@ -53,9 +53,9 @@ namespace PolyVox { } - bool operator()(const RawVolume::Sampler& sampler) + bool operator()(const typename VolumeType::Sampler& sampler) { - uint8_t sample = sampler.getVoxel(); + auto sample = sampler.getVoxel(); bool func = mIsVoxelTransparentCallback(sample); return func; } @@ -74,7 +74,7 @@ namespace PolyVox /// Calculate the ambient occlusion for the volume template - void calculateAmbientOcclusion(VolumeType* volInput, Array<3, uint8_t>* arrayResult, Region region, float fRayLength, uint8_t uNoOfSamplesPerOutputElement, IsVoxelTransparentCallback isVoxelTransparentCallback); + void calculateAmbientOcclusion(VolumeType* volInput, Array<3, uint8_t>* arrayResult, const Region& region, float fRayLength, uint8_t uNoOfSamplesPerOutputElement, IsVoxelTransparentCallback isVoxelTransparentCallback); } #include "PolyVox/AmbientOcclusionCalculator.inl" diff --git a/include/PolyVox/AmbientOcclusionCalculator.inl b/include/PolyVox/AmbientOcclusionCalculator.inl index be9db40e..04ef6815 100644 --- a/include/PolyVox/AmbientOcclusionCalculator.inl +++ b/include/PolyVox/AmbientOcclusionCalculator.inl @@ -32,18 +32,18 @@ namespace PolyVox * \param isVoxelTransparentCallback A callback which takes a \a VoxelType and returns a \a bool whether the voxel is transparent */ template - void calculateAmbientOcclusion(VolumeType* volInput, Array<3, uint8_t>* arrayResult, Region region, float fRayLength, uint8_t uNoOfSamplesPerOutputElement, IsVoxelTransparentCallback isVoxelTransparentCallback) + void calculateAmbientOcclusion(VolumeType* volInput, Array<3, uint8_t>* arrayResult, const Region& region, float fRayLength, uint8_t uNoOfSamplesPerOutputElement, IsVoxelTransparentCallback isVoxelTransparentCallback) { //Make sure that the size of the volume is an exact multiple of the size of the array. - if(volInput->getWidth() % arrayResult->getDimension(0) != 0) + if (region.getWidthInVoxels() % arrayResult->getDimension(0) != 0) { POLYVOX_THROW(std::invalid_argument, "Volume width must be an exact multiple of array width."); } - if(volInput->getHeight() % arrayResult->getDimension(1) != 0) + if (region.getHeightInVoxels() % arrayResult->getDimension(1) != 0) { POLYVOX_THROW(std::invalid_argument, "Volume width must be an exact multiple of array height."); } - if(volInput->getDepth() % arrayResult->getDimension(2) != 0) + if (region.getDepthInVoxels() % arrayResult->getDimension(2) != 0) { POLYVOX_THROW(std::invalid_argument, "Volume width must be an exact multiple of array depth."); } @@ -61,9 +61,9 @@ namespace PolyVox //nth 'random' value isn't always followed by the n+1th 'random' value. uIndexIncreament = 1; - const int iRatioX = volInput->getWidth() / arrayResult->getDimension(0); - const int iRatioY = volInput->getHeight() / arrayResult->getDimension(1); - const int iRatioZ = volInput->getDepth() / arrayResult->getDimension(2); + const int iRatioX = region.getWidthInVoxels() / arrayResult->getDimension(0); + const int iRatioY = region.getHeightInVoxels() / arrayResult->getDimension(1); + const int iRatioZ = region.getDepthInVoxels() / arrayResult->getDimension(2); const float fRatioX = iRatioX; const float fRatioY = iRatioY; @@ -104,7 +104,7 @@ namespace PolyVox Vector3DFloat v3dRayDirection = randomUnitVectors[(uRandomUnitVectorIndex += (++uIndexIncreament)) % 1021]; //Different prime number. v3dRayDirection *= fRayLength; - AmbientOcclusionCalculatorRaycastCallback ambientOcclusionCalculatorRaycastCallback(isVoxelTransparentCallback); + AmbientOcclusionCalculatorRaycastCallback ambientOcclusionCalculatorRaycastCallback(isVoxelTransparentCallback); RaycastResult result = raycastWithDirection(volInput, v3dRayStart, v3dRayDirection, ambientOcclusionCalculatorRaycastCallback); // Note - The performance of this could actually be improved it we exited as soon diff --git a/include/PolyVox/PagedVolume.inl b/include/PolyVox/PagedVolume.inl index 57bf70c8..3afc3d1e 100644 --- a/include/PolyVox/PagedVolume.inl +++ b/include/PolyVox/PagedVolume.inl @@ -282,6 +282,7 @@ namespace PolyVox // The chunk was found so we can use it. pChunk = itChunk->second.get(); POLYVOX_ASSERT(pChunk, "Recent chunk list shold never contain a null pointer."); + pChunk->m_uChunkLastAccessed = ++m_uTimestamper; } // If we still haven't found the chunk then it's time to create a new one and page it in from disk. diff --git a/tests/TestAmbientOcclusionGenerator.cpp b/tests/TestAmbientOcclusionGenerator.cpp index 683d5c98..9a2fb411 100644 --- a/tests/TestAmbientOcclusionGenerator.cpp +++ b/tests/TestAmbientOcclusionGenerator.cpp @@ -24,6 +24,8 @@ freely, subject to the following restrictions: #include "TestAmbientOcclusionGenerator.h" #include "PolyVox/AmbientOcclusionCalculator.h" +#include "PolyVox/FilePager.h" +#include "PolyVox/PagedVolume.h" #include "PolyVox/RawVolume.h" #include @@ -47,9 +49,14 @@ bool isVoxelTransparentFunction(uint8_t voxel) void TestAmbientOcclusionGenerator::testExecute() { const int32_t g_uVolumeSideLength = 64; + Region region(0, 0, 0, g_uVolumeSideLength - 1, g_uVolumeSideLength - 1, g_uVolumeSideLength - 1); //Create empty volume - RawVolume volData(Region(0, 0, 0, g_uVolumeSideLength - 1, g_uVolumeSideLength - 1, g_uVolumeSideLength - 1)); + RawVolume volData(region); + + // To test with a PagedVolume instead you can comment ou the above line and use these instead. + // FilePager* pFilePager = new FilePager("."); + // PagedVolume volData(pFilePager, 256 * 1024 * 1024, 32); //Create two solid walls at opposite sides of the volume for (int32_t z = 0; z < g_uVolumeSideLength; z++) @@ -73,7 +80,7 @@ void TestAmbientOcclusionGenerator::testExecute() // Calculate the ambient occlusion values IsVoxelTransparent isVoxelTransparent; QBENCHMARK { - calculateAmbientOcclusion(&volData, &ambientOcclusionResult, volData.getEnclosingRegion(), 32.0f, 255, isVoxelTransparent); + calculateAmbientOcclusion(&volData, &ambientOcclusionResult, region, 32.0f, 255, isVoxelTransparent); } //Check the results by sampling along a line though the centre of the volume. Because @@ -85,7 +92,7 @@ void TestAmbientOcclusionGenerator::testExecute() QCOMPARE(static_cast(ambientOcclusionResult(16, 31, 16)), 173); //Just run a quick test to make sure that it compiles when taking a function pointer - calculateAmbientOcclusion(&volData, &ambientOcclusionResult, volData.getEnclosingRegion(), 32.0f, 8, &isVoxelTransparentFunction); + calculateAmbientOcclusion(&volData, &ambientOcclusionResult, region, 32.0f, 8, &isVoxelTransparentFunction); //Also test it using a lambda //calculateAmbientOcclusion(&volData, &ambientOcclusionResult, volData.getEnclosingRegion(), 32.0f, 8, [](uint8_t voxel){return voxel == 0;});