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

Removed code which is redundant after previous commit.

Browse Source
This commit is contained in:
Daviw Williams 2012-12-19 11:46:44 +01:00
parent 44dcb0ba89
commit 898aa24126
4 changed files with 0 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/PolyVoxCore/include/PolyVoxCore/DefaultMarchingCubesController.h
View File

@ -78,8 +78,6 @@ namespace PolyVox
*/ */
DefaultMarchingCubesController(void) DefaultMarchingCubesController(void)
:m_tThreshold(((std::numeric_limits<DensityType>::min)() + (std::numeric_limits<DensityType>::max)()) / 2) :m_tThreshold(((std::numeric_limits<DensityType>::min)() + (std::numeric_limits<DensityType>::max)()) / 2)
,m_eWrapMode(WrapModes::Border)
,m_tBorder(VoxelType(0))
{ {
} }
@ -105,11 +103,6 @@ namespace PolyVox
return 1; return 1;
} }
VoxelType getBorderValue(void)
{
return m_tBorder;
}
/** /**
* Returns the density value which was passed to the constructor. * Returns the density value which was passed to the constructor.
* *
@ -122,26 +115,13 @@ namespace PolyVox
return m_tThreshold; return m_tThreshold;
} }
WrapMode getWrapMode(void)
{
return m_eWrapMode;
}
void setThreshold(DensityType tThreshold) void setThreshold(DensityType tThreshold)
{ {
m_tThreshold = tThreshold; m_tThreshold = tThreshold;
} }
void setWrapMode(WrapMode eWrapMode, VoxelType tBorder = VoxelType(0))
{
m_eWrapMode = eWrapMode;
m_tBorder = tBorder;
}
private: private:
DensityType m_tThreshold; DensityType m_tThreshold;
WrapMode m_eWrapMode;
VoxelType m_tBorder;
}; };
} }

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

@ -155,13 +155,11 @@ namespace PolyVox
{ {
// Default to a threshold value halfway between the min and max possible values. // Default to a threshold value halfway between the min and max possible values.
m_tThreshold = (Density<Type>::getMinDensity() + Density<Type>::getMaxDensity()) / 2; m_tThreshold = (Density<Type>::getMinDensity() + Density<Type>::getMaxDensity()) / 2;
m_eWrapMode = WrapModes::Border;
} }
DefaultMarchingCubesController(DensityType tThreshold) DefaultMarchingCubesController(DensityType tThreshold)
{ {
m_tThreshold = tThreshold; m_tThreshold = tThreshold;
m_eWrapMode = WrapModes::Border;
} }
DensityType convertToDensity(Density<Type> voxel) DensityType convertToDensity(Density<Type> voxel)
@ -174,35 +172,18 @@ namespace PolyVox
return 1; return 1;
} }
Density<Type> getBorderValue(void)
{
return m_tBorder;
}
DensityType getThreshold(void) DensityType getThreshold(void)
{ {
return m_tThreshold; return m_tThreshold;
} }
WrapMode getWrapMode(void)
{
return m_eWrapMode;
}
void setThreshold(DensityType tThreshold) void setThreshold(DensityType tThreshold)
{ {
m_tThreshold = tThreshold; m_tThreshold = tThreshold;
} }
void setWrapMode(WrapMode eWrapMode)
{
m_eWrapMode = eWrapMode;
}
private: private:
DensityType m_tThreshold; DensityType m_tThreshold;
WrapMode m_eWrapMode;
Density<Type> m_tBorder;
}; };
} }

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

@ -119,13 +119,11 @@ namespace PolyVox
{ {
// Default to a threshold value halfway between the min and max possible values. // 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; m_tThreshold = (MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits>::getMinDensity() + MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits>::getMaxDensity()) / 2;
m_eWrapMode = WrapModes::Border;
} }
DefaultMarchingCubesController(DensityType tThreshold) DefaultMarchingCubesController(DensityType tThreshold)
{ {
m_tThreshold = tThreshold; m_tThreshold = tThreshold;
m_eWrapMode = WrapModes::Border;
} }
DensityType convertToDensity(MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits> voxel) DensityType convertToDensity(MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits> voxel)
@ -148,25 +146,13 @@ namespace PolyVox
return m_tThreshold; return m_tThreshold;
} }
WrapMode getWrapMode(void)
{
return m_eWrapMode;
}
void setThreshold(DensityType tThreshold) void setThreshold(DensityType tThreshold)
{ {
m_tThreshold = tThreshold; m_tThreshold = tThreshold;
} }
void setWrapMode(WrapMode eWrapMode)
{
m_eWrapMode = eWrapMode;
}
private: private:
DensityType m_tThreshold; DensityType m_tThreshold;
WrapMode m_eWrapMode;
MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits> m_tBorder;
}; };
typedef MaterialDensityPair<uint8_t, 4, 4> MaterialDensityPair44; typedef MaterialDensityPair<uint8_t, 4, 4> MaterialDensityPair44;

10
tests/TestSurfaceExtractor.cpp
View File

@ -59,16 +59,6 @@ public:
{ {
return 50.0f; return 50.0f;
} }
WrapMode getWrapMode(void)
{
return WrapModes::Border;
}
float getBorderValue(void)
{
return 0.0f;
}
}; };
// These 'writeDensityValueToVoxel' functions provide a unified interface for writting densities to primative and class voxel types. // These 'writeDensityValueToVoxel' functions provide a unified interface for writting densities to primative and class voxel types.