Simplyfy SNamedPath

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

include/IMeshCache.h

@@ -101,21 +101,21 @@ namespace scene
 		/** \deprecated Use getMeshName() instead. */
 		_IRR_DEPRECATED_ const io::path& getMeshFilename(u32 index) const
 		{
-			return getMeshName(index).getName();
+			return getMeshName(index).getInternalName();
 		}
 
 		//! Get the name of a loaded mesh, if there is any. (Name is often identical to the filename).
 		/** \deprecated Use getMeshName() instead. */
 		_IRR_DEPRECATED_ const io::path& getMeshFilename(const IAnimatedMesh* const mesh) const
 		{
-			return getMeshName(mesh).getName();
+			return getMeshName(mesh).getInternalName();
 		}
 
 		//! Get the name of a loaded mesh, if there is any. (Name is often identical to the filename).
 		/** \deprecated Use getMeshName() instead. */
 		_IRR_DEPRECATED_ const io::path& getMeshFilename(const IMesh* const mesh) const
 		{
-			return getMeshName(mesh).getName();
+			return getMeshName(mesh).getInternalName();
 		}
 
 		//! Renames a loaded mesh.

include/path.h

@@ -26,66 +26,45 @@ struct SNamedPath
 	SNamedPath() {}
 
 	//! Constructor
-	SNamedPath(const path& p) : Path(p), Name( PathToName(p) )
+	SNamedPath(const path& p) : Path(p), InternalName( PathToName(p) )
 	{
 	}
 
 	//! Is smaller comparator
 	bool operator <(const SNamedPath& other) const
 	{
-		return Name < other.Name;
+		return InternalName < other.InternalName;
 	}
 
-	//! Set the path. As the name depends on the path the name will also be changed.
+	//! Set the path.
 	void setPath(const path& p)
 	{
 		Path = p;
-		Name = PathToName(p);
+		InternalName = PathToName(p);
 	}
 
-	//! Get the path. This is the original, unprocessed string passed to SNamedPath.
+	//! Get the path.
 	const path& getPath() const
 	{
 		return Path;
 	};
 
-	//! Give the file a new name which is used for identification.
-	void rename(const path& name)
-	{
-		Name = name;
-	};
-
-	//! Has the file been given a new name?
-	bool isRenamed() const
-	{
-		// Note: memory over speed here because of the typical use-cases.
-		return PathToName(Path) != Name;
-	}
-
 	//! Get the name which is used to identify the file.
 	//! This string is similar to the names and filenames used before Irrlicht 1.7
-	const path& getName() const
+	const path& getInternalName() const
 	{
-		return Name;
+		return InternalName;
 	}
 
 	//! Implicit cast to io::path
 	operator core::stringc() const
 	{
-		return core::stringc(getSerializationName());
+		return core::stringc(getPath());
 	}
 	//! Implicit cast to io::path
 	operator core::stringw() const
 	{
-		return core::stringw(getSerializationName());
-	}
-
-	//! Returns the string which should be used in serialization.
-	const path& getSerializationName() const
-	{
-		if ( isRenamed() )
-			return getName();
-		return Path;
+		return core::stringw(getPath());
 	}
 
 protected:
@@ -100,7 +79,7 @@ protected:
 
 private:
 	path Path;
-	path Name;
+	path InternalName;
 };
 
 } // io

source/Irrlicht/CAnimatedMeshSceneNode.cpp

