projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed the clear color to white, to show up through the window
[laserbrain_demo]
/
src
/
metascene.h
diff --git
a/src/metascene.h
b/src/metascene.h
index
e793a39
..
8d0f5c2
100644
(file)
--- a/
src/metascene.h
+++ b/
src/metascene.h
@@
-1,13
+1,14
@@
#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"
+#include "datamap.h"
class MetaScene {
public:
class MetaScene {
public:
- SceneSet *sceneman;
- TextureSet *texman;
+ DataMap datamap;
std::vector<Scene*> scenes;
std::vector<Scene*> scenes;
@@
-15,10
+16,14
@@
public:
Vec3 start_pos;
Quat start_rot;
Vec3 start_pos;
Quat start_rot;
- MetaScene(SceneSet *sman, TextureSet *tman);
+ std::map<Scene*, void*> scndata;
+
+
+ MetaScene();
~MetaScene();
bool load(const char *fname);
~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;