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.cc
diff --git
a/src/exhibit.cc
b/src/exhibit.cc
index
d76b291
..
266a583
100644
(file)
--- a/
src/exhibit.cc
+++ b/
src/exhibit.cc
@@
-1,6
+1,8
@@
#include "exhibit.h"
#include "snode.h"
#include "scene.h"
#include "exhibit.h"
#include "snode.h"
#include "scene.h"
+#include "geomdraw.h"
+#include "app.h"
class ExhibitPriv {
public:
class ExhibitPriv {
public:
@@
-11,6
+13,8
@@
public:
ExhibitPriv();
};
ExhibitPriv();
};
+
+// selection
ExSelection::ExSelection(Exhibit *ex)
{
this->ex = ex;
ExSelection::ExSelection(Exhibit *ex)
{
this->ex = ex;
@@
-23,11
+27,24
@@
ExSelection::operator bool() const
return ex != 0;
}
return ex != 0;
}
+// Exhibit data
+ExData::ExData()
+{
+ voice = 0;
+}
+
+ExData::~ExData()
+{
+ delete voice;
+}
+
+// private data for each exhibit type
ExhibitPriv::ExhibitPriv()
{
orig_node = 0;
}
ExhibitPriv::ExhibitPriv()
{
orig_node = 0;
}
+// exhibit class
Exhibit::Exhibit()
{
priv = new ExhibitPriv;
Exhibit::Exhibit()
{
priv = new ExhibitPriv;
@@
-47,12
+64,20
@@
void Exhibit::set_node(SceneNode *node)
ExSelection Exhibit::select(const Ray &ray) const
{
ExSelection Exhibit::select(const Ray &ray) const
{
- return ExSelection(0);
+ ExSelection sel;
+ HitPoint hit;
+ if(get_aabox().intersect(ray, &hit)) {
+ sel.ex = (Exhibit*)this;
+ sel.selray = ray;
+ sel.dist = hit.dist;
+ sel.validmask = EXSEL_RAY;
+ }
+ return sel;
}
ExSelection Exhibit::select(const Sphere &sph) const
{
}
ExSelection Exhibit::select(const Sphere &sph) const
{
- return ExSelection(0);
+ return ExSelection(0); // TODO
}
void Exhibit::update(float dt)
}
void Exhibit::update(float dt)
@@
-77,5
+102,17
@@
void Exhibit::post_draw() const
if(node) {
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
if(node) {
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
+
+ if(exsel_hover.ex == this) {
+ const AABox &bvol = get_aabox();
+ draw_geom_object(&bvol);
+ }
}
}
}
}
+
+
+const AABox &Exhibit::get_aabox() const
+{
+ aabb = node->get_bounds();
+ return aabb;
+}