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

Refactoring work... working on meshes

Browse Source
This commit is contained in:
David Williams 2007-08-27 22:45:51 +00:00
parent adfdb3062f
commit eaf17afc10
8 changed files with 164 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -10,6 +10,8 @@ SET(SRC_FILES
source/PolyVoxSceneManager.cpp
source/SurfacePatch.cpp
source/SurfacePatchRenderable.cpp
source/SurfaceTriangle.cpp
source/SurfaceVertex.cpp
source/Volume.cpp
source/VolumeIterator.cpp
source/VolumeManager.cpp

7
include/SurfacePatch.h
View File

@ -15,10 +15,9 @@ namespace Ogre
SurfacePatch();
~SurfacePatch();
void addTriangle(const SurfaceVertex& v0,const SurfaceVertex& v1,const SurfaceVertex& v2);
void endDefinition(void);
/*const std::vector<SurfaceVertex> getVertexArray();
const std::vector<SurfaceTriangle> getTriangleArray();*/
void addTriangle(const SurfaceVertex& v0,const SurfaceVertex& v1,const SurfaceVertex& v2);
void getVertexAndIndexData(std::vector<SurfaceVertex>& vertexData, std::vector<uint>& indexData);
@ -28,6 +27,8 @@ namespace Ogre
std::vector<SurfaceVertex> m_vecVertexData;
std::vector<uint> m_vecIndexData;
uint m_uTrianglesAdded;
};
}

17
include/SurfaceTriangle.h
View File

@ -24,10 +24,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "OgreVector3.h"
#include "SurfaceVertex.h"
namespace Ogre
{
class SurfaceVertex;
class SurfaceTriangle
{
public:
@ -40,16 +40,11 @@ namespace Ogre
std::list<SurfaceVertex>::iterator v1;
std::list<SurfaceVertex>::iterator v2;
SurfaceTriangle()
{
}
SurfaceTriangle();
SurfaceTriangle(std::list<SurfaceVertex>::iterator v0ToSet, std::list<SurfaceVertex>::iterator v1ToSet, std::list<SurfaceVertex>::iterator v2ToSet)
:v0(v0ToSet)
,v1(v1ToSet)
,v2(v2ToSet)
{
}
SurfaceTriangle(std::list<SurfaceVertex>::iterator v0ToSet, std::list<SurfaceVertex>::iterator v1ToSet, std::list<SurfaceVertex>::iterator v2ToSet);
//bool operator < (const SurfaceTriangle& rhs) const;
};
}

51
include/SurfaceVertex.h
View File

@ -26,6 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
namespace Ogre
{
class SurfaceTriangle;
class SurfaceVertex
{
public:
@ -33,52 +35,17 @@ namespace Ogre
Vector3 normal;
float alpha;
SurfaceVertex()
{
}
std::list<std::list<SurfaceTriangle>::iterator> listTrianglesUsingThisVertex;
SurfaceVertex(Vector3 positionToSet)
:position(positionToSet)
{
}
SurfaceVertex();
SurfaceVertex(Vector3 positionToSet, Vector3 normalToSet)
:position(positionToSet)
,normal(normalToSet)
{
}
SurfaceVertex(Vector3 positionToSet);
bool matchesPosition(const Vector3& rhs) const
{
//return ((x == rhs.x) && (y == rhs.y) && (z == rhs.z));
return ((position - rhs).length() < 0.01);
}
SurfaceVertex(Vector3 positionToSet, Vector3 normalToSet);
bool operator < (const SurfaceVertex& rhs) const
{
if(position.z < rhs.position.z)
{
return true;
}
else
{
if(position.y < rhs.position.y)
{
return true;
}
else
{
if(position.x < rhs.position.x)
{
return true;
}
else
{
return false;
}
}
}
}
bool operator==(const SurfaceVertex& rhs) const;
//bool operator < (const SurfaceVertex& rhs) const;
};
}

5
source/PolyVoxSceneManager.cpp
View File

@ -1000,6 +1000,11 @@ namespace Ogre
result.insert(std::make_pair(materialCt, surfacePatch));
}*/
for(std::map<uchar, SurfacePatch>::iterator iterPatch = result.begin(); iterPatch != result.end(); ++iterPatch)
{
iterPatch->second.endDefinition();
}
return result;
}

88
source/SurfacePatch.cpp
View File

