projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ov_open_callbacks doesn't set ass_errno obviously. removed it from the
[laserbrain_demo]
/
src
/
exhibit.h
diff --git
a/src/exhibit.h
b/src/exhibit.h
index
f2c521b
..
9b5c753
100644
(file)
--- a/
src/exhibit.h
+++ b/
src/exhibit.h
@@
-8,7
+8,7
@@
#include "audio/stream.h"
class Exhibit;
#include "audio/stream.h"
class Exhibit;
-class ExhibitPriv;
+class ExhibitSlot;
class Scene;
enum {
class Scene;
enum {
@@
-18,11
+18,14
@@
enum {
class ExSelection {
public:
class ExSelection {
public:
+ static ExSelection null; // null selection
+
Exhibit *ex;
void *obj;
void *data;
Ray selray;
Sphere selsphere;
Exhibit *ex;
void *obj;
void *data;
Ray selray;
Sphere selsphere;
+ float dist;
unsigned int validmask;
ExSelection(Exhibit *ex = 0);
unsigned int validmask;
ExSelection(Exhibit *ex = 0);
@@
-55,9
+58,10
@@
public:
*/
class Exhibit : public Object {
private:
*/
class Exhibit : public Object {
private:
- ExhibitPriv *priv;
+ SceneNode *orig_parent;
public:
public:
+ ExhibitSlot *prev_slot;
std::vector<ExData> data;
Exhibit();
std::vector<ExData> data;
Exhibit();
@@
-73,10
+77,6
@@
public:
virtual void update(float dt = 0.0f) override;
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;
};
virtual const AABox &get_aabox() const override;
};