X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmetascene.cc;h=21e9093c56eb90db56a8a4786882f79a7219c083;hb=21f74bf587d9b7a76bc1ee83db02cb8c243dc567;hp=aae7482b5b4f728286bc0a52b0a0ab72d8b2dacd;hpb=dbcb9345c23c5c027d808915962843e7db2d14aa;p=laserbrain_demo

diff --git a/src/metascene.cc b/src/metascene.cc
index aae7482..21e9093 100644
--- a/src/metascene.cc
+++ b/src/metascene.cc
@@ -1,7 +1,10 @@
+#include <string>
+#include <regex>
 #include "metascene.h"
 #include "scene.h"
 #include "datamap.h"
 #include "treestore.h"
+#include "logger.h"
 
 #ifdef WIN32
 #include <malloc.h>
@@ -9,35 +12,75 @@
 #include <alloca.h>
 #endif
 
-static bool proc_node(Scene *scn, struct ts_node *node);
-static bool proc_scenefile(Scene *scn, struct ts_node *node);
+struct MaterialEdit {
+	std::regex name_re;
+	int attr;
+	Texture *tex;
+};
+
+static bool proc_node(MetaScene *mscn, struct ts_node *node);
+static bool proc_scenefile(MetaScene *mscn, struct ts_node *node);
+static bool proc_mtledit(MaterialEdit *med, struct ts_node *node, TextureSet *texset);
+static void apply_mtledit(Scene *scn, const MaterialEdit &med);
+static void apply_mtledit(Material *mtl, const MaterialEdit &med);
 static struct ts_attr *attr_inscope(struct ts_node *node, const char *name);
 
 static void print_scene_graph(SceneNode *n, int level);
 
-bool load_scene(Scene *scn, const char *fname)
+
+MetaScene::MetaScene(SceneSet *sman, TextureSet *tman)
+{
+	sceneman = sman;
+	texman = tman;
+	walk_mesh = 0;
+}
+
+MetaScene::~MetaScene()
+{
+	delete walk_mesh;
+}
+
+
+bool MetaScene::load(const char *fname)
 {
 	struct ts_node *root = ts_load(fname);
 	if(!root || strcmp(root->name, "scene") != 0) {
 		ts_free_tree(root);
-		fprintf(stderr, "failed to load scene metadata: %s\n", fname);
+		error_log("failed to load scene metadata: %s\n", fname);
 		return false;
 	}
 
-	bool res = proc_node(scn, root);
+	bool res = proc_node(this, root);
 	ts_free_tree(root);
 
-	printf("loaded scene: %s\n", fname);
-	printf("scene graph:\n");
+	/*info_log("loaded scene: %s\n", fname);
+	info_log("scene graph:\n");
 	print_scene_graph(scn->nodes, 0);
+	*/
 	return res;
 }
 
