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.cc
diff --git
a/src/scene.cc
b/src/scene.cc
index
27be807
..
8132fe9
100644
(file)
--- a/
src/scene.cc
+++ b/
src/scene.cc
@@
-2,9
+2,17
@@
static void destroy_node_tree(SceneNode *n);
static void destroy_node_tree(SceneNode *n);
-Scene::Scene()
+Scene::Scene(TextureSet *tset)
{
nodes = 0;
{
nodes = 0;
+
+ if(tset) {
+ texset = tset;
+ own_texset = false;
+ } else {
+ texset = new TextureSet;
+ own_texset = true;
+ }
}
Scene::~Scene()
}
Scene::~Scene()
@@
-16,6
+24,11
@@
void Scene::destroy()
{
destroy_node_tree(nodes);
nodes = 0;
{
destroy_node_tree(nodes);
nodes = 0;
+
+ if(own_texset) {
+ delete texset;
+ }
+ texset = 0;
}
// Scene::load defined in sceneload.cc
}
// Scene::load defined in sceneload.cc