projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
select and move exhibits
[laserbrain_demo]
/
src
/
exhibit.h
diff --git
a/src/exhibit.h
b/src/exhibit.h
index
004626c
..
f331d99
100644
(file)
--- a/
src/exhibit.h
+++ b/
src/exhibit.h
@@
-1,12
+1,15
@@
#ifndef EXHIBIT_H_
#define EXHIBIT_H_
#ifndef EXHIBIT_H_
#define EXHIBIT_H_
+#include <string>
#include <gmath/gmath.h>
#include "object.h"
#include "geom.h"
#include <gmath/gmath.h>
#include "object.h"
#include "geom.h"
+#include "audio/stream.h"
class Exhibit;
class ExhibitPriv;
class Exhibit;
class ExhibitPriv;
+class Scene;
enum {
EXSEL_RAY = 1,
enum {
EXSEL_RAY = 1,
@@
-20,6
+23,7
@@
public:
void *data;
Ray selray;
Sphere selsphere;
void *data;
Ray selray;
Sphere selsphere;
+ float dist;
unsigned int validmask;
ExSelection(Exhibit *ex = 0);
unsigned int validmask;
ExSelection(Exhibit *ex = 0);
@@
-27,6
+31,24
@@
public:
operator bool() const;
};
operator bool() const;
};
+enum {
+ EXDATA_INFO,
+ EXDATA_VIDEO
+};
+
+class ExData {
+public:
+ int type;
+
+ std::string text;
+ AudioStream *voice;
+ // TODO: video stream
+
+ ExData();
+ ~ExData();
+};
+
+
/* TODO
- select me aktina kai select me sfaira, epistrefei Selection
- hover me aktina kai hover me sfaira
/* TODO
- select me aktina kai select me sfaira, epistrefei Selection
- hover me aktina kai hover me sfaira
@@
-37,20
+59,26
@@
private:
ExhibitPriv *priv;
public:
ExhibitPriv *priv;
public:
+ std::vector<ExData> data;
+
Exhibit();
virtual ~Exhibit();
Exhibit(const Exhibit&) = delete;
Exhibit &operator =(const Exhibit &) = delete;
Exhibit();
virtual ~Exhibit();
Exhibit(const Exhibit&) = delete;
Exhibit &operator =(const Exhibit &) = delete;
+ virtual void set_node(SceneNode *node);
+
virtual ExSelection select(const Ray &ray) const;
virtual ExSelection select(const Sphere &sph) const;
virtual ExSelection select(const Ray &ray) const;
virtual ExSelection select(const Sphere &sph) const;
- virtual void update(float dt = 0.0f);
+ virtual void update(float dt = 0.0f) override;
virtual void pre_draw() const;
virtual void pre_draw() const;
- virtual void draw() const;
+ virtual void draw() const override;
virtual void post_draw() const;
virtual void post_draw() const;
+
+ virtual const AABox &get_aabox() const override;
};
#endif // EXHIBIT_H_
};
#endif // EXHIBIT_H_