projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of goat:git/laserbrain_demo
[laserbrain_demo]
/
src
/
scene.h
diff --git
a/src/scene.h
b/src/scene.h
index
3712ee6
..
f295bbc
100644
(file)
--- a/
src/scene.h
+++ b/
src/scene.h
@@
-7,6
+7,7
@@
#include "snode.h"
#include "texture.h"
#include "dataset.h"
#include "snode.h"
#include "texture.h"
#include "dataset.h"
+#include "datamap.h"
enum {
SCNLOAD_FLIPYZ = 1,
enum {
SCNLOAD_FLIPYZ = 1,
@@
-16,11
+17,13
@@
enum {
SCNLOAD_STAGE_GL = 0x8000
};
SCNLOAD_STAGE_GL = 0x8000
};
-class Scene {
-private:
- bool own_texset;
+class MetaScene;
+class Scene {
public:
public:
+ MetaScene *metascn;
+ DataMap datamap;
+
// meshes objects and nodes are owned by Scene
std::vector<Mesh*> meshes;
std::vector<Object*> objects;
// meshes objects and nodes are owned by Scene
std::vector<Mesh*> meshes;
std::vector<Object*> objects;
@@
-28,16
+31,17
@@
public:
Mesh *walk_mesh;
Mesh *walk_mesh;
- TextureSet *texset; // only owned by Scene if own_texset is true
+ TextureSet *texset;
void *loader_data;
void *loader_data;
- explicit Scene(TextureSet *tset = 0);
+ explicit Scene();
~Scene();
Scene(const Scene &rhs) = delete;
Scene &operator =(const Scene &rhs) = delete;
void destroy();
~Scene();
Scene(const Scene &rhs) = delete;
Scene &operator =(const Scene &rhs) = delete;
void destroy();
+ void clear(); // clear all contents (meshes, objects, and nodes)
bool load(const char *fname, unsigned int flags = 0);
bool load(const char *fname, unsigned int flags = 0);
@@
-73,7
+77,6
@@
public:
void draw() const;
};
void draw() const;
};
-
class SceneSet : public DataSet<Scene*> {
private:
static Scene *create_scene();
class SceneSet : public DataSet<Scene*> {
private:
static Scene *create_scene();