@@ -770,7 +770,7 @@ void CAnimatedMeshSceneNode::serializeAttributes(io::IAttributes* out, io::SAttr
 {
 	IAnimatedMeshSceneNode::serializeAttributes(out, options);
 
-	out->addString("Mesh", SceneManager->getMeshCache()->getMeshName(Mesh).getSerializationName().c_str());
+	out->addString("Mesh", SceneManager->getMeshCache()->getMeshName(Mesh).getPath().c_str());
 	out->addBool("Looping", Looping);
 	out->addBool("ReadOnlyMaterials", ReadOnlyMaterials);
 	out->addFloat("FramesPerSecond", FramesPerSecond);
@@ -784,7 +784,7 @@ void CAnimatedMeshSceneNode::deserializeAttributes(io::IAttributes* in, io::SAtt
 {
 	IAnimatedMeshSceneNode::deserializeAttributes(in, options);
 
-	io::path oldMeshStr = SceneManager->getMeshCache()->getMeshName(Mesh).getSerializationName();
+	io::path oldMeshStr = SceneManager->getMeshCache()->getMeshName(Mesh).getPath();
 	io::path newMeshStr = in->getAttributeAsString("Mesh");
 
 	Looping = in->getAttributeAsBool("Looping");

source/Irrlicht/CAttributeImpl.h

@@ -1828,13 +1828,13 @@ public:
 
 	virtual core::stringw getStringW()
 	{
-		return core::stringw(Value ? Value->getName().getSerializationName().c_str() : 0);
+		return core::stringw(Value ? Value->getName().getPath().c_str() : 0);
 	}
 
 	virtual core::stringc getString()
 	{
 		// since texture names can be stringw we are careful with the types
-		return core::stringc(Value ? Value->getName().getSerializationName().c_str() : 0);
+		return core::stringc(Value ? Value->getName().getPath().c_str() : 0);
 	}
 
 	virtual void setString(const char* text)

source/Irrlicht/CGUIEnvironment.cpp

@@ -1375,7 +1375,7 @@ IGUIFont* CGUIEnvironment::getFont(const io::path& filename)
 		else if (t==EGFT_VECTOR)
 		{
 			// todo: vector fonts
-			os::Printer::log("Unable to load font, XML vector fonts are not supported yet", f.NamedPath.getName().c_str(), ELL_ERROR);
+			os::Printer::log("Unable to load font, XML vector fonts are not supported yet", f.NamedPath.getPath().c_str(), ELL_ERROR);
 
 			//CGUIFontVector* font = new CGUIFontVector(Driver);
 			//ifont = (IGUIFont*)font;

source/Irrlicht/CMeshCache.cpp

@@ -163,7 +163,7 @@ bool CMeshCache::renameMesh(u32 index, const io::path& name)
 	if (index >= Meshes.size())
 		return false;
 
-	Meshes[index].NamedPath.rename(name);
+	Meshes[index].NamedPath.setPath(name);
 	Meshes.sort();
 	return true;
 }
@@ -175,7 +175,7 @@ bool CMeshCache::renameMesh(const IAnimatedMesh* const mesh, const io::path& nam
 	{
 		if (Meshes[i].Mesh == mesh)
 		{
-			Meshes[i].NamedPath.rename(name);
+			Meshes[i].NamedPath.setPath(name);
 			Meshes.sort();
 			return true;
 		}
@@ -191,7 +191,7 @@ bool CMeshCache::renameMesh(const IMesh* const mesh, const io::path& name)
 	{
 		if (Meshes[i].Mesh && Meshes[i].Mesh->getMesh(0) == mesh)
 		{
-			Meshes[i].NamedPath.rename(name);
+			Meshes[i].NamedPath.setPath(name);
 			Meshes.sort();
 			return true;
 		}

source/Irrlicht/CMeshSceneNode.cpp

@@ -318,14 +318,14 @@ void CMeshSceneNode::serializeAttributes(io::IAttributes* out, io::SAttributeRea
 {
 	IMeshSceneNode::serializeAttributes(out, options);
 
-	out->addString("Mesh", SceneManager->getMeshCache()->getMeshName(Mesh).getSerializationName().c_str());
+	out->addString("Mesh", SceneManager->getMeshCache()->getMeshName(Mesh).getPath().c_str());
 	out->addBool("ReadOnlyMaterials", ReadOnlyMaterials);
 }
 
 //! Reads attributes of the scene node.
 void CMeshSceneNode::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options)
 {
-	io::path oldMeshStr = SceneManager->getMeshCache()->getMeshName(Mesh).getSerializationName();
+	io::path oldMeshStr = SceneManager->getMeshCache()->getMeshName(Mesh).getPath();
 	io::path newMeshStr = in->getAttributeAsString("Mesh");
 	ReadOnlyMaterials = in->getAttributeAsBool("ReadOnlyMaterials");
 

source/Irrlicht/CNullDriver.cpp

@@ -351,7 +351,7 @@ void CNullDriver::renameTexture(ITexture* texture, const io::path& newName)
 	// this method, because the textures will need resorting afterwards
 
 	io::SNamedPath& name = const_cast<io::SNamedPath&>(texture->getName());
-	name.rename(newName);
+	name.setPath(newName);
 
 	Textures.sort();
 }

source/Irrlicht/COBJMeshWriter.cpp

@@ -64,7 +64,7 @@ bool COBJMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 fla
 
 	// write OBJ MESH header
 
-	const core::stringc name(FileSystem->getFileBasename(SceneManager->getMeshCache()->getMeshName(mesh).getSerializationName(), false)+".mtl");
+	const core::stringc name(FileSystem->getFileBasename(SceneManager->getMeshCache()->getMeshName(mesh).getPath(), false)+".mtl");
 	file->write("# exported by Irrlicht\n",23);
 	file->write("mtllib ",7);
 	file->write(name.c_str(),name.size());
@@ -192,7 +192,7 @@ bool COBJMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 fla
 			if (mat[i]->getTexture(0))
 			{
 				file->write("map_Kd ", 7);
-				file->write(mat[i]->getTexture(0)->getName().getSerializationName().c_str(), mat[i]->getTexture(0)->getName().getSerializationName().size());
+				file->write(mat[i]->getTexture(0)->getName().getPath().c_str(), mat[i]->getTexture(0)->getName().getPath().size());
 				file->write("\n",1);
 			}
 			file->write("\n",1);

source/Irrlicht/COctTreeSceneNode.cpp

@@ -284,7 +284,7 @@ bool COctTreeSceneNode::createTree(IMesh* mesh)
 	if (!mesh)
 		return false;
 
-	MeshName = SceneManager->getMeshCache()->getMeshName( mesh ).getSerializationName();
+	MeshName = SceneManager->getMeshCache()->getMeshName( mesh ).getPath();
 
     mesh->grab();
 	deleteTree();

source/Irrlicht/CSTLMeshWriter.cpp

@@ -66,7 +66,7 @@ bool CSTLMeshWriter::writeMeshBinary(io::IWriteFile* file, scene::IMesh* mesh, s
 	// write STL MESH header
 
 	file->write("binary ",7);
-	const core::stringc name(SceneManager->getMeshCache()->getMeshName(mesh).getSerializationName());
+	const core::stringc name(SceneManager->getMeshCache()->getMeshName(mesh).getPath());
 	const s32 sizeleft = 73-name.size(); // 80 byte header
 	if (sizeleft<0)
 		file->write(name.c_str(),73);
@@ -115,7 +115,7 @@ bool CSTLMeshWriter::writeMeshASCII(io::IWriteFile* file, scene::IMesh* mesh, s3
 	// write STL MESH header
 
 	file->write("solid ",6);
-	const core::stringc name(SceneManager->getMeshCache()->getMeshName(mesh).getSerializationName());
+	const core::stringc name(SceneManager->getMeshCache()->getMeshName(mesh).getPath());
 	file->write(name.c_str(),name.size());
 	file->write("\n\n",2);
 

source/Irrlicht/CWaterSurfaceSceneNode.cpp

@@ -100,7 +100,7 @@ void CWaterSurfaceSceneNode::serializeAttributes(io::IAttributes* out, io::SAttr
 
 	CMeshSceneNode::serializeAttributes(out, options);
 	// serialize original mesh
-	out->setAttribute("Mesh", SceneManager->getMeshCache()->getMeshName(OriginalMesh).getSerializationName().c_str());
+	out->setAttribute("Mesh", SceneManager->getMeshCache()->getMeshName(OriginalMesh).getPath().c_str());
 }
 
 

tests/tests-last-passed-at.txt

-Test suite pass at GMT Sun Dec  6 20:41:05 2009
+Test suite pass at GMT Mon Dec  7 22:44:25 2009