Made geometry creation use IMesh instead of IAnimatedMesh. Moved Sphere...

Made geometry creation use IMesh instead of IAnimatedMesh. Moved Sphere meshbuffer into geometry creator and changed sphere scene node accordingly.

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

include/IAnimatedMesh.h

@@ -98,8 +98,8 @@ namespace scene
 
 		//! Returns the type of the animated mesh.
 		/** In most cases it is not neccessary to use this method.
-		This is useful for making a save downcast, for example
-		if getMeshType() returns EAMT_MD2, its save to cast the
+		This is useful for making a safe downcast. For example,
+		if getMeshType() returns EAMT_MD2 it's safe to cast the
 		IAnimatedMesh to IAnimatedMeshMD2.
 		\returns Type of the mesh. */
 		virtual E_ANIMATED_MESH_TYPE getMeshType() const

include/ISceneManager.h

@@ -745,7 +745,7 @@ namespace scene
 		 and looks like a plane with some hills on it. It is uses mostly for quick
 		 tests of the engine only. You can specify how many hills there should be
 		 on the plane and how high they should be. Also you must specify a name for
-		 the mesh, because the mesh is added to the mesh pool, and can be retieved
+		 the mesh, because the mesh is added to the mesh pool, and can be retrieved
 		 again using ISceneManager::getMesh() with the name as parameter.
 		 \param name: The name of this mesh which must be specified in order
 		 to be able to retrieve the mesh later with ISceneManager::getMesh().
@@ -779,7 +779,7 @@ namespace scene
 		 (8000x8000 pixels would be no problem) because the generator splits the
 		 files into smaller textures if necessary.
 		 You must specify a name for the mesh, because the mesh is added to the mesh pool,
-		 and can be retieved again using ISceneManager::getMesh() with the name as parameter.
+		 and can be retrieved again using ISceneManager::getMesh() with the name as parameter.
 		 \param meshname: The name of this mesh which must be specified in order
 		 to be able to retrieve the mesh later with ISceneManager::getMesh().
 		 \param texture: Texture for the terrain. Please note that this is not a
@@ -810,6 +810,11 @@ namespace scene
 				f32 height=1.f, f32 cylinderHeight=0.6f,
 				f32 width0=0.05f, f32 width1=0.3f) = 0;
 
