X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fsceneload.cc;h=4c0d3241f096ac4c4ca0389678ec35419f03a5df;hp=58d186558c161e332281c0a0f44260a7223d0c3e;hb=e12a327cc0b4f1e59f4a66a80b170ec41ce97be6;hpb=68e71418a70dab4174981d5a579e96a9089f8682

diff --git a/src/sceneload.cc b/src/sceneload.cc
index 58d1865..4c0d324 100644
--- a/src/sceneload.cc
+++ b/src/sceneload.cc
@@ -68,6 +68,9 @@ bool Scene::load(const char *fname, unsigned int flags)
 		}
 
 		info_log("Loading scene file: %s\n", fname);
+		if(this->name.empty()) {
+			this->name = std::string(fname);
+		}
 
 		const aiScene *aiscn = aiImportFile(fname, ppflags);
 		if(!aiscn) {
@@ -75,6 +78,27 @@ bool Scene::load(const char *fname, unsigned int flags)
 			return false;
 		}
 
+		LoaderData *ldata = new LoaderData;
+		ldata->aiscn = aiscn;
+		ldata->fname = std::string(fname);
+		loader_data = (void*)ldata;
+	}
+
+	/* then, assuming we have successfully loaded everything, proceed to construct
+	 * all the engine objects, which require access to the OpenGL context
+	 */
+	if(flags & SCNLOAD_STAGE_GL) {
+		if(!loader_data) {
+			error_log("second stage scene loader failed to find valid I/O data\n");
+			return false;
+		}
+
+		LoaderData *ldata = (LoaderData*)loader_data;
+		const aiScene *aiscn = ldata->aiscn;
+		fname = ldata->fname.c_str();
+
+		clear();	// clear any previous data (TODO: add flag for not clearing)
+
 		// assimp adds its own root node, which might have transformations
 		Vec3 root_pos, root_scaling(1.0, 1.0, 1.0);
 		Quat root_rot;
@@ -95,25 +119,6 @@ bool Scene::load(const char *fname, unsigned int flags)
 			nodes->set_scaling(root_scaling);
 		}
 
-		LoaderData *ldata = new LoaderData;
-		ldata->aiscn = aiscn;
-		ldata->fname = std::string(fname);
-		loader_data = (void*)ldata;
-	}
-
-	/* then, assuming we have successfully loaded everything, proceed to construct
-	 * all the engine objects, which require access to the OpenGL context
-	 */
-	if(flags & SCNLOAD_STAGE_GL) {
-		if(!loader_data) {
-			error_log("second stage scene loader failed to find valid I/O data\n");
-			return false;
-		}
-
-		LoaderData *ldata = (LoaderData*)loader_data;
-		const aiScene *aiscn = ldata->aiscn;
-		fname = ldata->fname.c_str();
-
 		// load all meshes
 		for(unsigned int i=0; i<aiscn->mNumMeshes; i++) {
 			aiMesh *aimesh = aiscn->mMeshes[i];
@@ -379,7 +384,6 @@ Scene *SceneSet::create_scene()
 
 bool SceneSet::load_scene(Scene *scn, const char *fname)
 {
-	scn->clear();
 	return scn->load(fname, SCNLOAD_FLIPTEX | SCNLOAD_STAGE_IO);
 }