projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
material editing in scene metafile
[laserbrain_demo]
/
src
/
scene.h
diff --git
a/src/scene.h
b/src/scene.h
index
acabd10
..
a8c8e6a
100644
(file)
--- a/
src/scene.h
+++ b/
src/scene.h
@@
-36,6
+36,9
@@
public:
bool load(const char *fname, unsigned int flags = 0);
bool load(const char *fname, unsigned int flags = 0);
+ // merge scn into this scene, leaving scn empty and safe to destroy
+ bool merge(Scene *scn);
+
void add_object(Object *obj);
bool remove_object(Object *obj);
bool have_object(Object *obj) const;
void add_object(Object *obj);
bool remove_object(Object *obj);
bool have_object(Object *obj) const;