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

Tidying code and removing warnings.

Browse Source
This commit is contained in:
David Williams
2008-04-24 19:06:41 +00:00
parent 545aa92d14
commit 1d3c60f341
9 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/IndexedSurfacePatch.h
View File

@ -19,22 +19,24 @@ namespace PolyVox
~IndexedSurfacePatch();
void addTriangle(const SurfaceVertex& v0,const SurfaceVertex& v1,const SurfaceVertex& v2);
void fillVertexAndIndexData(std::vector<SurfaceVertex>& vecVertices, std::vector<boost::uint16_t>& vecIndices);
void fillVertexAndIndexData(std::vector<SurfaceVertex>& vecVertices, std::vector<boost::uint32_t>& vecIndices);
const std::vector<SurfaceVertex>& getVertices(void) const;
std::vector<SurfaceVertex>& getVertices(void); //FIXME - non const version should be removed.
const std::vector<boost::uint32_t>& getIndices(void) const;
//private:
std::vector<boost::uint16_t> m_vecTriangleIndices;
private:
std::vector<boost::uint32_t> m_vecTriangleIndices;
std::vector<SurfaceVertex> m_vecVertices;
static long int vertexIndices[POLYVOX_REGION_SIDE_LENGTH*2+1][POLYVOX_REGION_SIDE_LENGTH*2+1][POLYVOX_REGION_SIDE_LENGTH*2+1];
static boost::int32_t vertexIndices[POLYVOX_REGION_SIDE_LENGTH*2+1][POLYVOX_REGION_SIDE_LENGTH*2+1][POLYVOX_REGION_SIDE_LENGTH*2+1];
static boost::int32_t vertexIndicesX[POLYVOX_REGION_SIDE_LENGTH][POLYVOX_REGION_SIDE_LENGTH][POLYVOX_REGION_SIDE_LENGTH];
static boost::int32_t vertexIndicesY[POLYVOX_REGION_SIDE_LENGTH][POLYVOX_REGION_SIDE_LENGTH][POLYVOX_REGION_SIDE_LENGTH];
static boost::int32_t vertexIndicesZ[POLYVOX_REGION_SIDE_LENGTH][POLYVOX_REGION_SIDE_LENGTH][POLYVOX_REGION_SIDE_LENGTH];
static long int noOfVerticesSubmitted;
static long int noOfVerticesAccepted;
static long int noOfTrianglesSubmitted;
long int getSizeInBytes(void);
static boost::int32_t noOfVerticesSubmitted;
static boost::int32_t noOfVerticesAccepted;
static boost::int32_t noOfTrianglesSubmitted;
boost::int32_t getIndexFor(const Vector3DFloat& pos);
void setIndexFor(const Vector3DFloat& pos, boost::int32_t newIndex);
@ -42,6 +44,7 @@ namespace PolyVox
private:
bool m_AllowDuplicateVertices;
};
}
#endif /* __IndexedSurfacePatch_H__ */

3
include/RegionGeometry.h
View File

@ -38,9 +38,6 @@ namespace PolyVox
Vector3DInt32 m_v3dRegionPosition;
IndexedSurfacePatch* m_patchSingleMaterial;
IndexedSurfacePatch* m_patchMultiMaterial;
long int getSizeInBytes(void);
};
}

1
include/SurfaceVertex.h
View File

@ -56,7 +56,6 @@ namespace PolyVox
//bool operator < (const SurfaceVertexIterator& lhs, const SurfaceVertexIterator& rhs);
}

3
include/Vector.h
View File

@ -111,6 +111,9 @@ namespace PolyVox
typedef Vector<3,double> Vector3DDouble;
typedef Vector<3,boost::int32_t> Vector3DInt32;
typedef Vector<3,boost::uint32_t> Vector3DUint32;
}//namespace Thermite
#include "Vector.inl"

2
include/Vector.inl
View File

@ -501,7 +501,7 @@ namespace PolyVox
}
for(boost::uint32_t ct = 0; ct < Size; ++ct)
{
m_tElements[ct] /= length;
m_tElements[ct] /= static_cast<Type>(length);
}
}
}//namespace Thermite