X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fexhibit.cc;h=8403550b9a8e2c69c120b5dc0e9fe928ffdbcb19;hp=b8d44cc3bfaaaed6218f18862b2b66702418fe27;hb=91c5d07b779f24afec373047afe401b8811811c7;hpb=ebbb52cd0de8e27817a0770bd7bdb48a58348a02

diff --git a/src/exhibit.cc b/src/exhibit.cc
index b8d44cc..8403550 100644
--- a/src/exhibit.cc
+++ b/src/exhibit.cc
@@ -2,15 +2,9 @@
 #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();
-};
+ExSelection ExSelection::null;
 
 
 // selection
@@ -37,38 +31,39 @@ ExData::~ExData()
 	delete voice;
 }
 
-// private data for each exhibit type
-ExhibitPriv::ExhibitPriv()
-{
-	orig_node = 0;
-}
-
 // exhibit class
 Exhibit::Exhibit()
 {
-	priv = new ExhibitPriv;
+	orig_parent = 0;
+	prev_slot = 0;
 }
 
 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();
+	this->node = node;
+	orig_parent = node->get_parent();
 }
 
 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)
@@ -94,8 +89,10 @@ void Exhibit::post_draw() const
 		glMatrixMode(GL_MODELVIEW);
 		glPopMatrix();
 
-		const AABox &bvol = get_aabox();
-		draw_geom_object(&bvol);
+		if(exsel_hover.ex == this) {
+			const AABox &bvol = get_aabox();
+			draw_geom_object(&bvol);
+		}
 	}
 }