X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fexhibit.h;h=9b5c753f4de63aa4030362b2b57a72e1f29c5010;hp=f2c521b5f19af2c3f51dfaa745a500f12ff5cf9f;hb=37b68f014b46922b885c6344d6b069cba3c9c3c5;hpb=03085a16aa2fef785083fa3921be83015e08b290 diff --git a/src/exhibit.h b/src/exhibit.h index f2c521b..9b5c753 100644 --- a/src/exhibit.h +++ b/src/exhibit.h @@ -8,7 +8,7 @@ #include "audio/stream.h" class Exhibit; -class ExhibitPriv; +class ExhibitSlot; class Scene; enum { @@ -18,11 +18,14 @@ enum { class ExSelection { public: + static ExSelection null; // null selection + Exhibit *ex; void *obj; void *data; Ray selray; Sphere selsphere; + float dist; unsigned int validmask; ExSelection(Exhibit *ex = 0); @@ -55,9 +58,10 @@ public: */ class Exhibit : public Object { private: - ExhibitPriv *priv; + SceneNode *orig_parent; public: + ExhibitSlot *prev_slot; std::vector data; Exhibit(); @@ -73,10 +77,6 @@ public: virtual void update(float dt = 0.0f) override; - virtual void pre_draw() const; - virtual void draw() const override; - virtual void post_draw() const; - virtual const AABox &get_aabox() const override; };