X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fexman.cc;h=31ee1aec95457deb536f237c25fd593133c738f6;hp=02f4bc552181dcb954a2cbe2893e2f41501c4b57;hb=37b68f014b46922b885c6344d6b069cba3c9c3c5;hpb=91c5d07b779f24afec373047afe401b8811811c7

diff --git a/src/exman.cc b/src/exman.cc
index 02f4bc5..31ee1ae 100644
--- a/src/exman.cc
+++ b/src/exman.cc
@@ -4,6 +4,8 @@
 #include "exhibit.h"
 #include "blob_exhibit.h"
 #include "treestore.h"
+#include "app.h"
+#include "geomdraw.h"
 
 static Exhibit *create_exhibit(const char *type);
 
@@ -104,6 +106,7 @@ bool ExhibitSlot::detach_exhibit()
 
 ExhibitManager::ExhibitManager()
 {
+	own_scn = 0;
 }
 
 ExhibitManager::~ExhibitManager()
@@ -113,17 +116,16 @@ ExhibitManager::~ExhibitManager()
 
 void ExhibitManager::clear()
 {
-	int num = (int)items.size();
-	for(int i=0; i<num; i++) {
-		delete items[i];
-	}
+	// not deleting exhibit objects, as they will be deleted the own_scn destructor
 	items.clear();
 
-	num = (int)exslots.size();
+	int num = (int)exslots.size();
 	for(int i=0; i<num; i++) {
 		delete exslots[i];
 	}
 	exslots.clear();
+
+	delete own_scn;	// this must be the last thing to destroy
 }
 
 void ExhibitManager::add(Exhibit *ex)
@@ -131,6 +133,8 @@ void ExhibitManager::add(Exhibit *ex)
 	std::vector<Exhibit*>::iterator it = std::find(items.begin(), items.end(), ex);
 	if(it == items.end()) {
 		items.push_back(ex);
+		own_scn->add_object(ex);
+		if(ex->node) own_scn->add_node(ex->node);
 	}
 }
 
@@ -139,6 +143,8 @@ bool ExhibitManager::remove(Exhibit *ex)
 	std::vector<Exhibit*>::iterator it = std::find(items.begin(), items.end(), ex);
 	if(it != items.end()) {
 		items.erase(it);
+		own_scn->remove_object(ex);
+		if(ex->node) own_scn->remove_node(ex->node);
 		return true;
 	}
 	return false;
@@ -153,35 +159,80 @@ bool ExhibitManager::load(MetaScene *mscn, const char *fname)
 		return false;
 	}
 
+	/* create our own scene to manage all exhibits not already in an existing scene
+	 * and add it to the metascene.
+	 * Also exhibit drawing happens due to the renderer drawing the metascene
+	 */
+	if(!own_scn) {
+		own_scn = new Scene;
+		own_scn->name = "ad-hoc exhibits";
+		mscn->scenes.push_back(own_scn);
+	}
+
 	struct ts_node *iter = root->child_list;
 	while(iter) {
 		struct ts_node *node = iter;
 		iter = iter->next;
 
-		if(strcmp(node->name, "item") == 0) {
-			SceneNode *snode;
-
-			const char *amatch = ts_get_attr_str(node, "match_node");
-			if(!amatch || !(snode = mscn->match_node(amatch))) {
-				error_log("ExhibitManager::load: regexp \"%s\" didn't match any nodes\n",
-						amatch ? amatch : "");
-				continue;
-			}
+		SceneNode *snode = 0;
 
+		if(strcmp(node->name, "item") == 0) {
 			Exhibit *ex;
 			const char *atype = ts_get_attr_str(node, "type");
 			if(!atype || !(ex = create_exhibit(atype))) {
 				error_log("failed to create exhibit of type: %s\n", atype);
 				continue;
 			}
-			ex->set_node(snode);
-			items.push_back(ex);
-
 			const char *alabel = ts_get_attr_str(node, "label");
 			if(alabel) {
 				ex->set_name(alabel);
 			}
 
+			const char *amatch = ts_get_attr_str(node, "match_node");
+			if(amatch) {
+				if(!(snode = mscn->match_node(amatch))) {
+					error_log("ExhibitManager::load: regexp \"%s\" didn't match any nodes\n",
+							amatch ? amatch : "");
+					continue;
+				}
+			}
+
+			// add everything to our data structures
+			// equivalent to add_exhibit(ex), but without all the searching
+			own_scn->add_object(ex);
+			if(!snode) {
+				snode = new SceneNode;
+				snode->set_name(ex->get_name());
+				own_scn->add_node(snode);
+			}
+			ex->set_node(snode);
+			items.push_back(ex);
+
+			float *apos = ts_get_attr_vec(node, "pos");
+			if(apos) {
+				snode->set_position(Vec3(apos[0], apos[1], apos[2]));
+			}
+			float *arot_axis = ts_get_attr_vec(node, "rotaxis");
+			if(arot_axis) {
+				float arot_angle = ts_get_attr_num(node, "rotangle", 0.0f);
+				Vec3 axis = Vec3(arot_axis[0], arot_axis[1], arot_axis[2]);
+				Quat q;
+				q.set_rotation(axis, deg_to_rad(arot_angle));
+				snode->set_rotation(q);
+			}
+			struct ts_attr *ascale = ts_get_attr(node, "scale");
+			if(ascale) {
+				switch(ascale->val.type) {
+				case TS_NUMBER:
+					snode->set_scaling(Vec3(ascale->val.fnum, ascale->val.fnum, ascale->val.fnum));
+					break;
+				case TS_VECTOR:
+					snode->set_scaling(Vec3(ascale->val.vec[0], ascale->val.vec[1], ascale->val.vec[2]));
+				default:
+					break;
+				}
+			}
+
 			// create a new slot and attach the exhibit to it
 			ExhibitSlot *slot = new ExhibitSlot(ex);
 			exslots.push_back(slot);
@@ -280,8 +331,8 @@ void ExhibitManager::update(float dt)
 	int num = items.size();
 	for(int i=0; i<num; i++) {
 		// if the exhibit is not part of a scene graph, first call its
-		// node's update function (otherwise it'll have been called recursively earlier)
-		if(!items[i]->node->get_parent()) {
+		// node's update function (otherwise it would have been called recursively earlier)
+		if(items[i]->node && !items[i]->node->get_parent()) {
 			items[i]->node->update(dt);
 		}
 		items[i]->update(dt);
@@ -292,9 +343,10 @@ void ExhibitManager::draw() const
 {
 	int num = items.size();
 	for(int i=0; i<num; i++) {
-		items[i]->pre_draw();
-		items[i]->draw();
-		items[i]->post_draw();
+		if(exsel_hover.ex == items[i]) {
+			const AABox &bvol = items[i]->get_aabox();
+			draw_geom_object(&bvol);
+		}
 	}
 }
 
@@ -305,7 +357,13 @@ static Exhibit *create_exhibit(const char *type)
 		return new Exhibit;
 	} else if(strcmp(type, "blobs") == 0) {
 		debug_log("creating blobs exhibit\n");
-		return new BlobExhibit;
+		BlobExhibit *b = new BlobExhibit;
+		if(!b->init()) {
+			delete b;
+			error_log("failed to initialize blobs exhibit\n");
+			return 0;
+		}
+		return b;
 	}
 	error_log("unknown exhibit type: %s\n", type);
 	return 0;