projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
background scene file loading introduces race condition with datamaps
[laserbrain_demo]
/
src
/
metascene.h
diff --git
a/src/metascene.h
b/src/metascene.h
index
e793a39
..
5d57ee0
100644
(file)
--- a/
src/metascene.h
+++ b/
src/metascene.h
@@
-1,6
+1,7
@@
#ifndef METASCENE_H_
#define METASCENE_H_
#ifndef METASCENE_H_
#define METASCENE_H_
+#include <map>
#include "scene.h"
#include "mesh.h"
#include "scene.h"
#include "mesh.h"
@@
-15,10
+16,14
@@
public:
Vec3 start_pos;
Quat start_rot;
Vec3 start_pos;
Quat start_rot;
+ std::map<Scene*, void*> scndata;
+
+
MetaScene(SceneSet *sman, TextureSet *tman);
~MetaScene();
bool load(const char *fname);
MetaScene(SceneSet *sman, TextureSet *tman);
~MetaScene();
bool load(const char *fname);
+ bool scene_loaded(Scene *scn);
void update(float dt);
void draw() const;
void update(float dt);
void draw() const;