GRAPHICS: Move _fileName and _name into Model

xoreos · Jan 29, 2014 · 09c2959 · 09c2959
1 parent c5b5a22
commit 09c2959
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 17 deletions.
diff --git a/src/graphics/aurora/model.cpp b/src/graphics/aurora/model.cpp
@@ -66,7 +66,9 @@ Model::State::State(const Common::UString &n) : name(n), animation(0), animation
 }
 
 
-Model::Model(const Common::UString &scene) : Renderable(scene), _currentState(0) {
+Model::Model(const Common::UString &file, const Common::UString &scene) : Renderable(scene),
+	_fileName(file), _currentState(0) {
+
 }
 
 Model::~Model() {

diff --git a/src/graphics/aurora/model.h b/src/graphics/aurora/model.h
@@ -58,7 +58,7 @@ namespace Aurora {
 
 class Model : public Renderable {
 public:
-	Model(const Common::UString &scene = "world");
+	Model(const Common::UString &file, const Common::UString &scene = "world");
 	~Model();
 
 	/** Return the name of every state in this model. */
@@ -119,6 +119,9 @@ class Model : public Renderable {
 	typedef std::map<Common::UString, Model *> ModelMap;
 
 
+	Common::UString _fileName;
+	Common::UString _name;
+
 	StateMap   _states;
 	EntityList _entities;
 

diff --git a/src/graphics/aurora/model_kotor.cpp b/src/graphics/aurora/model_kotor.cpp
@@ -145,7 +145,7 @@ void Model_KotOR::ParserContext::newNode() {
 
 
 Model_KotOR::Model_KotOR(const Common::UString &name, bool kotor2, const Common::UString &texture, const Common::UString &scene) :
-	Model(scene), _fileName(name) {
+	Model(name, scene) {
 
 	ParserContext ctx(name, kotor2, texture);
 

diff --git a/src/graphics/aurora/model_kotor.h b/src/graphics/aurora/model_kotor.h
@@ -79,9 +79,6 @@ class Model_KotOR : public Model {
 		void newNode();
 	};
 
-	Common::UString _fileName;
-	Common::UString _name;
-
 
 	void load(ParserContext &ctx);
 	void loadNode(ParserContext &ctx, Ogre::SceneNode *parent);

diff --git a/src/graphics/aurora/model_nwn.cpp b/src/graphics/aurora/model_nwn.cpp
@@ -208,7 +208,7 @@ Model_NWN::MeshASCII::MeshASCII() : vCount(0), tCount(0), faceCount(0) {
 
 
 Model_NWN::Model_NWN(const Common::UString &name, const Common::UString &texture, const Common::UString &scene) :
-	Model(scene), _fileName(name) {
+	Model(name, scene) {
 
 	ParserContext ctx(name, texture);
 

diff --git a/src/graphics/aurora/model_nwn.h b/src/graphics/aurora/model_nwn.h
@@ -101,8 +101,6 @@ class Model_NWN : public Model {
 		MeshASCII();
 	};
 
-	Common::UString _fileName;
-	Common::UString _name;
 
 	Common::UString _superModelName;
 

diff --git a/src/graphics/aurora/model_nwn2.cpp b/src/graphics/aurora/model_nwn2.cpp
@@ -85,7 +85,7 @@ void Model_NWN2::ParserContext::newNode() {
 }
 
 
-Model_NWN2::Model_NWN2(const Common::UString &name, const Common::UString &scene) : Model(scene), _fileName(name) {
+Model_NWN2::Model_NWN2(const Common::UString &name, const Common::UString &scene) : Model(name, scene) {
 	ParserContext ctx(name);
 
 	load(ctx);

diff --git a/src/graphics/aurora/model_nwn2.h b/src/graphics/aurora/model_nwn2.h
@@ -77,9 +77,6 @@ class Model_NWN2 : public Model {
 		void newNode();
 	};
 
-	Common::UString _fileName;
-	Common::UString _name;
-
 
 	void load(ParserContext &ctx);
 	void loadNode(ParserContext &ctx, Ogre::SceneNode *parent, uint32 type);

diff --git a/src/graphics/aurora/model_witcher.cpp b/src/graphics/aurora/model_witcher.cpp
@@ -99,7 +99,7 @@ void Model_Witcher::ParserContext::newNode() {
 }
 
 
-Model_Witcher::Model_Witcher(const Common::UString &name, const Common::UString &scene) : Model(scene), _fileName(name) {
+Model_Witcher::Model_Witcher(const Common::UString &name, const Common::UString &scene) : Model(name, scene) {
 	ParserContext ctx(name);
 
 	load(ctx);

diff --git a/src/graphics/aurora/model_witcher.h b/src/graphics/aurora/model_witcher.h
@@ -82,9 +82,6 @@ class Model_Witcher : public Model {
 		void newNode();
 	};
 
-	Common::UString _fileName;
-	Common::UString _name;
-
 
 	void load(ParserContext &ctx);
 	void loadNode(ParserContext &ctx, Ogre::SceneNode *parent);