Added new mMeshManipulator method scaleTCoords to scale texture coords of a...

Added new mMeshManipulator method scaleTCoords to scale texture coords of a mesh. Added two new access methods to texture coords of vertices of a meshbuffer. This allowed to replace the template for planar mapping as well.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1479 dfc29bdd-3216-0410-991c-e03cc46cb475

changes.txt

 Changes in version 1.5 (... 2008)
 
+ - Added scaleTCoords methods to MeshManipulator
+
  - Enable use of other meshes for shadow mesh generation, can be used to speed up shadow generation and rendering for complex meshes. Patch based on a version by tonic.
 
  - Fixed Software renderer color flicker, was a signed shift bug I believe.

include/CMeshBuffer.h

@@ -153,6 +153,18 @@ namespace scene
 			return Vertices[i].Normal;
 		}
 
+		//! returns texture coord of vertex i
+		virtual const core::vector2df& getTCoords(u32 i) const
+		{
+			return Vertices[i].TCoords;
+		}
+
+		//! returns texture coord of vertex i
+		virtual core::vector2df& getTCoords(u32 i)
+		{
+			return Vertices[i].TCoords;
+		}
+
 
 		//! Append the vertices and indices to the current buffer
 		/** Only works for compatible types, i.e. either the same type

include/IMeshBuffer.h

@@ -131,6 +131,12 @@ namespace scene
 		//! returns normal of vertex i
 		virtual core::vector3df& getNormal(u32 i) = 0;
 
+		//! returns texture coord of vertex i
+		virtual const core::vector2df& getTCoords(u32 i) const = 0;
+
+		//! returns texture coord of vertex i
+		virtual core::vector2df& getTCoords(u32 i) = 0;
+
 		//! Append the vertices and indices to the current buffer
 		/** Only works for compatible vertex types.
 		\param vertices Pointer to a vertex array.

include/IMeshManipulator.h

@@ -75,6 +75,18 @@ namespace scene
 		\param factor Scale factor for each axis. */
 		virtual void scaleMesh(IMesh* mesh, const core::vector3df& factor) const {return scale(mesh,factor);}
 
+		//! Scale the texture coords of a mesh.
+		/** \param mesh Mesh on which the operation is performed.
+		\param factor Vector which defines the scale for each axis.
+		\param level Number of texture coord, starting from 1. Support for level 2 exists for LightMap buffers. */
+		virtual void scaleTCoords(scene::IMesh* mesh, const core::vector2df& factor, u32 layer=1) const =0;
+
+		//! Scale the texture coords of a meshbuffer.
+		/** \param mesh Mesh on which the operation is performed.
+		\param factor Vector which defines the scale for each axis.
+		\param level Number of texture coord, starting from 1. Support for level 2 exists for LightMap buffers. */
+		virtual void scaleTCoords(scene::IMeshBuffer* buffer, const core::vector2df& factor, u32 level=1) const =0;
+
 		//! Applies a transformation to a mesh
 		/** \param mesh Mesh on which the operation is performed.
 		\param m transformation matrix. */

include/SSharedMeshBuffer.h

@@ -31,9 +31,6 @@ namespace scene
 			#endif
 		}
 
-		//! destructor
-		virtual ~SSharedMeshBuffer() { }
-
 		//! returns the material of this meshbuffer
 		virtual const video::SMaterial& getMaterial() const
 		{

include/SSkinMeshBuffer.h

@@ -282,6 +282,34 @@ struct SSkinMeshBuffer : public IMeshBuffer
 		}
 	}
 
+	//! returns texture coords of vertex i
+	virtual const core::vector2df& getTCoords(u32 i) const
+	{
+		switch (VertexType)
+		{
+			case video::EVT_2TCOORDS:
+				return Vertices_2TCoords[i].TCoords;
+			case video::EVT_TANGENTS:
+				return Vertices_Tangents[i].TCoords;
+			default:
+				return Vertices_Standard[i].TCoords;
+		}
+	}
+
+	//! returns texture coords of vertex i
+	virtual core::vector2df& getTCoords(u32 i)
+	{
+		switch (VertexType)
+		{
+			case video::EVT_2TCOORDS:
+				return Vertices_2TCoords[i].TCoords;
+			case video::EVT_TANGENTS:
+				return Vertices_Tangents[i].TCoords;
+			default:
+				return Vertices_Standard[i].TCoords;
+		}
+	}
+
 	//! append the vertices and indices to the current buffer
 	virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) {}
 

