MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added IMeshManipulator::createMeshWelded to copy a mesh with welded vertices. removed IAnimatedMeshX from the vc8 project. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@944 dfc29bdd-3216-0410-991c-e03cc46cb475
master
bitplane 2007-09-11 21:47:32 +00:00
parent 83703b6e8d
commit e87832050e
5 changed files with 177 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes.txt
View File

@ -1,5 +1,7 @@
Changes in version 1.4 (... 2007)
- Added IMeshManipulator::createMeshWelded which creates a copy of the mesh with similar vertices welded together.
- Irrlicht now has its own file format for static meshes. It is based on xml and has the
extension .irrmesh. Irrlicht is able to write every IMesh to this file format, and of course to
read it back again.

5
include/IMeshManipulator.h
View File

@ -93,9 +93,12 @@ namespace scene
See IReferenceCounted::drop() for more information. */
virtual IMesh* createMeshWithTangents(IMesh* mesh) const = 0;
//! Unweld vertices
//! Creates a copy of a mesh with all vertices unwelded
virtual IMesh* createMeshUniquePrimitives(IMesh* mesh) const = 0;
//! Creates a copy of a mesh with vertices welded
virtual IMesh* createMeshWelded(IMesh* mesh, f32 tolerance=core::ROUNDING_ERROR_32) const = 0;
//! Returns amount of polygons in mesh.
virtual s32 getPolyCount(IMesh* mesh) const = 0;

170
source/Irrlicht/CMeshManipulator.cpp
View File

