projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/nuclear/code/laserbrain/demo
[laserbrain_demo]
/
src
/
exhibit.cc
diff --git
a/src/exhibit.cc
b/src/exhibit.cc
index
444fc40
..
2e81854
100644
(file)
--- a/
src/exhibit.cc
+++ b/
src/exhibit.cc
@@
-1,12
+1,11
@@
#include "exhibit.h"
#include "snode.h"
#include "exhibit.h"
#include "snode.h"
+#include "scene.h"
-class ExhibitPriv {
- Vec3 orig_pos;
- Quat orig_rot;
- SceneNode *orig_node;
-};
+ExSelection ExSelection::null;
+
+// selection
ExSelection::ExSelection(Exhibit *ex)
{
this->ex = ex;
ExSelection::ExSelection(Exhibit *ex)
{
this->ex = ex;
@@
-19,48
+18,58
@@
ExSelection::operator bool() const
return ex != 0;
}
return ex != 0;
}
-Exhibit::Exhibit()
+// Exhibit data
+ExData::ExData()
{
{
- priv = new ExhibitPriv;
- priv->orig_node = 0;
+ voice = 0;
}
}
-Exhibit::~Exhibit()
+ExData::~ExData()
{
{
- delete priv;
+ delete voice;
}
}
-ExSelection Exhibit::select(const Ray &ray) const
+// exhibit class
+Exhibit::Exhibit()
{
{
- return ExSelection(0);
+ orig_parent = 0;
+ prev_slot = 0;
}
}
-ExSelection Exhibit::select(const Sphere &sph) const
+Exhibit::~Exhibit()
{
{
- return ExSelection(0);
}
}
-void Exhibit::update(float dt)
+void Exhibit::set_node(SceneNode *node)
{
{
+ this->node = node;
+ orig_parent = node->get_parent();
}
}
-void Exhibit::pre_draw() const
+ExSelection Exhibit::select(const Ray &ray) const
{
{
- if(node) {
- glMatrixMode(GL_MODELVIEW);
- glPushMatrix();
- glMultMatrixf(node->get_matrix()[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;
}
}
-void Exhibit::draw() const
+ExSelection Exhibit::select(const Sphere &sph) const
{
{
+ return ExSelection(0); // TODO
}
}
-void Exhibit::post_draw() const
+void Exhibit::update(float dt)
{
{
- if(node) {
- glMatrixMode(GL_MODELVIEW);
- glPopMatrix();
- }
+}
+
+const AABox &Exhibit::get_aabox() const
+{
+ aabb = node->get_bounds();
+ return aabb;
}
}