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

Removed deprecated functions.

Browse Source
This commit is contained in:
David Williams
2015-12-26 23:41:49 +00:00
parent e89a55d154
commit d544de6dd1
5 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/PolyVox/CubicSurfaceExtractor.h
View File

@ -119,7 +119,7 @@ namespace PolyVox
{
//All four vertices of a given quad have the same data,
//so just check that the first pair of vertices match.
if (m_meshCurrent->getVertices()[q1.vertices[0]].data == m_meshCurrent->getVertices()[q2.vertices[0]].data)
if (m_meshCurrent->getVertex(q1.vertices[0]).data == m_meshCurrent->getVertex(q2.vertices[0]).data)
{
//Now check whether quad 2 is adjacent to quad one by comparing vertices.
//Adjacent quads must share two vertices, and the second quad could be to the

2
include/PolyVox/Mesh.h
View File

@ -54,12 +54,10 @@ namespace PolyVox
IndexType getNoOfVertices(void) const;
const VertexType& getVertex(IndexType index) const;
const VertexType* getRawVertexData(void) const;
POLYVOX_DEPRECATED const std::vector<VertexType>& getVertices(void) const;
size_t getNoOfIndices(void) const;
IndexType getIndex(uint32_t index) const;
const IndexType* getRawIndexData(void) const;
POLYVOX_DEPRECATED const std::vector<IndexType>& getIndices(void) const;
const Vector3DInt32& getOffset(void) const;
void setOffset(const Vector3DInt32& offset);

16
include/PolyVox/Mesh.inl
View File

@ -49,13 +49,7 @@ namespace PolyVox
template <typename VertexType, typename IndexType>
const VertexType* Mesh<VertexType, IndexType>::getRawVertexData(void) const
{
return &(m_vecVertices[0]);
}
template <typename VertexType, typename IndexType>
const std::vector<VertexType>& Mesh<VertexType, IndexType>::getVertices(void) const
{
return m_vecVertices;
return m_vecVertices.data();
}
template <typename VertexType, typename IndexType>
@ -73,13 +67,7 @@ namespace PolyVox
template <typename VertexType, typename IndexType>
const IndexType* Mesh<VertexType, IndexType>::getRawIndexData(void) const
{
return &(m_vecIndices[0]);
}
template <typename VertexType, typename IndexType>
const std::vector<IndexType>& Mesh<VertexType, IndexType>::getIndices(void) const
{
return m_vecIndices;
return m_vecIndices.data();
}
template <typename VertexType, typename IndexType>