@ -58,7 +58,6 @@ inline void recalculateNormalsT_Smooth(VTXTYPE* v, int vtxcnt,
}
}
//! Recalculates normals in a vertex array.
//! This template function was a member of the CMeshManipulator class, but
//! visual studio 6.0 didn't like it.
@ -620,6 +619,175 @@ IMesh* CMeshManipulator::createMeshUniquePrimitives(IMesh* mesh) const
return clone;
}
//! Creates a copy of a mesh, which will have identical vertices welded together
IMesh* CMeshManipulator::createMeshWelded(IMesh *mesh, f32 tolerance) const
{
SMesh* clone = new SMesh();
clone->BoundingBox = mesh->getBoundingBox();
core::array<u16> redirects;
for (u32 b=0; b<mesh->getMeshBufferCount(); ++b)
{
// reset redirect list
redirects.set_used(mesh->getMeshBuffer(b)->getVertexCount());
u16* indices = 0;
u32 indexCount = 0;
core::array<u16>* outIdx = 0;
switch(mesh->getMeshBuffer(b)->getVertexType())
{
case video::EVT_STANDARD:
{
SMeshBuffer* buffer = new SMeshBuffer();
buffer->BoundingBox = mesh->getMeshBuffer(b)->getBoundingBox();
buffer->Material = mesh->getMeshBuffer(b)->getMaterial();
clone->addMeshBuffer(buffer);
buffer->drop();
video::S3DVertex* v =
(video::S3DVertex*)mesh->getMeshBuffer(b)->getVertices();
u32 vertexCount = mesh->getMeshBuffer(b)->getVertexCount();
indices = mesh->getMeshBuffer(b)->getIndices();
indexCount = mesh->getMeshBuffer(b)->getIndexCount();
outIdx = &buffer->Indices;
buffer->Vertices.reallocate(vertexCount);
for (u32 i=0; i < vertexCount; ++i)
{
bool found = false;
for (u32 j=0; j < i; ++j)
{
if ( v[i].Pos.equals( v[j].Pos, tolerance) &&
v[i].Normal.equals( v[j].Normal, tolerance) &&
v[i].TCoords.equals( v[j].TCoords ) &&
(v[i].Color == v[j].Color) )
{
redirects[i] = redirects[j];
u32 p = redirects[j];
found = true;
break;
}
}
if (!found)
{
redirects[i] = buffer->Vertices.size();
buffer->Vertices.push_back(v[i]);
}
}
break;
}
case video::EVT_2TCOORDS:
{
SMeshBufferLightMap* buffer = new SMeshBufferLightMap();
buffer->BoundingBox = mesh->getMeshBuffer(b)->getBoundingBox();
buffer->Material = mesh->getMeshBuffer(b)->getMaterial();
clone->addMeshBuffer(buffer);
buffer->drop();
video::S3DVertex2TCoords* v =
(video::S3DVertex2TCoords*)mesh->getMeshBuffer(b)->getVertices();
u32 vertexCount = mesh->getMeshBuffer(b)->getVertexCount();
indices = mesh->getMeshBuffer(b)->getIndices();
indexCount = mesh->getMeshBuffer(b)->getIndexCount();
outIdx = &buffer->Indices;
buffer->Vertices.reallocate(vertexCount);
for (u32 i=0; i < vertexCount; ++i)
{
bool found = false;
for (u32 j=0; j < i; ++j)
{
if ( v[i].Pos.equals( v[j].Pos, tolerance) &&
v[i].Normal.equals( v[j].Normal, tolerance) &&
v[i].TCoords.equals( v[j].TCoords ) &&
v[i].TCoords2.equals( v[j].TCoords2 ) &&
(v[i].Color == v[j].Color) )
{
redirects[i] = redirects[j];
u32 p = redirects[j];
found = true;
break;
}
}
if (!found)
{
redirects[i] = buffer->Vertices.size();
buffer->Vertices.push_back(v[i]);
}
}
break;
}
case video::EVT_TANGENTS:
{
SMeshBufferTangents* buffer = new SMeshBufferTangents();
buffer->BoundingBox = mesh->getMeshBuffer(b)->getBoundingBox();
buffer->Material = mesh->getMeshBuffer(b)->getMaterial();
clone->addMeshBuffer(buffer);
buffer->drop();
video::S3DVertexTangents* v =
(video::S3DVertexTangents*)mesh->getMeshBuffer(b)->getVertices();
u32 vertexCount = mesh->getMeshBuffer(b)->getVertexCount();
indices = mesh->getMeshBuffer(b)->getIndices();
indexCount = mesh->getMeshBuffer(b)->getIndexCount();
outIdx = &buffer->Indices;
buffer->Vertices.reallocate(vertexCount);
for (u32 i=0; i < vertexCount; ++i)
{
bool found = false;
for (u32 j=0; j < i; ++j)
{
if ( v[i].Pos.equals( v[j].Pos, tolerance) &&
v[i].Normal.equals( v[j].Normal, tolerance) &&
v[i].TCoords.equals( v[j].TCoords ) &&
v[i].Tangent.equals( v[j].Tangent, tolerance ) &&
v[i].Binormal.equals( v[j].Binormal, tolerance ) &&
(v[i].Color == v[j].Color) )
{
redirects[i] = redirects[j];
u32 p = redirects[j];
found = true;
break;
}
}
if (!found)
{
redirects[i] = buffer->Vertices.size();
buffer->Vertices.push_back(v[i]);
}
}
break;
}
default:
os::Printer::log("Cannot create welded mesh, vertex type unsupported", ELL_ERROR);
break;
}
// write the buffer's index list
core::array<u16> &Indices = *outIdx;
Indices.set_used(indexCount);
for (u32 i=0; i<indexCount; ++i)
{
Indices[i] = redirects[ indices[i] ];
}
}
return clone;
}
//! Creates a copy of the mesh, which will only consist of S3DVertexTangents vertices.
IMesh* CMeshManipulator::createMeshWithTangents(IMesh* mesh) const

2
source/Irrlicht/CMeshManipulator.h
View File

@ -78,6 +78,8 @@ public:
virtual IMesh* createMeshUniquePrimitives(IMesh* mesh) const;
virtual IMesh* createMeshWelded(IMesh *mesh, f32 tolerance=core::ROUNDING_ERROR_32) const;
//! Returns amount of polygons in mesh.
virtual s32 getPolyCount(scene::IMesh* mesh) const;

4
source/Irrlicht/Irrlicht8.0.vcproj
View File

@ -619,10 +619,6 @@
RelativePath=".\..\..\include\IAnimatedMeshSceneNode.h"
>
</File>
<File
RelativePath=".\..\..\include\IAnimatedMeshX.h"
>
</File>
<File
RelativePath=".\..\..\include\IBillboardSceneNode.h"
>