@ -1,41 +1,68 @@
#include "SurfacePatch.h"
#include "OgreLogManager.h"
#include "OgreStringConverter.h"
#include <algorithm>
namespace Ogre
{
SurfacePatch::SurfacePatch()
{
m_listVertices.clear();
m_listTriangles.clear();
m_uTrianglesAdded = 0;
}
SurfacePatch::~SurfacePatch()
{
}
void SurfacePatch::endDefinition(void)
{
//LogManager::getSingleton().logMessage("No of triangles added = " + StringConverter::toString(m_uTrianglesAdded));
//LogManager::getSingleton().logMessage("No of triangles present = " + StringConverter::toString(m_listTriangles.size()));
//LogManager::getSingleton().logMessage("No of vertices present = " + StringConverter::toString(m_listVertices.size()));
}
void SurfacePatch::addTriangle(const SurfaceVertex& v0,const SurfaceVertex& v1,const SurfaceVertex& v2)
{
m_uTrianglesAdded++;
SurfaceTriangle triangle;
m_listVertices.push_back(v0);
triangle.v0 = m_listVertices.end();
triangle.v0--;
triangle.v0 = std::find(m_listVertices.begin(), m_listVertices.end(), v0);
if(triangle.v0 == m_listVertices.end()) //We have to add it
{
m_listVertices.push_back(v0);
triangle.v0 = m_listVertices.end();
triangle.v0--;
}
m_listVertices.push_back(v1);
triangle.v1 = m_listVertices.end();
triangle.v1--;
m_listVertices.push_back(v2);
triangle.v2 = m_listVertices.end();
triangle.v2--;
triangle.v1 = std::find(m_listVertices.begin(), m_listVertices.end(), v1);
if(triangle.v1 == m_listVertices.end()) //We have to add it
{
m_listVertices.push_back(v1);
triangle.v1 = m_listVertices.end();
triangle.v1--;
}
triangle.v2 = std::find(m_listVertices.begin(), m_listVertices.end(), v2);
if(triangle.v2 == m_listVertices.end()) //We have to add it
{
m_listVertices.push_back(v2);
triangle.v2 = m_listVertices.end();
triangle.v2--;
}
m_listTriangles.push_back(triangle);
/*m_vecVertexData.push_back(v0);
m_vecIndexData.push_back(m_vecVertexData.size()-1);
m_vecVertexData.push_back(v1);
m_vecIndexData.push_back(m_vecVertexData.size()-1);
m_vecVertexData.push_back(v2);
m_vecIndexData.push_back(m_vecVertexData.size()-1);*/
triangle.v0->listTrianglesUsingThisVertex.push_back(m_listTriangles.end());
triangle.v1->listTrianglesUsingThisVertex.push_back(m_listTriangles.end());
triangle.v2->listTrianglesUsingThisVertex.push_back(m_listTriangles.end());
}
/*const std::vector<SurfaceVertex> SurfacePatch::getVertexArray()
@ -59,14 +86,41 @@ namespace Ogre
vertexData.clear();
indexData.clear();
vertexData.resize(m_listVertices.size());
std::copy(m_listVertices.begin(), m_listVertices.end(), vertexData.begin());
for(std::list<SurfaceTriangle>::iterator iterTriangles = m_listTriangles.begin(); iterTriangles != m_listTriangles.end(); ++iterTriangles)
{
vertexData.push_back(*(iterTriangles->v0));
/*vertexData.push_back(*(iterTriangles->v0));
indexData.push_back(vertexData.size()-1);
vertexData.push_back(*(iterTriangles->v1));
indexData.push_back(vertexData.size()-1);
vertexData.push_back(*(iterTriangles->v2));
indexData.push_back(vertexData.size()-1);
indexData.push_back(vertexData.size()-1);*/
for(uint ct = 0; ct < vertexData.size(); ++ct)
{
if(vertexData[ct] == (*(iterTriangles->v0)))
{
indexData.push_back(ct);
}
}
for(uint ct = 0; ct < vertexData.size(); ++ct)
{
if(vertexData[ct] == (*(iterTriangles->v1)))
{
indexData.push_back(ct);
}
}
for(uint ct = 0; ct < vertexData.size(); ++ct)
{
if(vertexData[ct] == (*(iterTriangles->v2)))
{
indexData.push_back(ct);
}
}
}
/*vertexData = m_vecVertexData;

15
source/SurfaceTriangle.cpp Normal file
View File

@ -0,0 +1,15 @@
#include "SurfaceTriangle.h"
namespace Ogre
{
SurfaceTriangle::SurfaceTriangle()
{
}
SurfaceTriangle::SurfaceTriangle(std::list<SurfaceVertex>::iterator v0ToSet, std::list<SurfaceVertex>::iterator v1ToSet, std::list<SurfaceVertex>::iterator v2ToSet)
:v0(v0ToSet)
,v1(v1ToSet)
,v2(v2ToSet)
{
}
}

51
source/SurfaceVertex.cpp Normal file
View File

@ -0,0 +1,51 @@
#include "SurfaceVertex.h"
namespace Ogre
{
SurfaceVertex::SurfaceVertex()
{
}
SurfaceVertex::SurfaceVertex(Vector3 positionToSet)
:position(positionToSet)
{
}
SurfaceVertex::SurfaceVertex(Vector3 positionToSet, Vector3 normalToSet)
:position(positionToSet)
,normal(normalToSet)
{
}
bool SurfaceVertex::operator==(const SurfaceVertex& rhs) const
{
//We dont't check the normal here as it may not have been set. But if two vertices have the same position they should have the same normal too.
return ((position.positionEquals(rhs.position)) && (abs(alpha - rhs.alpha) < 0.01));
}
/*bool SurfaceVertex::operator < (const SurfaceVertex& rhs) const
{
if(position.z < rhs.position.z)
{
return true;
}
else
{
if(position.y < rhs.position.y)
{
return true;
}
else
{
if(position.x < rhs.position.x)
{
return true;
}
else
{
return false;
}
}
}
}*/
}