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

Merge remote-tracking branch 'origin/feature/vertex-and-example-refactor' into develop

Browse Source 
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/Mesh.h
This commit is contained in:
David Williams 2014-06-04 23:12:27 +02:00
commit c68a48df6b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/PolyVoxCore/include/PolyVoxCore/Mesh.h
View File

@ -39,13 +39,13 @@ freely, subject to the following restrictions:
namespace PolyVox
{
template <typename VertexType, typename IndexType>
template <typename _VertexType, typename _IndexType>
class Mesh
{
public:
typedef VertexType VertexType;
typedef IndexType IndexType;
typedef _VertexType VertexType;
typedef _IndexType IndexType;
Mesh();
~Mesh();
@ -77,7 +77,7 @@ namespace PolyVox
Mesh< Vertex< typename MeshType::VertexType::DataType >, typename MeshType::IndexType > result;
result.m_vecVertices.resize(mesh.m_vecVertices.size());
for(MeshType::IndexType ct = 0; ct < mesh.m_vecVertices.size(); ct++)
for(typename MeshType::IndexType ct = 0; ct < mesh.m_vecVertices.size(); ct++)
{
result.m_vecVertices[ct] = decode(mesh.m_vecVertices[ct]);
}