diff --git a/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl b/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl index 93fa37b6..2d030adf 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl @@ -21,7 +21,7 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#include "PolyVoxImpl\Utility.h" +#include "PolyVoxImpl/Utility.h" namespace PolyVox { @@ -112,14 +112,14 @@ namespace PolyVox VoxelType voxel110 = sampler.peekVoxel1px1py0pz(); VoxelType voxel111 = sampler.peekVoxel1px1py1pz(); - VoxelTypeTraits::DensityType voxel000Den = convertToDensity(voxel000); - VoxelTypeTraits::DensityType voxel001Den = convertToDensity(voxel001); - VoxelTypeTraits::DensityType voxel010Den = convertToDensity(voxel010); - VoxelTypeTraits::DensityType voxel011Den = convertToDensity(voxel011); - VoxelTypeTraits::DensityType voxel100Den = convertToDensity(voxel100); - VoxelTypeTraits::DensityType voxel101Den = convertToDensity(voxel101); - VoxelTypeTraits::DensityType voxel110Den = convertToDensity(voxel110); - VoxelTypeTraits::DensityType voxel111Den = convertToDensity(voxel111); + typename VoxelTypeTraits::DensityType voxel000Den = convertToDensity(voxel000); + typename VoxelTypeTraits::DensityType voxel001Den = convertToDensity(voxel001); + typename VoxelTypeTraits::DensityType voxel010Den = convertToDensity(voxel010); + typename VoxelTypeTraits::DensityType voxel011Den = convertToDensity(voxel011); + typename VoxelTypeTraits::DensityType voxel100Den = convertToDensity(voxel100); + typename VoxelTypeTraits::DensityType voxel101Den = convertToDensity(voxel101); + typename VoxelTypeTraits::DensityType voxel110Den = convertToDensity(voxel110); + typename VoxelTypeTraits::DensityType voxel111Den = convertToDensity(voxel111); //FIXME - should accept all float parameters, but GCC complains? double dummy; @@ -127,7 +127,7 @@ namespace PolyVox sy = modf(sy, &dummy); sz = modf(sz, &dummy); - VoxelTypeTraits::DensityType uInterpolatedDensity = trilinearlyInterpolate(voxel000Den,voxel100Den,voxel010Den,voxel110Den,voxel001Den,voxel101Den,voxel011Den,voxel111Den,sx,sy,sz); + typename VoxelTypeTraits::DensityType uInterpolatedDensity = trilinearlyInterpolate(voxel000Den,voxel100Den,voxel010Den,voxel110Den,voxel001Den,voxel101Den,voxel011Den,voxel111Den,sx,sy,sz); VoxelType result; //result.setDensity(uInterpolatedDensity);