projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed background loading of both textures and scenes
[laserbrain_demo]
/
src
/
metascene.h
diff --git
a/src/metascene.h
b/src/metascene.h
index
00960ca
..
8d0f5c2
100644
(file)
--- a/
src/metascene.h
+++ b/
src/metascene.h
@@
-8,8
+8,6
@@
class MetaScene {
public:
class MetaScene {
public:
- SceneSet *sceneman;
- TextureSet *texman;
DataMap datamap;
std::vector<Scene*> scenes;
DataMap datamap;
std::vector<Scene*> scenes;
@@
-21,7
+19,7
@@
public:
std::map<Scene*, void*> scndata;
std::map<Scene*, void*> scndata;
- MetaScene(SceneSet *sman, TextureSet *tman);
+ MetaScene();
~MetaScene();
bool load(const char *fname);
~MetaScene();
bool load(const char *fname);