Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git
This commit is contained in:
commit
48a715664d
@ -28,6 +28,7 @@ freely, subject to the following restrictions:
|
|||||||
#include "PolyVoxImpl/TypeDef.h"
|
#include "PolyVoxImpl/TypeDef.h"
|
||||||
|
|
||||||
#include "PolyVoxCore/Array.h"
|
#include "PolyVoxCore/Array.h"
|
||||||
|
#include "PolyVoxCore/Voxel.h"
|
||||||
|
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <stdexcept> //For runtime_error
|
#include <stdexcept> //For runtime_error
|
||||||
|
@ -41,7 +41,7 @@ namespace PolyVox
|
|||||||
{
|
{
|
||||||
//and if their density is above the threshold.
|
//and if their density is above the threshold.
|
||||||
VoxelType voxel = volData->getVoxelAt(v3dPos);
|
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)
|
if(voxel.getDensity() >= tThreshold)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user