GRAPHICS: Use generateIDNumberString() instead of generateIDRandomStr…

…ing() generateIDRandomString() is slower...
xoreos · Mar 20, 2014 · a707290 · a707290
1 parent d7ed7eb
commit a707290
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/src/graphics/aurora/cube.cpp b/src/graphics/aurora/cube.cpp
@@ -75,7 +75,7 @@ namespace Graphics {
 namespace Aurora {
 
 Cube::Cube(const Common::UString &texture, const Common::UString &scene) : Renderable(scene), _entity(0) {
-	Common::UString name = Common::generateIDRandomString();
+	Common::UString name = Common::generateIDNumberString();
 
 	try {
 		Ogre::MeshPtr mesh = getOgreMeshManager().createManual(name.c_str(), "General");

diff --git a/src/graphics/aurora/model.cpp b/src/graphics/aurora/model.cpp
@@ -273,7 +273,7 @@ void Model::collectMaterials(std::list<Ogre::MaterialPtr> &materials, bool makeD
 
 void Model::createNode(NodeEntity *&nodeEntity, State *state, Common::UString name, Ogre::SceneNode *parent) {
 	if (name.empty())
-		name = Common::generateIDRandomString();
+		name = Common::generateIDNumberString();
 
 	// Create a node entitiy in this state
 	std::pair<NodeEntities::iterator, bool> node = state->nodeEntities.insert(std::make_pair(name, NodeEntity()));
@@ -303,7 +303,7 @@ void Model::createNode(NodeEntity *&nodeEntity, State *state, Common::UString na
 Ogre::Entity *Model::createEntity(const VertexDeclaration &vertexDecl, const Ogre::MaterialPtr &material) {
 	// Create a mesh according to the vertex declaration
 
-	Ogre::MeshPtr mesh = Ogre::MeshManager::getSingleton().createManual(Common::generateIDRandomString().c_str(), "General");
+	Ogre::MeshPtr mesh = Ogre::MeshManager::getSingleton().createManual(Common::generateIDNumberString().c_str(), "General");
 	Ogre::SubMesh *subMesh = mesh->createSubMesh();
 
 	createMesh(subMesh, vertexDecl);

diff --git a/src/graphics/aurora/model_kotor.cpp b/src/graphics/aurora/model_kotor.cpp
@@ -220,7 +220,7 @@ void Model_KotOR::load(ParserContext &ctx) {
 
 	readStrings(*ctx.mdl, nameOffsets, ctx.offModelData, ctx.names);
 
-	_rootNode = getOgreSceneManager(_scene).getRootSceneNode()->createChildSceneNode(Common::generateIDRandomString().c_str());
+	_rootNode = getOgreSceneManager(_scene).getRootSceneNode()->createChildSceneNode(Common::generateIDNumberString().c_str());
 	_rootNode->setVisible(false);
 
 	_states.insert(std::make_pair("", new State));

diff --git a/src/graphics/aurora/model_nwn.cpp b/src/graphics/aurora/model_nwn.cpp
@@ -273,7 +273,7 @@ void Model_NWN::loadBinary(ParserContext &ctx) {
 
 	_superModelName.readFixedASCII(*ctx.mdl, 64);
 
-	_rootNode = getOgreSceneManager(_scene).getRootSceneNode()->createChildSceneNode(Common::generateIDRandomString().c_str());
+	_rootNode = getOgreSceneManager(_scene).getRootSceneNode()->createChildSceneNode(Common::generateIDNumberString().c_str());
 	_rootNode->setVisible(false);
 
 	_states.insert(std::make_pair("", new State));
@@ -293,7 +293,7 @@ void Model_NWN::loadBinary(ParserContext &ctx) {
 }
 
 void Model_NWN::loadASCII(ParserContext &ctx) {
-	_rootNode = getOgreSceneManager(_scene).getRootSceneNode()->createChildSceneNode(Common::generateIDRandomString().c_str());
+	_rootNode = getOgreSceneManager(_scene).getRootSceneNode()->createChildSceneNode(Common::generateIDNumberString().c_str());
 	_rootNode->setVisible(false);
 
 	_states.insert(std::make_pair("", new State));
@@ -834,7 +834,7 @@ void Model_NWN::readBinaryAnim(ParserContext &ctx, uint32 offset) {
 	float animLength = ctx.mdl->readIEEEFloatLE();
 	float transTime  = ctx.mdl->readIEEEFloatLE();
 
-	ctx.state->animation = getOgreSceneManager(_scene).createAnimation(Common::generateIDRandomString().c_str(), animLength);
+	ctx.state->animation = getOgreSceneManager(_scene).createAnimation(Common::generateIDNumberString().c_str(), animLength);
 
 	Common::UString animRoot;
 	animRoot.readFixedASCII(*ctx.mdl, 64);

diff --git a/src/graphics/aurora/model_nwn2.cpp b/src/graphics/aurora/model_nwn2.cpp
@@ -117,7 +117,7 @@ void Model_NWN2::load(ParserContext &ctx) {
 		packetKey->offset    = ctx.mdb->readUint32LE();
 	}
 
-	_rootNode = getOgreSceneManager(_scene).getRootSceneNode()->createChildSceneNode(Common::generateIDRandomString().c_str());
+	_rootNode = getOgreSceneManager(_scene).getRootSceneNode()->createChildSceneNode(Common::generateIDNumberString().c_str());
 	_rootNode->setVisible(false);
 
 	_states.insert(std::make_pair("", new State));

diff --git a/src/graphics/aurora/model_witcher.cpp b/src/graphics/aurora/model_witcher.cpp
@@ -179,7 +179,7 @@ void Model_Witcher::load(ParserContext &ctx) {
 
 	ctx.mdb->skip(16);
 
-	_rootNode = getOgreSceneManager(_scene).getRootSceneNode()->createChildSceneNode(Common::generateIDRandomString().c_str());
+	_rootNode = getOgreSceneManager(_scene).getRootSceneNode()->createChildSceneNode(Common::generateIDNumberString().c_str());
 	_rootNode->setVisible(false);
 
 	_states.insert(std::make_pair("", new State));

diff --git a/src/graphics/aurora/quad.cpp b/src/graphics/aurora/quad.cpp
@@ -109,7 +109,7 @@ Ogre::Entity *createQuadEntity(float width, float height, Ogre::MaterialPtr mate
 	vertexDecl.bufferIndices[4] = 0;
 	vertexDecl.bufferIndices[5] = 3;
 
-	Common::UString name = Common::generateIDRandomString();
+	Common::UString name = Common::generateIDNumberString();
 
 	Ogre::MeshPtr mesh = getOgreMeshManager().createManual(name.c_str(), "General");
 	Ogre::SubMesh *subMesh = mesh->createSubMesh();
@@ -164,7 +164,7 @@ Quad::~Quad() {
 }
 
 void Quad::createRootNode() {
-	Common::UString name = Common::generateIDRandomString();
+	Common::UString name = Common::generateIDNumberString();
 
 	_rootNode = getOgreSceneManager(_scene).getRootSceneNode()->createChildSceneNode(name.c_str());
 }

diff --git a/src/graphics/aurora/text.cpp b/src/graphics/aurora/text.cpp
@@ -104,7 +104,7 @@ void Text::create() {
 		return RequestMan.callInMainThread(functor);
 	}
 
-	_rootNode = getOgreSceneManager(_scene).getRootSceneNode()->createChildSceneNode(Common::generateIDRandomString().c_str());
+	_rootNode = getOgreSceneManager(_scene).getRootSceneNode()->createChildSceneNode(Common::generateIDNumberString().c_str());
 
 	createText();
 }

diff --git a/src/graphics/aurora/ttffont.cpp b/src/graphics/aurora/ttffont.cpp
@@ -81,7 +81,7 @@ void TTFFont::Page::createTexture() {
 		return RequestMan.callInMainThread(functor);
 	}
 
-	const Common::UString name = Common::generateIDRandomString();
+	const Common::UString name = Common::generateIDNumberString();
 
 	const Ogre::TextureType texType = Ogre::TEX_TYPE_2D;
 

diff --git a/src/graphics/materialman.cpp b/src/graphics/materialman.cpp
@@ -347,7 +347,7 @@ Common::UString MaterialManager::canonicalName(const MaterialDeclaration &decl)
 }
 
 Common::UString MaterialManager::dynamicName() {
-	return Common::UString("dynamic/") + Common::generateIDRandomString();
+	return Common::UString("dynamic/") + Common::generateIDNumberString();
 }
 
 } // End of namespace Graphics