source/Irrlicht/CMeshManipulator.cpp

@@ -13,50 +13,6 @@ namespace irr
 namespace scene
 {
 
-//! This template function was a member of the CMeshManipulator class, but
-//! visual studio 6.0 didn't like it.
-template<class VERTEXTYPE>
-inline void makePlanarMappingT(VERTEXTYPE *v,
-				   int vtxcnt,
-				   u16* idx, int idxcnt, f32 resolution)
-{
-	for (int i=0; i<idxcnt; i+=3)
-	{
-		core::plane3d<f32> p(v[idx[i+0]].Pos, v[idx[i+1]].Pos, v[idx[i+2]].Pos);
-		p.Normal.X = fabsf(p.Normal.X);
-		p.Normal.Y = fabsf(p.Normal.Y);
-		p.Normal.Z = fabsf(p.Normal.Z);
-		// calculate planar mapping worldspace coordinates
-
-		if (p.Normal.X > p.Normal.Y && p.Normal.X > p.Normal.Z)
-		{
-			for (s32 o=0; o<3; ++o)
-			{
-				v[idx[i+o]].TCoords.X = v[idx[i+o]].Pos.Y * resolution;
-				v[idx[i+o]].TCoords.Y = v[idx[i+o]].Pos.Z * resolution;
-			}
-		}
-		else
-		if (p.Normal.Y > p.Normal.X && p.Normal.Y > p.Normal.Z)
-		{
-			for (s32 o=0; o<3; ++o)
-			{
-				v[idx[i+o]].TCoords.X = v[idx[i+o]].Pos.X * resolution;
-				v[idx[i+o]].TCoords.Y = v[idx[i+o]].Pos.Z * resolution;
-			}
-		}
-		else
-		{
-			for (s32 o=0; o<3; ++o)
-			{
-				v[idx[i+o]].TCoords.X = v[idx[i+o]].Pos.X * resolution;
-				v[idx[i+o]].TCoords.Y = v[idx[i+o]].Pos.Y * resolution;
-			}
-		}
-	}
-}
-
-
 static inline core::vector3df getAngleWeight(const core::vector3df& v1,
 		const core::vector3df& v2,
 		const core::vector3df& v3)
@@ -104,7 +60,6 @@ void CMeshManipulator::flipSurfaces(scene::IMesh* mesh) const
 }
 
 
-
 //! Sets the alpha vertex color value of the whole mesh to a new value
 //! \param mesh: Mesh on which the operation is performed.
 void CMeshManipulator::setVertexColorAlpha(scene::IMesh* mesh, s32 alpha) const
@@ -146,7 +101,6 @@ void CMeshManipulator::setVertexColorAlpha(scene::IMesh* mesh, s32 alpha) const
 }
 
 
-
 //! Sets the colors of all vertices to one color
 void CMeshManipulator::setVertexColors(IMesh* mesh, video::SColor color) const
 {
@@ -186,7 +140,6 @@ void CMeshManipulator::setVertexColors(IMesh* mesh, video::SColor color) const
 }
 
 
-
 //! Recalculates all normals of the mesh buffer.
 /** \param buffer: Mesh buffer on which the operation is performed. */
 void CMeshManipulator::recalculateNormals(IMeshBuffer* buffer, bool smooth, bool angleWeighted) const
@@ -356,6 +309,39 @@ void CMeshManipulator::scale(scene::IMeshBuffer* buffer, const core::vector3df&
 }
 
 
