From cb0afb17f99f64fc917509dffde663244dbf6bff Mon Sep 17 00:00:00 2001 From: David Williams Date: Sun, 17 Jul 2011 00:50:02 +0100 Subject: [PATCH] Fixed incorrect header include guards in tests. --- .../PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl | 9 --------- tests/TestAStarPathfinder.h | 4 ++-- tests/TestAmbientOcclusionGenerator.h | 4 ++-- tests/TestArray.h | 4 ++-- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl b/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl index 975d10ad..8969a483 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl @@ -100,15 +100,6 @@ namespace PolyVox sy += m_regSrc.getLowerCorner().getY(); sz += m_regSrc.getLowerCorner().getZ(); - /*VoxelType voxel000 = m_pVolSrc->getVoxelAt(sx+0,sy+0,sz+0); - VoxelType voxel001 = m_pVolSrc->getVoxelAt(sx+0,sy+0,sz+1); - VoxelType voxel010 = m_pVolSrc->getVoxelAt(sx+0,sy+1,sz+0); - VoxelType voxel011 = m_pVolSrc->getVoxelAt(sx+0,sy+1,sz+1); - VoxelType voxel100 = m_pVolSrc->getVoxelAt(sx+1,sy+0,sz+0); - VoxelType voxel101 = m_pVolSrc->getVoxelAt(sx+1,sy+0,sz+1); - VoxelType voxel110 = m_pVolSrc->getVoxelAt(sx+1,sy+1,sz+0); - VoxelType voxel111 = m_pVolSrc->getVoxelAt(sx+1,sy+1,sz+1);*/ - sampler.setPosition(sx,sy,sz); VoxelType voxel000 = sampler.peekVoxel0px0py0pz(); VoxelType voxel001 = sampler.peekVoxel0px0py1pz(); diff --git a/tests/TestAStarPathfinder.h b/tests/TestAStarPathfinder.h index 29f3fa80..dc0563dc 100644 --- a/tests/TestAStarPathfinder.h +++ b/tests/TestAStarPathfinder.h @@ -21,8 +21,8 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#ifndef __PolyVox_TestVolume_H__ -#define __PolyVox_TestVolume_H__ +#ifndef __PolyVox_TestAStarPathfinder_H__ +#define __PolyVox_TestAStarPathfinder_H__ #include diff --git a/tests/TestAmbientOcclusionGenerator.h b/tests/TestAmbientOcclusionGenerator.h index 8d74ea14..d5986242 100644 --- a/tests/TestAmbientOcclusionGenerator.h +++ b/tests/TestAmbientOcclusionGenerator.h @@ -21,8 +21,8 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#ifndef __PolyVox_TestVolume_H__ -#define __PolyVox_TestVolume_H__ +#ifndef __PolyVox_TestAmbientOcclusionGenerator_H__ +#define __PolyVox_TestAmbientOcclusionGenerator_H__ #include diff --git a/tests/TestArray.h b/tests/TestArray.h index 2bebbdcc..fe935511 100644 --- a/tests/TestArray.h +++ b/tests/TestArray.h @@ -21,8 +21,8 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#ifndef __PolyVox_TestVolume_H__ -#define __PolyVox_TestVolume_H__ +#ifndef __PolyVox_TestArray_H__ +#define __PolyVox_TestArray_H__ #include