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

Refactoring of basic voxel types.

Browse Source
This commit is contained in:
p265186
2012-01-12 17:14:45 +01:00
parent 396e1fea30
commit 49b5fb3f67
13 changed files with 176 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
examples/Paging/main.cpp
View File

@ -50,7 +50,7 @@ void createPerlinVolumeSlow(LargeVolume<MaterialDensityPair44>& volData)
perlinVal += 1.0f;
perlinVal *= 0.5f;
perlinVal *= MaterialDensityPair44::getMaxDensity();
perlinVal *= VoxelTypeTraits<MaterialDensityPair44>::MaxDensity;
MaterialDensityPair44 voxel;
@ -60,12 +60,12 @@ void createPerlinVolumeSlow(LargeVolume<MaterialDensityPair44>& volData)
/*if(perlinVal < 0.0f)
{
voxel.setMaterial(245);
voxel.setDensity(MaterialDensityPair44::getMaxDensity());
voxel.setDensity(VoxelTypeTraits<MaterialDensityPair44>::MaxDensity);
}
else
{
voxel.setMaterial(0);
voxel.setDensity(MaterialDensityPair44::getMinDensity());
voxel.setDensity(VoxelTypeTraits<MaterialDensityPair44>::MinDensity);
}*/
volData.setVoxelAt(x, y, z, voxel);
@ -105,12 +105,12 @@ void createPerlinVolumeSlow(LargeVolume<MaterialDensityPair44>& volData)
if(perlinVal < 0.0f)
{
voxel.setMaterial(245);
voxel.setDensity(MaterialDensityPair44::getMaxDensity());
voxel.setDensity(VoxelTypeTraits<MaterialDensityPair44>::MaxDensity);
}
else
{
voxel.setMaterial(0);
voxel.setDensity(MaterialDensityPair44::getMinDensity());
voxel.setDensity(VoxelTypeTraits<MaterialDensityPair44>::MinDensity);
}
volData.setVoxelAt(x, y, z, voxel);
@ -143,12 +143,12 @@ void createPerlinTerrain(LargeVolume<MaterialDensityPair44>& volData)
if(z < perlinVal)
{
voxel.setMaterial(245);
voxel.setDensity(MaterialDensityPair44::getMaxDensity());
voxel.setDensity(VoxelTypeTraits<MaterialDensityPair44>::MaxDensity);
}
else
{
voxel.setMaterial(0);
voxel.setDensity(MaterialDensityPair44::getMinDensity());
voxel.setDensity(VoxelTypeTraits<MaterialDensityPair44>::MinDensity);
}
volData.setVoxelAt(x, y, z, voxel);
@ -181,7 +181,7 @@ void createSphereInVolume(LargeVolume<MaterialDensityPair44>& volData, Vector3DF
if(fDistToCenter <= fRadius)
{
//Our new density value
uint8_t uDensity = MaterialDensityPair44::getMaxDensity();
uint8_t uDensity = VoxelTypeTraits<MaterialDensityPair44>::MaxDensity;
//Get the old voxel
MaterialDensityPair44 voxel = volData.getVoxelAt(x,y,z);
@ -219,17 +219,17 @@ void load(const ConstVolumeProxy<MaterialDensityPair44>& volume, const PolyVox::
if((x-xpos)*(x-xpos) + (z-zpos)*(z-zpos) < 200) {
// tunnel
voxel.setMaterial(0);
voxel.setDensity(MaterialDensityPair44::getMinDensity());
voxel.setDensity(VoxelTypeTraits<MaterialDensityPair44>::MinDensity);
} else {
// solid
voxel.setMaterial(245);
voxel.setDensity(MaterialDensityPair44::getMaxDensity());
voxel.setDensity(VoxelTypeTraits<MaterialDensityPair44>::MaxDensity);
}
}
else
{
voxel.setMaterial(0);
voxel.setDensity(MaterialDensityPair44::getMinDensity());
voxel.setDensity(VoxelTypeTraits<MaterialDensityPair44>::MinDensity);
}
volume.setVoxelAt(x, y, z, voxel);