Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git

This commit is contained in:
unknown 2012-02-08 10:43:44 +01:00
commit 48a715664d
2 changed files with 2 additions and 1 deletions

View File

@ -28,6 +28,7 @@ freely, subject to the following restrictions:
#include "PolyVoxImpl/TypeDef.h"
#include "PolyVoxCore/Array.h"
#include "PolyVoxCore/Voxel.h"
#include <list>
#include <stdexcept> //For runtime_error

View File

@ -41,7 +41,7 @@ namespace PolyVox
{
//and if their density is above the threshold.
VoxelType voxel = volData->getVoxelAt(v3dPos);
VoxelType::DensityType tThreshold = (VoxelTypeTraits<VoxelType>::minDensity() + VoxelTypeTraits<VoxelType>::maxDensity()) / 2;
typename VoxelType::DensityType tThreshold = (VoxelTypeTraits<VoxelType>::minDensity() + VoxelTypeTraits<VoxelType>::maxDensity()) / 2;
if(voxel.getDensity() >= tThreshold)
{
return false;