X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.cpp;h=9c260b97a0a6581281dd765c29cac156c25403e8;hb=25b79ab38c2be2e5c89b8240504f641fd9c4899c;hp=b90f553fff3bd1002146a4bdc3611c04eaeb7f35;hpb=6c61179fe09af2f5366d50f10aadbf5f83438087;p=r2c2.git

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index b90f553..9c260b9 100644
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -3,7 +3,7 @@
 #include <msp/gl/rendermode.h>
 #include <msp/gl/select.h>
 #include <msp/gl/texture.h>
-#include <msp/parser/parser.h>
+#include <msp/datafile/parser.h>
 #include "layout.h"
 
 using namespace std;
@@ -21,44 +21,44 @@ Layout3D::Layout3D(Layout &l):
 
 Layout3D::~Layout3D()
 {
-	for(Track3DSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	for(list<Track3D *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		delete *i;
 }
 
 void Layout3D::set_quality(unsigned q)
 {
 	quality=q;
-	for(Track3DSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	for(list<Track3D *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		(*i)->set_quality(quality);
 }
 
-void Layout3D::render(bool endpoints)
+void Layout3D::render(bool endpoints) const
 {
 	GL::Texture::unbind();
 	glEnable(GL_DEPTH_TEST);
 
-	for(Track3DSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	for(list<Track3D *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		(*i)->render();
 
 	if(endpoints)
 	{
 		glDepthMask(false);
-		for(Track3DSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		for(list<Track3D *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 			(*i)->render_endpoints();
 		glDepthMask(true);
 	}
 }
 
-Track3D *Layout3D::get_track(const Track *t)
+Track3D &Layout3D::get_track(const Track &t) const
 {
-	for(Track3DSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if(&(*i)->get_track()==t)
-			return *i;
-
-	return 0;
+	for(list<Track3D *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		if(&(*i)->get_track()==&t)
+			return **i;
+	
+	throw KeyError("Unknown track");
 }
 
-Track3D *Layout3D::pick_track(float x, float y, float size)
+Track3D *Layout3D::pick_track(float x, float y, float size) const
 {
 	vector<GL::SelectRecord> select_buf;
 	GL::select_buffer(select_buf);
@@ -113,15 +113,15 @@ Track3D *Layout3D::pick_track(float x, float y, float size)
 	return track;
 }
 
-void Layout3D::track_added(Track *t)
+void Layout3D::track_added(Track &t)
 {
-	tracks.push_back(new Track3D(*t, quality));
+	tracks.push_back(new Track3D(t, quality));
 }
 
-void Layout3D::track_removed(Track *t)
+void Layout3D::track_removed(Track &t)
 {
-	for(Track3DSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if(&(*i)->get_track()==t)
+	for(list<Track3D *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		if(&(*i)->get_track()==&t)
 		{
 			delete *i;
 			tracks.erase(i);