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

Fixed merge problem?

Browse Source
This commit is contained in:
unknown 2012-02-18 12:18:55 +01:00
commit 06cee9406a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl
View File

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