+		//! add a static sphere mesh to the meshpool
+		virtual IAnimatedMesh* addSphereMesh(const c8* name,
+				f32 radius=5.f, u32 polyCountX = 16,
+				u32 polyCountY = 16) = 0;
+
 		//! Returns the root scene node.
 		/** This is the scene node which is parent
 		 of all scene nodes. The root scene node is a special scene node which

include/plane3d.h

@@ -31,15 +31,15 @@ class plane3d
 
 		// Constructors
 
-		plane3d(): Normal(0,1,0) { recalculateD(vector3d<T>(0,0,0)); };
-		plane3d(const vector3d<T>& MPoint, const vector3d<T>& Normal) : Normal(Normal) { recalculateD(MPoint); };
-		plane3d(T px, T py, T pz, T nx, T ny, T nz) : Normal(nx, ny, nz) { recalculateD(vector3d<T>(px, py, pz)); };
-		plane3d(const vector3d<T>& point1, const vector3d<T>& point2, const vector3d<T>& point3) { setPlane(point1, point2, point3); };
+		plane3d(): Normal(0,1,0) { recalculateD(vector3d<T>(0,0,0)); }
+		plane3d(const vector3d<T>& MPoint, const vector3d<T>& Normal) : Normal(Normal) { recalculateD(MPoint); }
+		plane3d(T px, T py, T pz, T nx, T ny, T nz) : Normal(nx, ny, nz) { recalculateD(vector3d<T>(px, py, pz)); }
+		plane3d(const vector3d<T>& point1, const vector3d<T>& point2, const vector3d<T>& point3) { setPlane(point1, point2, point3); }
 
 		// operators
 
-		inline bool operator==(const plane3d<T>& other) const { return (D==other.D && Normal==other.Normal);};
-		inline bool operator!=(const plane3d<T>& other) const { return !(D==other.D && Normal==other.Normal);};
+		inline bool operator==(const plane3d<T>& other) const { return (D==other.D && Normal==other.Normal);}
+		inline bool operator!=(const plane3d<T>& other) const { return !(D==other.D && Normal==other.Normal);}
 
 		// functions
 

source/Irrlicht/CGeometryCreator.h

@@ -5,7 +5,7 @@
 #ifndef __C_GEOMETRY_CREATOR_H_INCLUDED__
 #define __C_GEOMETRY_CREATOR_H_INCLUDED__
 
-#include "IAnimatedMesh.h"
+#include "IMesh.h"
 #include "IImage.h"
 
 
@@ -26,23 +26,24 @@ class CGeometryCreator
 {
 public:
 
-	static IAnimatedMesh* createHillPlaneMesh(
+	static IMesh* createHillPlaneMesh(
 		const core::dimension2d<f32>& tileSize, const core::dimension2d<s32>& tileCount,
-		video::SMaterial* material,	f32 hillHeight, const core::dimension2d<f32>& countHills,
+		video::SMaterial* material, f32 hillHeight, const core::dimension2d<f32>& countHills,
 		const core::dimension2d<f32>& textureRepeatCount);
 
-	static IAnimatedMesh* createTerrainMesh(video::IImage* texture,
+	static IMesh* createTerrainMesh(video::IImage* texture,
 		video::IImage* heightmap, const core::dimension2d<f32>& stretchSize,
 		f32 maxHeight, video::IVideoDriver* driver,
 		const core::dimension2d<s32> defaultVertexBlockSize,
 		bool debugBorders=false);
 
-	static IAnimatedMesh* createArrowMesh(const u32 tesselationCylinder,
+	static IMesh* createArrowMesh(const u32 tesselationCylinder,
 			const u32 tesselationCone, const f32 height,
 			const f32 cylinderHeight, const f32 width0,
 			const f32 width1, const video::SColor vtxColor0,
 			const video::SColor vtxColor1);
 
+	static IMesh* createSphereMesh(f32 radius, u32 polyCountX, u32 polyCountY);
 };
 
 

source/Irrlicht/CMeshSceneNode.cpp

@@ -206,7 +206,7 @@ const core::aabbox3d<f32>& CMeshSceneNode::getBoundingBox() const
 
 //! returns the material based on the zero based index i. To get the amount
 //! of materials used by this scene node, use getMaterialCount().
-//! This function is needed for inserting the node into the scene hirachy on a
+//! This function is needed for inserting the node into the scene hierarchy on a
 //! optimal position for minimizing renderstate changes, but can also be used
 //! to directly modify the material of a scene node.
 video::SMaterial& CMeshSceneNode::getMaterial(u32 i)

source/Irrlicht/CNullDriver.cpp

@@ -1199,7 +1199,7 @@ void CNullDriver::setFog(SColor color, bool linearFog, f32 start, f32 end, f32 d
 
 
 //! Draws a mesh buffer
-void CNullDriver::drawMeshBuffer( const scene::IMeshBuffer* mb)
+void CNullDriver::drawMeshBuffer(const scene::IMeshBuffer* mb)
 {
 	if (!mb)
 		return;

source/Irrlicht/CSceneManager.h

@@ -179,7 +179,7 @@ namespace scene
 		//! and looks like a plane with some hills on it. It is uses mostly for quick
 		//! tests of the engine only. You can specify how many hills there should be 
 		//! on the plane and how high they should be. Also you must specify a name for
-		//! the mesh, because the mesh is added to the mesh pool, and can be retieved
+		//! the mesh, because the mesh is added to the mesh pool, and can be retrieved
 		//! again using ISceneManager::getMesh with the name as parameter.
 		virtual IAnimatedMesh* addHillPlaneMesh(const c8* name,
 			const core::dimension2d<f32>& tileSize, const core::dimension2d<s32>& tileCount,
@@ -199,6 +199,10 @@ namespace scene
 				f32 height, f32 cylinderHeight, f32 width0,
 				f32 width1);
 
+		//! Adds a static sphere mesh to the mesh pool.
+		IAnimatedMesh* CSceneManager::addSphereMesh(const c8* name,
+				f32 radius, u32 polyCountX, u32 polyCountY);
+
 		//! Adds a particle system scene node. 
 		virtual IParticleSystemSceneNode* addParticleSystemSceneNode(
 			bool withDefaultEmitter=true, ISceneNode* parent=0, s32 id=-1,

source/Irrlicht/CSphereSceneNode.cpp

@@ -5,6 +5,7 @@
 #include "CSphereSceneNode.h"
 #include "IVideoDriver.h"
 #include "ISceneManager.h"
+#include "CGeometryCreator.h"
 #include "S3DVertex.h"
 #include "os.h"
 
@@ -16,14 +17,14 @@ namespace scene
 //! constructor
 CSphereSceneNode::CSphereSceneNode(f32 radius, u32 polyCountX, u32 polyCountY, ISceneNode* parent, ISceneManager* mgr, s32 id,
 			const core::vector3df& position, const core::vector3df& rotation, const core::vector3df& scale)
-: ISceneNode(parent, mgr, id, position, rotation, scale), Radius(radius),
-	PolyCountX(polyCountX), PolyCountY(polyCountY)
+: ISceneNode(parent, mgr, id, position, rotation, scale), Mesh(0),
+	Radius(radius), PolyCountX(polyCountX), PolyCountY(polyCountY)
 {
 	#ifdef _DEBUG
 	setDebugName("CSphereSceneNode");
 	#endif
 
-	setSizeAndPolys();
+	Mesh = CGeometryCreator::createSphereMesh(radius, polyCountX, polyCountY);
 }
 
 
@@ -31,186 +32,27 @@ CSphereSceneNode::CSphereSceneNode(f32 radius, u32 polyCountX, u32 polyCountY, I
 //! destructor
 CSphereSceneNode::~CSphereSceneNode()
 {
+	if (Mesh)
+		Mesh->drop();
 }
 
 
-void CSphereSceneNode::setSizeAndPolys()
-{
-	// thanks to Alfaz93 who made his code available for Irrlicht on which
-	// this one is based!
-
-	// we are creating the sphere mesh here.
-
-	if (PolyCountX < 2)
-		PolyCountX = 2;
-	if (PolyCountY < 2)
-		PolyCountY = 2;
-	if (PolyCountX * PolyCountY > 32767) // prevent u16 overflow
-		if (PolyCountX > PolyCountY) // prevent u16 overflow
-			PolyCountX = 32767/PolyCountY-1;
-		else
-			PolyCountY = 32767/(PolyCountX+1);
-
-	u32 PolyCountXPitch = PolyCountX+1; // get to same vertex on next level
-	Buffer.Vertices.set_used((PolyCountXPitch * PolyCountY) + 2);
-	Buffer.Indices.set_used((PolyCountX * PolyCountY) * 6);
-
-	video::SColor clr(100, 255,255,255);
-
-	u32 i=0;
-	u32 level = 0;
-
-	for (u32 p1 = 0; p1 < PolyCountY-1; ++p1)
-	{
-		//main quads, top to bottom
-		for (u32 p2 = 0; p2 < PolyCountX - 1; ++p2)
-		{
-			const u32 curr = level + p2;
-			Buffer.Indices[i] = curr + PolyCountXPitch;
-			Buffer.Indices[++i] = curr;
-			Buffer.Indices[++i] = curr + 1;
-			Buffer.Indices[++i] = curr + PolyCountXPitch;
-			Buffer.Indices[++i] = curr+1;
-			Buffer.Indices[++i] = curr + 1 + PolyCountXPitch;
-			++i;
-		}
-
-		// the connectors from front to end
-		Buffer.Indices[i] = level + PolyCountX - 1 + PolyCountXPitch;
-		Buffer.Indices[++i] = level + PolyCountX - 1;
-		Buffer.Indices[++i] = level + PolyCountX;
-		++i;
-
-		Buffer.Indices[i] = level + PolyCountX - 1 + PolyCountXPitch;
-		Buffer.Indices[++i] = level + PolyCountX;
-		Buffer.Indices[++i] = level + PolyCountX + PolyCountXPitch;
-		++i;
-		level += PolyCountXPitch;
-	}
-
-	const u32 PolyCountSq = PolyCountXPitch * PolyCountY; // top point
-	const u32 PolyCountSq1 = PolyCountSq + 1; // bottom point
-	const u32 PolyCountSqM1 = (PolyCountY - 1) * PolyCountXPitch; // last row's first vertex
-
-	for (u32 p2 = 0; p2 < PolyCountX - 1; ++p2)
-	{
-		// create triangles which are at the top of the sphere
-
-		Buffer.Indices[i] = PolyCountSq;
-		Buffer.Indices[++i] = p2 + 1;
-		Buffer.Indices[++i] = p2;
-		++i;
-
-		// create triangles which are at the bottom of the sphere
-
-		Buffer.Indices[i] = PolyCountSqM1 + p2;
-		Buffer.Indices[++i] = PolyCountSqM1 + p2 + 1;
-		Buffer.Indices[++i] = PolyCountSq1;
-		++i;
-	}
-
-	// create final triangle which is at the top of the sphere
-
-	Buffer.Indices[i] = PolyCountSq;
-	Buffer.Indices[++i] = PolyCountX;
-	Buffer.Indices[++i] = PolyCountX-1;
-	++i;
-
-	// create final triangle which is at the bottom of the sphere
-
-	Buffer.Indices[i] = PolyCountSqM1 + PolyCountX - 1;
-	Buffer.Indices[++i] = PolyCountSqM1;
-	Buffer.Indices[++i] = PolyCountSq1;
-
-	// calculate the angle which separates all points in a circle
-	const f64 AngleX = 2 * core::PI / PolyCountX;
-	const f64 AngleY = core::PI / PolyCountY;
-
-	i = 0;
-	f64 axz;
-
-	// we don't start at 0.
-
-	f64 ay = 0;//AngleY / 2;
-
-	for (u32 y = 0; y < PolyCountY; ++y)
-	{
-		ay += AngleY;
-		const f64 sinay = sin(ay);
-		axz = 0;
-
-		// calculate the necessary vertices without the doubled one
-		for (u32 xz = 0;xz < PolyCountX; ++xz)
-		{
-			// calculate points position
-
-			const core::vector3df pos((f32)(Radius * cos(axz) * sinay),
-						(f32)(Radius * cos(ay)),
-						(f32)(Radius * sin(axz) * sinay));
-			// for spheres the normal is the position
-			core::vector3df normal(pos);
-			normal.normalize();
-
-			// calculate texture coordinates via sphere mapping
-			// tu is the same on each level, so only calculate once
-			f32 tu = 0.5f;
-			if (y==0)
-			{
-				if (normal.Y != -1.0f && normal.Y != 1.0f)
-					tu = (f32)(acos(core::clamp(normal.X/sinay, -1.0, 1.0)) * 0.5 *core::RECIPROCAL_PI64);
-				if (normal.Z < 0.0f)
-					tu=1-tu;
-			}
-			else
-				tu = Buffer.Vertices[i-PolyCountXPitch].TCoords.X;
-			Buffer.Vertices[i] = video::S3DVertex(pos.X, pos.Y, pos.Z,
-						normal.X, normal.Y, normal.Z,
-						clr, tu,
-						(f32)(ay*core::RECIPROCAL_PI64));
-			++i;
-			axz += AngleX;
-		}
-		// This is the doubled vertex on the initial position
-		Buffer.Vertices[i] = video::S3DVertex(Buffer.Vertices[i-PolyCountX]);
-		Buffer.Vertices[i].TCoords.X=1.0f;
-		++i;
-	}
-
-	// the vertex at the top of the sphere
-	Buffer.Vertices[i] = video::S3DVertex(0.0f,Radius,0.0f, 0.0f,1.0f,0.0f, clr, 0.5f, 0.0f);
-
-	// the vertex at the bottom of the sphere
-	++i;
-	Buffer.Vertices[i] = video::S3DVertex(0.0f,-Radius,0.0f, 0.0f,-1.0f,0.0f, clr, 0.5f, 1.0f);
-
-	// recalculate bounding box
-
-	Buffer.BoundingBox.reset(Buffer.Vertices[i].Pos);
-	Buffer.BoundingBox.addInternalPoint(Buffer.Vertices[i-1].Pos);
-	Buffer.BoundingBox.addInternalPoint(Radius,0.0f,0.0f);
-	Buffer.BoundingBox.addInternalPoint(-Radius,0.0f,0.0f);
-	Buffer.BoundingBox.addInternalPoint(0.0f,0.0f,Radius);
-	Buffer.BoundingBox.addInternalPoint(0.0f,0.0f,-Radius);
-}
-
-
-
 //! renders the node.
 void CSphereSceneNode::render()
 {
 	video::IVideoDriver* driver = SceneManager->getVideoDriver();
 
-	if (Buffer.Vertices.size() && Buffer.Indices.size())
+	if (Mesh && driver)
 	{
-		driver->setMaterial(Buffer.Material);
+		driver->setMaterial(Mesh->getMeshBuffer(0)->getMaterial());
 		driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
-		driver->drawMeshBuffer(&Buffer);
+		driver->drawMeshBuffer(Mesh->getMeshBuffer(0));
 		if ( DebugDataVisible & scene::EDS_BBOX )
 		{
 			video::SMaterial m;
 			m.Lighting = false;
 			driver->setMaterial(m);
-			driver->draw3DBox(Buffer.BoundingBox, video::SColor(255,255,255,255));
+			driver->draw3DBox(Mesh->getMeshBuffer(0)->getBoundingBox(), video::SColor(255,255,255,255));
 		}
 	}
 }
@@ -220,7 +62,7 @@ void CSphereSceneNode::render()
 //! returns the axis aligned bounding box of this node
 const core::aabbox3d<f32>& CSphereSceneNode::getBoundingBox() const
 {
-	return Buffer.BoundingBox;
+	return Mesh ? Mesh->getBoundingBox() : Box;
 }
 
 
@@ -240,7 +82,10 @@ void CSphereSceneNode::OnRegisterSceneNode()
 //! to directly modify the material of a scene node.
 video::SMaterial& CSphereSceneNode::getMaterial(u32 i)
 {
-	return Buffer.Material;
+	if (i>0 || !Mesh)
+		return ISceneNode::getMaterial(i);
+	else
+		return Mesh->getMeshBuffer(i)->getMaterial();
 }
 
 
@@ -280,7 +125,11 @@ void CSphereSceneNode::deserializeAttributes(io::IAttributes* in, io::SAttribute
 	Radius = irr::core::max_(Radius, 0.0001f);
 
 	if ( !core::equals(Radius, oldRadius) || PolyCountX != oldPolyCountX || PolyCountY != oldPolyCountY)
-		setSizeAndPolys();
+	{
+		if (Mesh)
+			Mesh->drop();
+		Mesh = CGeometryCreator::createSphereMesh(Radius, PolyCountX, PolyCountY);
+	}
 
 	ISceneNode::deserializeAttributes(in, options);
 }
@@ -288,14 +137,16 @@ void CSphereSceneNode::deserializeAttributes(io::IAttributes* in, io::SAttribute
 //! Creates a clone of this scene node and its children.
 ISceneNode* CSphereSceneNode::clone(ISceneNode* newParent, ISceneManager* newManager)
 {
-	if (!newParent) newParent = Parent;
-	if (!newManager) newManager = SceneManager;
+	if (!newParent)
+		newParent = Parent;
+	if (!newManager)
+		newManager = SceneManager;
 
 	CSphereSceneNode* nb = new CSphereSceneNode(Radius, PolyCountX, PolyCountY, newParent, 
 		newManager, ID, RelativeTranslation);
 
 	nb->cloneMembers(this, newManager);
-	nb->Buffer.Material = Buffer.Material;
+	nb->getMaterial(0) = Mesh->getMeshBuffer(0)->getMaterial();
 
 	nb->drop();
 	return nb;

source/Irrlicht/CSphereSceneNode.h

@@ -6,7 +6,7 @@
 #define __C_SHPERE_SCENE_NODE_H_INCLUDED__
 
 #include "ISceneNode.h"
-#include "SMeshBuffer.h"
+#include "IMesh.h"
 
 namespace irr
 {
@@ -57,9 +57,8 @@ namespace scene
 
 	private:
 
-		void setSizeAndPolys();
-
-		SMeshBuffer Buffer;
+		IMesh* Mesh;
+		core::aabbox3d<f32> Box;
 		f32 Radius;
 		u32 PolyCountX;
 		u32 PolyCountY;