From d000616d3e933e5eb8159e7405c273cffb68a7f7 Mon Sep 17 00:00:00 2001 From: David Williams Date: Mon, 30 Mar 2015 11:24:48 +0200 Subject: [PATCH] Revert "Ambient occlusion test now uses RawVolume, as it need a fixed size volume to create a temporary array." This reverts commit 396d1cfc599e6837cf38bc1a95e680e9721ea844. --- include/PolyVox/AmbientOcclusionCalculator.h | 4 ++-- tests/TestAmbientOcclusionGenerator.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/PolyVox/AmbientOcclusionCalculator.h b/include/PolyVox/AmbientOcclusionCalculator.h index 72f80bf1..7f0fc5a4 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 @@ -53,7 +53,7 @@ namespace PolyVox { } - bool operator()(const RawVolume::Sampler& sampler) + bool operator()(const PagedVolume::Sampler& sampler) { uint8_t sample = sampler.getVoxel(); bool func = mIsVoxelTransparentCallback(sample); diff --git a/tests/TestAmbientOcclusionGenerator.cpp b/tests/TestAmbientOcclusionGenerator.cpp index 683d5c98..dcdab847 100644 --- a/tests/TestAmbientOcclusionGenerator.cpp +++ b/tests/TestAmbientOcclusionGenerator.cpp @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #include "TestAmbientOcclusionGenerator.h" #include "PolyVox/AmbientOcclusionCalculator.h" -#include "PolyVox/RawVolume.h" +#include "PolyVox/PagedVolume.h" #include @@ -49,7 +49,7 @@ void TestAmbientOcclusionGenerator::testExecute() const int32_t g_uVolumeSideLength = 64; //Create empty volume - RawVolume volData(Region(0, 0, 0, g_uVolumeSideLength - 1, g_uVolumeSideLength - 1, g_uVolumeSideLength - 1)); + PagedVolume volData; //Create two solid walls at opposite sides of the volume for (int32_t z = 0; z < g_uVolumeSideLength; z++)