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

Renamed SurfaceExtractionController to MarchingCubesController.

Browse Source
This commit is contained in:
unknown
2012-07-15 17:53:37 +02:00
parent eceb6851c0
commit 9a498bad7b
9 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
#ifndef __PolyVox_Density_H__
#define __PolyVox_Density_H__
#include "PolyVoxCore/SurfaceExtractionController.h" //We'll specialise the controller contained in here
#include "PolyVoxCore/MarchingCubesController.h" //We'll specialise the controller contained in here
#include "PolyVoxCore/Voxel.h"
#include "PolyVoxImpl/TypeDef.h"
@@ -103,19 +103,19 @@ namespace PolyVox
typedef Density<uint8_t> Density8;
template <typename Type>
class SurfaceExtractionController< Density<Type> >
class MarchingCubesController< Density<Type> >
{
public:
typedef Type DensityType;
typedef float MaterialType;
SurfaceExtractionController(void)
MarchingCubesController(void)
{
// Default to a threshold value halfway between the min and max possible values.
m_tThreshold = (Density<Type>::getMinDensity() + Density<Type>::getMaxDensity()) / 2;
}
SurfaceExtractionController(DensityType tThreshold)
MarchingCubesController(DensityType tThreshold)
{
m_tThreshold = tThreshold;
}

10
library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractionController.h → library/PolyVoxCore/include/PolyVoxCore/MarchingCubesController.h
View File

@@ -21,26 +21,26 @@ freely, subject to the following restrictions:
distribution.
*******************************************************************************/
#ifndef __PolyVox_SurfaceExtractionController_H__
#define __PolyVox_SurfaceExtractionController_H__
#ifndef __PolyVox_MarchingCubesController_H__
#define __PolyVox_MarchingCubesController_H__
#include <limits>
namespace PolyVox
{
template<typename VoxelType>
class SurfaceExtractionController
class MarchingCubesController
{
public:
typedef VoxelType DensityType;
typedef float MaterialType;
SurfaceExtractionController(void)
MarchingCubesController(void)
{
m_tThreshold = ((std::numeric_limits<DensityType>::min)() + (std::numeric_limits<DensityType>::max)()) / 2;
}
SurfaceExtractionController(DensityType tThreshold)
MarchingCubesController(DensityType tThreshold)
{
m_tThreshold = tThreshold;
}

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

@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
#ifndef __PolyVox_MaterialDensityPair_H__
#define __PolyVox_MaterialDensityPair_H__
#include "PolyVoxCore/SurfaceExtractionController.h" //We'll specialise the controller contained in here
#include "PolyVoxCore/MarchingCubesController.h" //We'll specialise the controller contained in here
#include "PolyVoxCore/Voxel.h"
#include "PolyVoxImpl/TypeDef.h"
@@ -115,19 +115,19 @@ namespace PolyVox
};
template <typename Type, uint8_t NoOfMaterialBits, uint8_t NoOfDensityBits>
class SurfaceExtractionController< MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits> >
class MarchingCubesController< MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits> >
{
public:
typedef Type DensityType;
typedef Type MaterialType;
SurfaceExtractionController(void)
MarchingCubesController(void)
{
// Default to a threshold value halfway between the min and max possible values.
m_tThreshold = (MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits>::getMinDensity() + MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits>::getMaxDensity()) / 2;
}
SurfaceExtractionController(DensityType tThreshold)
MarchingCubesController(DensityType tThreshold)
{
m_tThreshold = tThreshold;
}