projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
textures, lightmaps, hardcoded texture hack for testing
[laserbrain_demo]
/
src
/
scene.h
diff --git
a/src/scene.h
b/src/scene.h
index
066d9dc
..
808b3e6
100644
(file)
--- a/
src/scene.h
+++ b/
src/scene.h
@@
-4,6
+4,7
@@
#include <vector>
#include "mesh.h"
#include "snode.h"
#include <vector>
#include "mesh.h"
#include "snode.h"
+#include "texture.h"
enum {
SCNLOAD_FLIPYZ = 1,
enum {
SCNLOAD_FLIPYZ = 1,
@@
-11,12
+12,17
@@
enum {
};
class Scene {
};
class Scene {
+private:
+ bool own_texset;
+
public:
std::vector<Mesh*> meshes;
std::vector<Object*> objects;
SceneNode *nodes;
public:
std::vector<Mesh*> meshes;
std::vector<Object*> objects;
SceneNode *nodes;
- Scene();
+ TextureSet *texset;
+
+ explicit Scene(TextureSet *tset = 0);
~Scene();
Scene(const Scene &rhs) = delete;
~Scene();
Scene(const Scene &rhs) = delete;