makefile rules for cross-compiling with mingw-w64

[laserbrain_demo] / src / scene.cc

diff --git a/src/scene.cc b/src/scene.cc
index 651e9c6..35b562d 100644 (file)
--- a/src/scene.cc
+++ b/src/scene.cc
@@ -1,23 +1,19 @@
 #include <regex>
 #include "scene.h"
 #include "objmesh.h"
+#include "app.h"
 
 static void destroy_node_tree(SceneNode *n);
 
-Scene::Scene(TextureSet *tset)
+Scene::Scene()
 {
        metascn = 0;
        nodes = 0;
 
        walk_mesh = 0;
 
-       if(tset) {
-               texset = tset;
-               own_texset = false;
-       } else {
-               texset = new TextureSet;
-               own_texset = true;
-       }
+       texset = 0;
+       loader_data = 0;
 }
 
 Scene::~Scene()
@@ -27,6 +23,17 @@ Scene::~Scene()
 
 void Scene::destroy()
 {
+       clear();
+
+       metascn = 0;
+       texset = 0;
+       loader_data = 0;
+
+       datamap.clear();
+}
+
+void Scene::clear()
+{
        destroy_node_tree(nodes);
        nodes = 0;
 
@@ -42,11 +49,6 @@ void Scene::destroy()
                delete objects[i];
        }
        objects.clear();
-
-       if(own_texset) {
-               delete texset;
-       }
-       texset = 0;
 }
 
 static void destroy_node_tree(SceneNode *n)
@@ -64,12 +66,6 @@ static void destroy_node_tree(SceneNode *n)
 
 bool Scene::merge(Scene *scn)
 {
-       if(texset != scn->texset) {
-               // TODO handle this properly
-               error_log("for now only able to merge scenes using the same texture set\n");
-               return false;
-       }
-
        if(walk_mesh) {
                if(scn->walk_mesh) {
                        walk_mesh->append(*scn->walk_mesh);
@@ -200,6 +196,8 @@ static void find_nodes_rec(std::list<SceneNode*> *res, SceneNode *tree, const st
 
 Scene *Scene::extract_nodes(const char *qstr)
 {
+       if(!nodes) return 0;
+
        std::regex re{qstr};
 
        std::list<SceneNode*> nodelist;
@@ -208,7 +206,7 @@ Scene *Scene::extract_nodes(const char *qstr)
                return 0;
        }
 
-       Scene *res = new Scene(texset);
+       Scene *res = new Scene;
 
        for(SceneNode *n : nodelist) {