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

Removed redundant hasMaterial and hasDensity traits.

Browse Source 
Changed AStar default validator.
This commit is contained in:
unknown
2012-02-20 12:51:54 +01:00
parent a20db7d7cf
commit 8d3a66a08c
7 changed files with 38 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl
View File

@@ -37,27 +37,6 @@ namespace PolyVox
return false;
}
if(VoxelTypeTraits<VoxelType>::hasDensity())
{
//and if their density is above the threshold.
VoxelType voxel = volData->getVoxelAt(v3dPos);
typename VoxelType::DensityType tThreshold = (VoxelTypeTraits<VoxelType>::minDensity() + VoxelTypeTraits<VoxelType>::maxDensity()) / 2;
if(voxel.getDensity() >= tThreshold)
{
return false;
}
}
if(VoxelTypeTraits<VoxelType>::hasMaterial())
{
//and if their material is not zero.
VoxelType voxel = volData->getVoxelAt(v3dPos);
if(voxel.getMaterial() != 0)
{
return false;
}
}
return true;
}

4
library/PolyVoxCore/include/PolyVoxCore/Density.h
View File

@@ -99,10 +99,6 @@ namespace PolyVox
public:
typedef uint8_t DensityType;
typedef uint8_t MaterialType;
static const bool HasDensity = true;
static const bool HasMaterial = false;
static bool hasDensity() { return true; }
static bool hasMaterial() { return false; }
static Density8::DensityType minDensity() { return std::numeric_limits<Density8::DensityType>::min(); }
static Density8::DensityType maxDensity() { return std::numeric_limits<Density8::DensityType>::max(); }
};

8
library/PolyVoxCore/include/PolyVoxCore/Material.h
View File

@@ -109,10 +109,6 @@ namespace PolyVox
public:
typedef uint8_t DensityType;
typedef uint8_t MaterialType;
static const bool HasDensity = false;
static const bool HasMaterial = true;
static bool hasDensity() { return false; }
static bool hasMaterial() { return true; }
static int minDensity() { assert(false); return 0; }
static int maxDensity() { assert(false); return 0; }
};
@@ -122,10 +118,6 @@ namespace PolyVox
{
public:
typedef uint8_t DensityType;
static const bool HasDensity = false;
static const bool HasMaterial = true;
static bool hasDensity() { return false; }
static bool hasMaterial() { return true; }
static int minDensity() { assert(false); return 0; }
static int maxDensity() { assert(false); return 0; }
};

8
library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h
View File

@@ -92,10 +92,6 @@ namespace PolyVox
public:
typedef uint8_t DensityType;
typedef uint8_t MaterialType;
static const bool HasDensity = true;
static const bool HasMaterial = true;
static bool hasDensity() { return true; }
static bool hasMaterial() { return true; }
static MaterialDensityPair44::DensityType minDensity() { return 0; }
static MaterialDensityPair44::DensityType maxDensity() { return 15; }
};
@@ -106,10 +102,6 @@ namespace PolyVox
public:
typedef uint8_t DensityType;
typedef uint8_t MaterialType;
static const bool HasDensity = true;
static const bool HasMaterial = true;
static bool hasDensity() { return true; }
static bool hasMaterial() { return true; }
static MaterialDensityPair88::DensityType minDensity() { return 0; }
static MaterialDensityPair88::DensityType maxDensity() { return 255; }
};

4
library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.h
View File

@@ -38,10 +38,6 @@ namespace PolyVox
public:
typedef uint8_t DensityType;
typedef uint8_t MaterialType;
static const bool HasDensity = true;
static const bool HasMaterial = false;
static bool hasDensity() { return true; }
static bool hasMaterial() { return false; }
static uint8_t minDensity() { return 0; }
static uint8_t maxDensity() { return 255; }
};

5
library/PolyVoxCore/include/PolyVoxCore/Voxel.h
View File

@@ -48,11 +48,6 @@ namespace PolyVox
public:
typedef uint8_t DensityType;
typedef uint8_t MaterialType;
static const bool HasDensity = false;
static const bool HasMaterial = false;
static bool hasDensity() { return false; }
static bool hasMaterial() { return false; }
// These default implementations return an int32_t rather than void so that the result can be
// assigned to a variable for all voxel types (even those without density components). Calls