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

Removed SurfaceExtractorController from Material as it doesn't really make sense to use the marching cubes surface extractor on this type.

Browse Source
This commit is contained in:
unknown 2012-06-26 17:01:40 +02:00
parent 3a0386d360
commit ffa14c6f39
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,6 @@ freely, subject to the following restrictions:
#ifndef __PolyVox_Material_H__ #ifndef __PolyVox_Material_H__
#define __PolyVox_Material_H__ #define __PolyVox_Material_H__
#include "PolyVoxCore/SurfaceExtractionController.h" //We'll specialise the controller contained in here
#include "PolyVoxCore/Voxel.h" #include "PolyVoxCore/Voxel.h"
#include "PolyVoxImpl/TypeDef.h" #include "PolyVoxImpl/TypeDef.h"
@ -117,24 +116,6 @@ namespace PolyVox
typedef Material<uint8_t> Material8; typedef Material<uint8_t> Material8;
typedef Material<uint16_t> Material16; typedef Material<uint16_t> Material16;
template <typename Type>
class SurfaceExtractionController< Material<Type> >
{
public:
typedef int32_t DensityType;
typedef float MaterialType;
DensityType convertToDensity(Material<Type> voxel)
{
return voxel.getDensity();
}
MaterialType convertToMaterial(Material<Type> voxel)
{
return voxel.getMaterial();
}
};
template<> template<>
class VoxelTypeTraits< Material8 > class VoxelTypeTraits< Material8 >
{ {