X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fexhibit.cc;h=266a5835da32100a90b95028c14842cfbc8e06ff;hp=444fc400bbac8bc674cc66d897a7cff381800fb3;hb=b5ed5107e21ff834d5a4510b9047f976abb03dff;hpb=cddee551d9bc9ec58e15aeb673f7e8fcf3c163ce

diff --git a/src/exhibit.cc b/src/exhibit.cc
index 444fc40..266a583 100644
--- a/src/exhibit.cc
+++ b/src/exhibit.cc
@@ -1,12 +1,20 @@
 #include "exhibit.h"
 #include "snode.h"
+#include "scene.h"
+#include "geomdraw.h"
+#include "app.h"
 
 class ExhibitPriv {
+public:
 	Vec3 orig_pos;
 	Quat orig_rot;
 	SceneNode *orig_node;
+
+	ExhibitPriv();
 };
 
+
+// selection
 ExSelection::ExSelection(Exhibit *ex)
 {
 	this->ex = ex;
@@ -19,10 +27,27 @@ ExSelection::operator bool() const
 	return ex != 0;
 }
 
+// Exhibit data
+ExData::ExData()
+{
+	voice = 0;
+}
+
+ExData::~ExData()
+{
+	delete voice;
+}
+
+// private data for each exhibit type
+ExhibitPriv::ExhibitPriv()
+{
+	orig_node = 0;
+}
+
+// exhibit class
 Exhibit::Exhibit()
 {
 	priv = new ExhibitPriv;
-	priv->orig_node = 0;
 }
 
 Exhibit::~Exhibit()
@@ -30,14 +55,29 @@ Exhibit::~Exhibit()
 	delete priv;
 }
 
+void Exhibit::set_node(SceneNode *node)
+{
+	this->node = priv->orig_node = node;
+	priv->orig_pos = node->get_position();
+	priv->orig_rot = node->get_rotation();
+}
+
 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
 {
-	return ExSelection(0);
+	return ExSelection(0);	// TODO
 }
 
 void Exhibit::update(float dt)
@@ -62,5 +102,17 @@ void Exhibit::post_draw() const
 	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;
+}