X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fexman.cc;h=21e00749f7e9a405e3d29649be36f9ebc3b23546;hp=900d860c8465bf3e764f1251f6ed15fcb4a67ebd;hb=b5ed5107e21ff834d5a4510b9047f976abb03dff;hpb=9805564225de579d1f3a3d4942f22f08c5a947c0

diff --git a/src/exman.cc b/src/exman.cc
index 900d860..21e0074 100644
--- a/src/exman.cc
+++ b/src/exman.cc
@@ -1,3 +1,4 @@
+#include <float.h>
 #include <algorithm>
 #include "exman.h"
 #include "exhibit.h"
@@ -73,6 +74,25 @@ bool ExhibitManager::load(MetaScene *mscn, const char *fname)
 				continue;
 			}
 
+			const char *desc = ts_get_attr_str(node, "description");
+			const char *voice = ts_get_attr_str(node, "voiceover");
+			if(desc || voice) {
+				ExData exd;
+
+				if(desc) {
+					exd.text = std::string(desc);
+				}
+				if(voice) {
+					exd.voice = new OggVorbisStream;
+					if(!exd.voice->open(voice)) {
+						error_log("failed to open voiceover: %s\n", voice);
+						delete exd.voice;
+						exd.voice = 0;
+					}
+				}
+				ex->data.push_back(exd);
+			}
+
 			ex->set_node(snode);
 			items.push_back(ex);
 		}
@@ -84,13 +104,18 @@ bool ExhibitManager::load(MetaScene *mscn, const char *fname)
 
 ExSelection ExhibitManager::select(const Ray &ray) const
 {
-	ExSelection sel;
-	if(!items.empty()) {
-		sel.ex = items[0];
-		sel.selray = ray;
-		sel.validmask = EXSEL_RAY;
+	ExSelection nearest;
+	nearest.dist = FLT_MAX;
+
+	int nitems = items.size();
+	for(int i=0; i<nitems; i++) {
+		ExSelection sel = items[i]->select(ray);
+		if(sel && sel.dist < nearest.dist) {
+			nearest = sel;
+		}
 	}
-	return sel;	// TODO
+
+	return nearest;
 }
 
 ExSelection ExhibitManager::select(const Sphere &sph) const