X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmetascene.cc;h=6059664a66b51b2b08844504665fda608986fee9;hb=a16a1a6cb3d831842f75e13653934360db617097;hp=e0b2b205137ebff222926101ff7e358229feb041;hpb=12e70d8b9c2d5c81500d7631b9db5d17a34fe918;p=laserbrain_demo diff --git a/src/metascene.cc b/src/metascene.cc index e0b2b20..6059664 100644 --- a/src/metascene.cc +++ b/src/metascene.cc @@ -1,3 +1,4 @@ +#include #include #include #include "metascene.h" @@ -117,10 +118,15 @@ static bool proc_scenefile(MetaScene *mscn, struct ts_node *node) // datapath struct ts_attr *adpath = attr_inscope(node, "datapath"); if(adpath && adpath->val.type == TS_STRING) { - info_log("adding data path: %s\n", adpath->val.str); mscn->datamap.set_path(adpath->val.str); } + // strip path + struct ts_attr *aspath = attr_inscope(node, "strip_path"); + if(aspath && aspath->val.type == TS_NUMBER) { + mscn->datamap.set_strip(aspath->val.inum); + } + // walkmesh struct ts_attr *awmesh = attr_inscope(node, "walkmesh"); if(awmesh && awmesh->val.type == TS_STRING) { @@ -303,7 +309,7 @@ static void apply_mtledit(Scene *scn, const MaterialEdit &med) int nobj = scn->objects.size(); for(int i=0; iobjects[i]; - if(std::regex_match(obj->get_name(), med.name_re)) { + if(std::regex_match(obj->mtl.name, med.name_re)) { apply_mtledit(&obj->mtl, med); } }