projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stash/unstash clunky as fuck
[laserbrain_demo]
/
src
/
exman.h
diff --git
a/src/exman.h
b/src/exman.h
index
bbd72fd
..
13d9bcc
100644
(file)
--- a/
src/exman.h
+++ b/
src/exman.h
@@
-17,6
+17,7
@@
private:
Exhibit *ex;
public:
Exhibit *ex;
public:
+ Quat rotation, grab_rot;
SceneNode node;
ExhibitSlot(Exhibit *ex = 0);
SceneNode node;
ExhibitSlot(Exhibit *ex = 0);
@@
-35,9
+36,12
@@
public:
class ExhibitManager {
private:
std::vector<Exhibit*> items, stashed;
class ExhibitManager {
private:
std::vector<Exhibit*> items, stashed;
+ int cur_stashed;
std::vector<ExhibitSlot*> exslots;
// TODO kdtree of slots for quick nearest queries
std::vector<ExhibitSlot*> exslots;
// TODO kdtree of slots for quick nearest queries
+ Scene *own_scn; // scene to manage all exhibits not taken from an existing scene
+
public:
ExhibitManager();
~ExhibitManager();
public:
ExhibitManager();
~ExhibitManager();
@@
-55,6
+59,7
@@
public:
ExhibitSlot *nearest_empty_slot(const Vec3 &pos, float max_dist = 10) const;
void stash_exhibit(Exhibit *ex);
ExhibitSlot *nearest_empty_slot(const Vec3 &pos, float max_dist = 10) const;
void stash_exhibit(Exhibit *ex);
+ Exhibit *unstash_exhibit();
void update(float dt = 0.0f);
void draw() const;
void update(float dt = 0.0f);
void draw() const;