-static bool proc_node(Scene *scn, struct ts_node *node)
+void MetaScene::update(float dt)
+{
+	int nscn = scenes.size();
+	for(int i=0; i<nscn; i++) {
+		scenes[i]->update(dt);
+	}
+}
+
+void MetaScene::draw() const
+{
+	int nscn = scenes.size();
+	for(int i=0; i<nscn; i++) {
+		scenes[i]->draw();
+	}
+}
+
+static bool proc_node(MetaScene *mscn, struct ts_node *node)
 {
 	struct ts_node *c = node->child_list;
 	while(c) {
-		if(!proc_node(scn, c)) {
+		if(!proc_node(mscn, c)) {
 			return false;
 		}
 		c = c->next;
@@ -45,7 +88,7 @@ static bool proc_node(Scene *scn, struct ts_node *node)
 
 	// do this last to allow other contents of the node to do their thing
 	if(strcmp(node->name, "scenefile") == 0) {
-		return proc_scenefile(scn, node);
+		return proc_scenefile(mscn, node);
 
 	} else if(strcmp(node->name, "remap") == 0) {
 		const char *match = ts_get_attr_str(node, "match");
@@ -58,22 +101,30 @@ static bool proc_node(Scene *scn, struct ts_node *node)
 	return true;
 }
 
-static bool proc_scenefile(Scene *scn, struct ts_node *node)
+
+
+struct SceneData {
+	std::string walkmesh_regexp;
+	std::vector<MaterialEdit> mtledit;
+};
+
+static bool proc_scenefile(MetaScene *mscn, struct ts_node *node)
 {
 	const char *fname = ts_get_attr_str(node, "file");
 	if(fname) {
+		SceneData *sdat = new SceneData;
+
 		// datapath
 		struct ts_attr *adpath = attr_inscope(node, "datapath");
 		if(adpath && adpath->val.type == TS_STRING) {
-			printf("adding data path: %s\n", adpath->val.str);
+			info_log("adding data path: %s\n", adpath->val.str);
 			datamap_set_path(adpath->val.str);
 		}
 
 		// walkmesh
-		char *walkmesh_regexp = 0;
 		struct ts_attr *awmesh = attr_inscope(node, "walkmesh");
 		if(awmesh && awmesh->val.type == TS_STRING) {
-			walkmesh_regexp = awmesh->val.str;
+			sdat->walkmesh_regexp = std::string(awmesh->val.str);
 		}
 
 		int namesz = datamap_lookup(fname, 0, 0);
@@ -82,37 +133,146 @@ static bool proc_scenefile(Scene *scn, struct ts_node *node)
 			fname = namebuf;
 		}
 
-		if(!(scn->load(fname, SCNLOAD_FLIPTEX))) {
-			return false;
+		// material edits
+		struct ts_node *child = node->child_list;
+		while(child) {
+			MaterialEdit medit;
+			if(proc_mtledit(&medit, child, mscn->texman)) {
+				sdat->mtledit.push_back(medit);
+			}
+			child = child->next;
 		}
 
-		// extract the walk mesh if necessary
-		// XXX as written, this will match even objects loaded by previous scenefile blocks
-		Scene *wscn;
-		if(walkmesh_regexp && (wscn = scn->extract_nodes(walkmesh_regexp))) {
-			// apply all transformations to the meshes
-			wscn->apply_xform();
+		Scene *newscn = mscn->sceneman->get(fname);
+		/* NOTE: setting this after get() is not a race condition, because
+		 * scene_loaded() which uses this, will only run in our main loop during
+		 * SceneSet::update() on the main thread.
+		 */
+		newscn->metascn = mscn;
+		mscn->scndata[newscn] = sdat;
+	}
+	return true;
+}
+
+bool MetaScene::scene_loaded(Scene *newscn)
+{
+	SceneData *sdat = (SceneData*)scndata[newscn];
+	if(!sdat) {
+		error_log("MetaScene::scene_loaded called, but corresponding SceneData not found\n");
+		return false;
+	}
+
+	// extract the walk mesh if necessary
+	Scene *wscn;
+	if(!sdat->walkmesh_regexp.empty() && (wscn = newscn->extract_nodes(sdat->walkmesh_regexp.c_str()))) {
+		// apply all transformations to the meshes
+		wscn->apply_xform();
 
-			int nmeshes = wscn->meshes.size();
-			for(int i=0; i<nmeshes; i++) {
-				Mesh *m = wscn->meshes[i];
+		int nmeshes = wscn->meshes.size();
+		for(int i=0; i<nmeshes; i++) {
+			Mesh *m = wscn->meshes[i];
 
-				if(scn->walk_mesh) {
-					scn->walk_mesh->append(*m);
+			if(walk_mesh) {
+				walk_mesh->append(*m);
+			} else {
+				walk_mesh = m;
+				wscn->remove_mesh(m);	// to save it from destruction
+			}
+		}
+
+		delete wscn;
+	}
+
+	int num_medits = sdat->mtledit.size();
+	for(int i=0; i<num_medits; i++) {
+		// perform material edits
+		apply_mtledit(newscn, sdat->mtledit[i]);
+	}
+
+	scenes.push_back(newscn);
+	return true;
+}
+
+static bool proc_mtledit(MaterialEdit *med, struct ts_node *node, TextureSet *texset)
+{
+	if(strcmp(node->name, "mtledit") != 0) {
+		return false;
+	}
+
+	const char *restr = ".*";
+	struct ts_attr *amtl = ts_get_attr(node, "material");
+	if(amtl && amtl->val.type == TS_STRING) {
+		restr = amtl->val.str;
+	}
+
+	med->name_re = std::regex(restr);
+
+	node = node->child_list;
+	while(node) {
+		struct ts_node *cn = node;
+		node = node->next;
+
+		if(strcmp(cn->name, "texture") == 0) {
+			// add/change/remove a texture
+			struct ts_attr *atype = ts_get_attr(cn, "type");
+			struct ts_attr *afile = ts_get_attr(cn, "file");
+
+			int textype = MTL_TEX_DIFFUSE;
+			if(atype) {
+				if(atype->val.type == TS_STRING) {
+					textype = mtl_parse_type(atype->val.str);
+				} else if(atype->val.type == TS_NUMBER) {
+					textype = atype->val.inum;
+					if(textype < 0 || textype >= NUM_MTL_TEXTURES) {
+						error_log("invalid texture in mtledit: %d\n", textype);
+						continue;
+					}
 				} else {
-					scn->walk_mesh = m;
-					wscn->remove_mesh(m);	// to save it from destruction
+					error_log("unexpected texture type in mtledit: %s\n", atype->val.str);
+					continue;
 				}
 			}
 
-			delete wscn;
+			med->attr = textype;
+
+			if(!afile || !afile->val.str || !*afile->val.str) {
+				// remove
+				med->tex = 0;
+			} else {
+				med->tex = texset->get_texture(afile->val.str, TEX_2D);
+			}
 		}
+		// TODO add more edit modes
 	}
-	datamap_reset();
 
 	return true;
 }
 
+static void apply_mtledit(Scene *scn, const MaterialEdit &med)
+{
+	// search all the objects to find matching material names
+	int nobj = scn->objects.size();
+	for(int i=0; i<nobj; i++) {
+		Object *obj = scn->objects[i];
+		if(std::regex_match(obj->get_name(), med.name_re)) {
+			apply_mtledit(&obj->mtl, med);
+		}
+	}
+}
+
+static void apply_mtledit(Material *mtl, const MaterialEdit &med)
+{
+	// TODO more edit modes...
+	if(med.tex) {
+		mtl->add_texture(med.tex, med.attr);
+	} else {
+		Texture *tex = mtl->stdtex[med.attr];
+		if(tex) {
+			mtl->remove_texture(tex);
+		}
+	}
+}
+
 static struct ts_attr *attr_inscope(struct ts_node *node, const char *name)
 {
 	struct ts_attr *attr = 0;
@@ -128,14 +288,14 @@ static void print_scene_graph(SceneNode *n, int level)
 	if(!n) return;
 
 	for(int i=0; i<level; i++) {
-		fputs("  ", stdout);
+		info_log("  ");
 	}
 
 	int nobj = n->get_num_objects();
 	if(nobj) {
-		printf("%s - %d obj\n", n->get_name(), n->get_num_objects());
+		info_log("%s - %d obj\n", n->get_name(), n->get_num_objects());
 	} else {
-		printf("%s\n", n->get_name());
+		info_log("%s\n", n->get_name());
 	}
 
 	for(int i=0; i<n->get_num_children(); i++) {