From ffa14c6f3924513a4e267d3c311409499bcee33d Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 26 Jun 2012 17:01:40 +0200 Subject: [PATCH] Removed SurfaceExtractorController from Material as it doesn't really make sense to use the marching cubes surface extractor on this type. --- .../include/PolyVoxCore/Material.h | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/library/PolyVoxCore/include/PolyVoxCore/Material.h b/library/PolyVoxCore/include/PolyVoxCore/Material.h index 58226b16..407cb540 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Material.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Material.h @@ -24,7 +24,6 @@ freely, subject to the following restrictions: #ifndef __PolyVox_Material_H__ #define __PolyVox_Material_H__ -#include "PolyVoxCore/SurfaceExtractionController.h" //We'll specialise the controller contained in here #include "PolyVoxCore/Voxel.h" #include "PolyVoxImpl/TypeDef.h" @@ -117,24 +116,6 @@ namespace PolyVox typedef Material Material8; typedef Material Material16; - template - class SurfaceExtractionController< Material > - { - public: - typedef int32_t DensityType; - typedef float MaterialType; - - DensityType convertToDensity(Material voxel) - { - return voxel.getDensity(); - } - - MaterialType convertToMaterial(Material voxel) - { - return voxel.getMaterial(); - } - }; - template<> class VoxelTypeTraits< Material8 > {