fixed background loading of both textures and scenes

[laserbrain_demo] / src / app.cc

diff --git a/src/app.cc b/src/app.cc
index f92899d..9e5eba3 100644 (file)
--- a/src/app.cc
+++ b/src/app.cc
@@ -26,6 +26,9 @@ float win_aspect;
 bool fb_srgb;
 bool opt_gear_wireframe;
 
+TextureSet texman;
+SceneSet sceneman;
+
 unsigned int sdr_ltmap, sdr_ltmap_notex;
 
 static float cam_dist = 0.0;
@@ -48,8 +51,6 @@ static Vec2 joy_move, joy_look;
 static float joy_deadzone = 0.01;
 
 static Mat4 view_matrix, mouse_view_matrix, proj_matrix;
-static TextureSet texman;
-static SceneSet sceneman;
 static MetaScene *mscn;
 static unsigned int sdr_post_gamma;
 
@@ -98,7 +99,7 @@ bool app_init(int argc, char **argv)
 
        glClearColor(0.2, 0.2, 0.2, 1.0);
 
-       mscn = new MetaScene(&sceneman, &texman);
+       mscn = new MetaScene;
        if(!mscn->load(opt.scenefile ? opt.scenefile : "data/museum.scene")) {
                return false;
        }