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

Removed 'using namespace' decalarations in inl's.

Browse Source
This commit is contained in:
David Williams 2010-08-26 22:04:09 +00:00
parent ae3f149838
commit 1123999d93
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/PolyVoxCore/include/SurfaceExtractor.inl
View File

@ -27,8 +27,6 @@ freely, subject to the following restrictions:
#include "PolyVoxImpl/MarchingCubesTables.h" #include "PolyVoxImpl/MarchingCubesTables.h"
#include "SurfaceVertex.h" #include "SurfaceVertex.h"
using namespace std;
namespace PolyVox namespace PolyVox
{ {
template <typename VoxelType> template <typename VoxelType>
@ -41,6 +39,8 @@ namespace PolyVox
m_regSizeInVoxels.cropTo(m_volData->getEnclosingRegion()); m_regSizeInVoxels.cropTo(m_volData->getEnclosingRegion());
m_regSizeInCells = m_regSizeInVoxels; m_regSizeInCells = m_regSizeInVoxels;
m_regSizeInCells.setUpperCorner(m_regSizeInCells.getUpperCorner() - Vector3DInt16(1,1,1)); m_regSizeInCells.setUpperCorner(m_regSizeInCells.getUpperCorner() - Vector3DInt16(1,1,1));
m_meshCurrent->clear();
} }
template <typename VoxelType> template <typename VoxelType>

10
library/PolyVoxUtil/include/Serialization.inl
View File

@ -25,14 +25,12 @@ freely, subject to the following restrictions:
#include "VolumeSampler.h" #include "VolumeSampler.h"
#include "PolyVoxImpl/Utility.h" #include "PolyVoxImpl/Utility.h"
using namespace std;
namespace PolyVox namespace PolyVox
{ {
//Note: we don't do much error handling in here - exceptions will simply be propergated up to the caller. //Note: we don't do much error handling in here - exceptions will simply be propergated up to the caller.
//FIXME - think about pointer ownership issues. Or could return volume by value if the copy constructor is shallow //FIXME - think about pointer ownership issues. Or could return volume by value if the copy constructor is shallow
template <typename VoxelType> template <typename VoxelType>
shared_ptr< Volume<VoxelType> > loadVolumeRaw(istream& stream, VolumeSerializationProgressListener* progressListener) std::shared_ptr< Volume<VoxelType> > loadVolumeRaw(std::istream& stream, VolumeSerializationProgressListener* progressListener)
{ {
//Read volume dimensions //Read volume dimensions
uint8_t volumeWidthPower = 0; uint8_t volumeWidthPower = 0;
@ -47,7 +45,7 @@ namespace PolyVox
uint16_t volumeDepth = 0x0001 << volumeDepthPower; uint16_t volumeDepth = 0x0001 << volumeDepthPower;
//FIXME - need to support non cubic volumes //FIXME - need to support non cubic volumes
shared_ptr< Volume<VoxelType> > volume(new Volume<VoxelType>(volumeWidth, volumeHeight, volumeDepth)); std::shared_ptr< Volume<VoxelType> > volume(new Volume<VoxelType>(volumeWidth, volumeHeight, volumeDepth));
//Read data //Read data
for(uint16_t z = 0; z < volumeDepth; ++z) for(uint16_t z = 0; z < volumeDepth; ++z)
@ -128,7 +126,7 @@ namespace PolyVox
//Note: we don't do much error handling in here - exceptions will simply be propergated up to the caller. //Note: we don't do much error handling in here - exceptions will simply be propergated up to the caller.
//FIXME - think about pointer ownership issues. Or could return volume by value if the copy constructor is shallow //FIXME - think about pointer ownership issues. Or could return volume by value if the copy constructor is shallow
template <typename VoxelType> template <typename VoxelType>
shared_ptr< Volume<VoxelType> > loadVolumeRle(istream& stream, VolumeSerializationProgressListener* progressListener) std::shared_ptr< Volume<VoxelType> > loadVolumeRle(std::istream& stream, VolumeSerializationProgressListener* progressListener)
{ {
//Read volume dimensions //Read volume dimensions
uint8_t volumeWidthPower = 0; uint8_t volumeWidthPower = 0;
@ -143,7 +141,7 @@ namespace PolyVox
uint16_t volumeDepth = 0x0001 << volumeDepthPower; uint16_t volumeDepth = 0x0001 << volumeDepthPower;
//FIXME - need to support non cubic volumes //FIXME - need to support non cubic volumes
shared_ptr< Volume<VoxelType> > volume(new Volume<VoxelType>(volumeWidth, volumeHeight, volumeDepth)); std::shared_ptr< Volume<VoxelType> > volume(new Volume<VoxelType>(volumeWidth, volumeHeight, volumeDepth));
//Read data //Read data
bool firstTime = true; bool firstTime = true;

2
library/PolyVoxUtil/include/VolumeChangeTracker.inl
View File

@ -34,8 +34,6 @@ freely, subject to the following restrictions:
#include "Volume.h" #include "Volume.h"
#include "VolumeSampler.h" #include "VolumeSampler.h"
using namespace std;
namespace PolyVox namespace PolyVox
{ {
template <typename VoxelType> template <typename VoxelType>