+//! Scale the texture coords of a mesh.
+void CMeshManipulator::scaleTCoords(scene::IMesh* mesh, const core::vector2df& factor, u32 layer) const
+{
+	if (!mesh)
+		return;
+
+	const u32 bcount = mesh->getMeshBufferCount();
+	for (u32 b=0; b<bcount; ++b)
+		scaleTCoords(mesh->getMeshBuffer(b), factor, layer);
+}
+
+
+//! Scale the level-th texture coords of a meshbuffer.
+void CMeshManipulator::scaleTCoords(scene::IMeshBuffer* buffer, const core::vector2df& factor, u32 level) const
+{
+	if (!buffer || ((level>1) && (buffer->getVertexType() != video::EVT_2TCOORDS)))
+		return;
+
+	const u32 vtxcnt = buffer->getVertexCount();
+
+	if (level==1)
+	{
+		for (u32 i=0; i<vtxcnt; ++i)
+			buffer->getTCoords(i) *= factor;
+	}
+	else
+	{
+		for (u32 i=0; i<vtxcnt; ++i)
+			((SMeshBufferLightMap*)buffer)->Vertices[i].TCoords2 *= factor;
+	}
+}
+
+
 //! Clones a static IMesh into a modifyable SMesh.
 SMesh* CMeshManipulator::createMeshCopy(scene::IMesh* mesh) const
 {
@@ -368,72 +354,25 @@ SMesh* CMeshManipulator::createMeshCopy(scene::IMesh* mesh) const
 
 	for ( u32 b=0; b<meshBufferCount; ++b)
 	{
-		const u32 vtxCnt = mesh->getMeshBuffer(b)->getVertexCount();
-		const u32 idxCnt = mesh->getMeshBuffer(b)->getIndexCount();
-		const u16* idx = mesh->getMeshBuffer(b)->getIndices();
-		u32 i;
-
 		switch(mesh->getMeshBuffer(b)->getVertexType())
 		{
 		case video::EVT_STANDARD:
 			{
-				SMeshBuffer* buffer = new SMeshBuffer();
-				buffer->Material = mesh->getMeshBuffer(b)->getMaterial();
-
-				video::S3DVertex* v =
-					(video::S3DVertex*)mesh->getMeshBuffer(b)->getVertices();
-
-				buffer->Vertices.reallocate(vtxCnt);
-				for (i=0; i<vtxCnt; ++i)
-					buffer->Vertices.push_back(v[i]);
-
-				buffer->Indices.reallocate(idxCnt);
-				for (i=0; i<idxCnt; ++i)
-					buffer->Indices.push_back(idx[i]);
-
-				buffer->setBoundingBox(mesh->getMeshBuffer(b)->getBoundingBox());
+				SMeshBuffer* buffer = new SMeshBuffer(*(SMeshBuffer*)mesh->getMeshBuffer(b));
 				clone->addMeshBuffer(buffer);
 				buffer->drop();
 			}
 			break;
 		case video::EVT_2TCOORDS:
 			{
-				SMeshBufferLightMap* buffer = new SMeshBufferLightMap();
-				buffer->Material = mesh->getMeshBuffer(b)->getMaterial();
-
-				video::S3DVertex2TCoords* v =
-					(video::S3DVertex2TCoords*)mesh->getMeshBuffer(b)->getVertices();
-
-				buffer->Vertices.reallocate(vtxCnt);
-				for (i=0; i<vtxCnt; ++i)
-					buffer->Vertices.push_back(v[i]);
-
-				buffer->Indices.reallocate(idxCnt);
-				for (i=0; i<idxCnt; ++i)
-					buffer->Indices.push_back(idx[i]);
-
-				buffer->setBoundingBox(mesh->getMeshBuffer(b)->getBoundingBox());
+				SMeshBufferLightMap* buffer = new SMeshBufferLightMap(*(SMeshBufferLightMap*)mesh->getMeshBuffer(b));
 				clone->addMeshBuffer(buffer);
 				buffer->drop();
 			}
 			break;
 		case video::EVT_TANGENTS:
 			{
-				SMeshBufferTangents* buffer = new SMeshBufferTangents();
-				buffer->Material = mesh->getMeshBuffer(b)->getMaterial();
-
-				video::S3DVertexTangents* v =
-					(video::S3DVertexTangents*)mesh->getMeshBuffer(b)->getVertices();
-
-				buffer->Vertices.reallocate(vtxCnt);
-				for (i=0; i<vtxCnt; ++i)
-					buffer->Vertices.push_back(v[i]);
-
-				buffer->Indices.reallocate(idxCnt);
-				for (i=0; i<idxCnt; ++i)
-					buffer->Indices.push_back(idx[i]);
-
-				buffer->setBoundingBox(mesh->getMeshBuffer(b)->getBoundingBox());
+				SMeshBufferTangents* buffer = new SMeshBufferTangents(*(SMeshBufferTangents*)mesh->getMeshBuffer(b));
 				clone->addMeshBuffer(buffer);
 				buffer->drop();
 			}
@@ -447,7 +386,6 @@ SMesh* CMeshManipulator::createMeshCopy(scene::IMesh* mesh) const
 }
 
 
-
 //! Creates a planar texture mapping on the mesh
 //! \param mesh: Mesh on which the operation is performed.
 //! \param resolution: resolution of the planar mapping. This is the value
@@ -462,36 +400,47 @@ void CMeshManipulator::makePlanarTextureMapping(scene::IMesh* mesh, f32 resoluti
 	for ( u32 b=0; b<bcount; ++b)
 	{
 		IMeshBuffer* buffer = mesh->getMeshBuffer(b);
-		u32 vtxcnt = buffer->getVertexCount();
 		u32 idxcnt = buffer->getIndexCount();
 		u16* idx = buffer->getIndices();
 
-		switch(buffer->getVertexType())
+		for (u32 i=0; i<idxcnt; i+=3)
 		{
-		case video::EVT_STANDARD:
+			core::plane3df p(buffer->getPosition(idx[i+0]), buffer->getPosition(idx[i+1]), buffer->getPosition(idx[i+2]));
+			p.Normal.X = fabsf(p.Normal.X);
+			p.Normal.Y = fabsf(p.Normal.Y);
+			p.Normal.Z = fabsf(p.Normal.Z);
+			// calculate planar mapping worldspace coordinates
+
+			if (p.Normal.X > p.Normal.Y && p.Normal.X > p.Normal.Z)
 			{
-				video::S3DVertex* v = (video::S3DVertex*)buffer->getVertices();
-				makePlanarMappingT(v, vtxcnt, idx, idxcnt, resolution);
+				for (u32 o=0; o!=3; ++o)
+				{
+					buffer->getTCoords(idx[i+o]).X = buffer->getPosition(idx[i+o]).Y * resolution;
+					buffer->getTCoords(idx[i+o]).Y = buffer->getPosition(idx[i+o]).Z * resolution;
+				}
 			}
-			break;
-		case video::EVT_2TCOORDS:
+			else
+			if (p.Normal.Y > p.Normal.X && p.Normal.Y > p.Normal.Z)
 			{
-				video::S3DVertex2TCoords* v = (video::S3DVertex2TCoords*)buffer->getVertices();
-				makePlanarMappingT(v, vtxcnt, idx, idxcnt, resolution);
+				for (u32 o=0; o!=3; ++o)
+				{
+					buffer->getTCoords(idx[i+o]).X = buffer->getPosition(idx[i+o]).X * resolution;
+					buffer->getTCoords(idx[i+o]).Y = buffer->getPosition(idx[i+o]).Z * resolution;
+				}
 			}
-			break;
-		case video::EVT_TANGENTS:
+			else
 			{
-				video::S3DVertexTangents* v = (video::S3DVertexTangents*)buffer->getVertices();
-				makePlanarMappingT(v, vtxcnt, idx, idxcnt, resolution);
+				for (u32 o=0; o!=3; ++o)
+				{
+					buffer->getTCoords(idx[i+o]).X = buffer->getPosition(idx[i+o]).X * resolution;
+					buffer->getTCoords(idx[i+o]).Y = buffer->getPosition(idx[i+o]).Y * resolution;
+				}
 			}
-			break;
 		}
 	}
 }
 
 
-
 //! Creates a copy of the mesh, which will only consist of unique primitives
 IMesh* CMeshManipulator::createMeshUniquePrimitives(IMesh* mesh) const
 {

source/Irrlicht/CMeshManipulator.h

@@ -53,6 +53,18 @@ public:
 	\param factor Vector which defines the scale for each axis. */
 	virtual void scale(scene::IMeshBuffer* buffer, const core::vector3df& factor) const;
 
+	//! Scale the texture coords of a mesh.
+	/** \param mesh Mesh on which the operation is performed.
+	\param factor Vector which defines the scale for each axis.
+	\param level Number of texture coord, starting from 1. Support for level 2 exists for LightMap buffers. */
+	virtual void scaleTCoords(scene::IMesh* mesh, const core::vector2df& factor, u32 layer=1) const;
+
+	//! Scale the texture coords of a meshbuffer.
+	/** \param mesh Mesh on which the operation is performed.
+	\param factor Vector which defines the scale for each axis.
+	\param level Number of texture coord, starting from 1. Support for level 2 exists for LightMap buffers. */
+	virtual void scaleTCoords(scene::IMeshBuffer* buffer, const core::vector2df& factor, u32 level=1) const;
+
 	//! Applies a transformation to a meshbuffer
 	/** \param buffer: Meshbuffer on which the operation is performed.
 		\param m: matrix. */