X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fscene.h;h=f295bbced04a810bc867419b9a75dff534753291;hb=5d44043a65106ff411abeaaaa80c732a47284024;hp=b9e338ba8397ebd2f002ff240da4ac38e945c5e8;hpb=b30241a8a51be904b22459a1d0cc3322e0a505d9;p=laserbrain_demo diff --git a/src/scene.h b/src/scene.h index b9e338b..f295bbc 100644 --- a/src/scene.h +++ b/src/scene.h @@ -20,9 +20,6 @@ enum { class MetaScene; class Scene { -private: - bool own_texset; - public: MetaScene *metascn; DataMap datamap; @@ -34,16 +31,17 @@ public: Mesh *walk_mesh; - TextureSet *texset; // only owned by Scene if own_texset is true + TextureSet *texset; void *loader_data; - explicit Scene(TextureSet *tset = 0); + explicit Scene(); ~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);