X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fsceneload.cc;h=6fb17d452d442e68b45bab2b808f1e19ec08a18b;hp=d173538407188325231d11f922ae0141801346b4;hb=dbcb9345c23c5c027d808915962843e7db2d14aa;hpb=72b941af07bbf2673539ad4eea073e68d3bcbbfc

diff --git a/src/sceneload.cc b/src/sceneload.cc
index d173538..6fb17d4 100644
--- a/src/sceneload.cc
+++ b/src/sceneload.cc
@@ -19,7 +19,6 @@
 static bool load_material(Scene *scn, Material *mat, const aiMaterial *aimat);
 static SceneNode *load_node(Scene *scn, const aiScene *aiscn, unsigned int flags, const aiNode *ainode);
 static Mesh *load_mesh(Scene *scn, const aiScene *aiscn, unsigned int flags, const aiMesh *aimesh);
-static void print_nodes(SceneNode *node, int lvl = 0);
 /*static const char *mprop_semantic(int x);
 static int count_textures(const aiMaterial *aimat);*/
 static int assimp_textype(aiTextureType type);
@@ -68,11 +67,6 @@ bool Scene::load(const char *fname, unsigned int flags)
 		root_pos = root_matrix.get_translation();
 		root_rot = root_matrix.get_rotation();
 		root_scaling = root_matrix.get_scaling();
-
-		printf("assimp root node: %s\n", aiscn->mRootNode->mName.data);
-		printf("  pos: %f %f %f\n", root_pos.x, root_pos.y, root_pos.z);
-		printf("  rot: %f %+f %+f %+f\n", root_rot.w, root_rot.x, root_rot.y, root_rot.z);
-		printf("  scaling: %f %f %f\n", root_scaling.x, root_scaling.y, root_scaling.z);
 	}
 
 	// load all meshes
@@ -96,6 +90,7 @@ bool Scene::load(const char *fname, unsigned int flags)
 
 	if(!nodes) {
 		nodes = new SceneNode;
+		nodes->scene = this;
 		nodes->set_name("root");
 		nodes->set_position(root_pos);
 		nodes->set_rotation(root_rot);
@@ -116,7 +111,6 @@ bool Scene::load(const char *fname, unsigned int flags)
 	aiReleaseImport(aiscn);
 	printf("loaded scene file: %s, %d meshes\n", fname, (int)meshes.size());
 	nodes->update(0);
-	print_nodes(nodes);
 	return true;
 }
 
@@ -131,7 +125,7 @@ static bool load_material(Scene *scn, Material *mat, const aiMaterial *aimat)
 	} else {
 		mat->name = "unknown";
 	}
-	printf("load_material: %s\n", mat->name.c_str());
+	//printf("load_material: %s\n", mat->name.c_str());
 
 	if(aiGetMaterialColor(aimat, AI_MATKEY_COLOR_DIFFUSE, &aicol) == 0) {
 		mat->diffuse = Vec3(aicol[0], aicol[1], aicol[2]);
@@ -183,8 +177,6 @@ static bool load_material(Scene *scn, Material *mat, const aiMaterial *aimat)
 			assert(tex);
 			mat->textures.push_back(tex);
 
-			printf("   DBG(%p)\n", (void*)tex);
-
 			if(textype != MTL_TEX_UNKNOWN && !mat->stdtex[textype]) {
 				mat->stdtex[textype] = tex;
 			}
@@ -217,6 +209,7 @@ static SceneNode *load_node(Scene *scn, const aiScene *aiscn, unsigned int flags
 		Mesh *mesh = mesh_by_aimesh[aimesh];
 		if(mesh) {
 			ObjMesh *obj = new ObjMesh;
+			obj->set_name(mesh->get_name());
 			obj->mesh = mesh;
 			// also grab the material of this mesh
 			load_material(scn, &obj->mtl, aiscn->mMaterials[aimesh->mMaterialIndex]);
@@ -241,6 +234,7 @@ static SceneNode *load_node(Scene *scn, const aiScene *aiscn, unsigned int flags
 static Mesh *load_mesh(Scene *scn, const aiScene *aiscn, unsigned int flags, const aiMesh *aimesh)
 {
 	Mesh *mesh = new Mesh;
+	mesh->set_name(aimesh->mName.data);
 
 	int num_verts = aimesh->mNumVertices;
 	int num_faces = aimesh->mNumFaces;
@@ -287,39 +281,9 @@ static Mesh *load_mesh(Scene *scn, const aiScene *aiscn, unsigned int flags, con
 		iptr[2] = aimesh->mFaces[i].mIndices[flags & SCNLOAD_FLIPYZ ? 1 : 2];
 		iptr += 3;
 	}
-
-	AABox bbox = mesh->get_aabbox();
-	printf("mesh bounding box: %f %f %f -> %f %f %f\n", bbox.min.x, bbox.min.y, bbox.min.z,
-			bbox.max.x, bbox.max.y, bbox.max.z);
-
 	return mesh;
 }
 
-static void print_nodes(SceneNode *node, int lvl)
-{
-	Vec3 pos = node->get_node_position();
-	Quat rot = node->get_node_rotation();
-	Vec3 scale = node->get_node_scaling();
-
-	const char *type = node->get_num_objects() > 0 ? "mesh node" : "null node";
-
-	for(int i=0; i<lvl; i++) {
-		fputs("  ", stdout);
-	}
-	printf("%s[%s] p(%g %g %g) rq(%g %+gi %+gj %+gk) s(%g %g %g)\n", type, node->get_name(),
-			pos.x, pos.y, pos.z, rot.w, rot.x, rot.y, rot.z, scale.x, scale.y, scale.z);
-
-	if(node->get_num_objects()) {
-		Mat4 xform = node->get_matrix();
-		xform.print(stdout);
-	}
-
-	int nchld = node->get_num_children();
-	for(int i=0; i<nchld; i++) {
-		print_nodes(node->get_child(i), lvl + 1);
-	}
-}
-
 static int assimp_textype(aiTextureType type)
 {
 	switch(type) {