Use GL::Renderables and a Pipeline for rendering

[r2c2.git] / source / 3d / layout.cpp

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index b90f553fff3bd1002146a4bdc3611c04eaeb7f35..1b54e4be7509dd487d519d31a14d827557bfb801 100644 (file)
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -1,9 +1,16 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #include <algorithm>
-#include <fstream>
+#include <limits>
 #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;
@@ -13,6 +20,7 @@ namespace Marklin {
 
 Layout3D::Layout3D(Layout &l):
        layout(l),
+       catalogue(layout.get_catalogue()),
        quality(4)
 {
        layout.signal_track_added.connect(sigc::mem_fun(this, &Layout3D::track_added));
@@ -21,44 +29,37 @@ Layout3D::Layout3D(Layout &l):
 
 Layout3D::~Layout3D()
 {
-       for(Track3DSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               delete *i;
+       while(!tracks.empty())
+               delete tracks.front();
 }
 
 void Layout3D::set_quality(unsigned q)
 {
-       quality=q;
-       for(Track3DSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               (*i)->set_quality(quality);
+       quality = q;
+}
+
+void Layout3D::add_track(Track3D &t)
+{
+       tracks.push_back(&t);
 }
 
-void Layout3D::render(bool endpoints)
+void Layout3D::remove_track(Track3D &t)
 {
-       GL::Texture::unbind();
-       glEnable(GL_DEPTH_TEST);
-
-       for(Track3DSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               (*i)->render();
-
-       if(endpoints)
-       {
-               glDepthMask(false);
-               for(Track3DSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-                       (*i)->render_endpoints();
-               glDepthMask(true);
-       }
+       list<Track3D *>::iterator i = find(tracks.begin(), tracks.end(), &t);
+       if(i!=tracks.end())
+               tracks.erase(i);
 }
 
-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;
+       for(list<Track3D *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+               if(&(*i)->get_track()==&t)
+                       return **i;
 
-       return 0;
+       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);
@@ -68,32 +69,32 @@ Track3D *Layout3D::pick_track(float x, float y, float size)
        glLoadIdentity();
 
        double clip[4];
-       clip[0]=1;
-       clip[1]=0;
-       clip[2]=x-size;
-       clip[3]=0;
+       clip[0] = 1;
+       clip[1] = 0;
+       clip[2] = x-size;
+       clip[3] = 0;
        glClipPlane(GL_CLIP_PLANE0, clip);
        glEnable(GL_CLIP_PLANE0);
 
-       clip[0]=-1;
-       clip[2]=-(x+size);
+       clip[0] = -1;
+       clip[2] = -(x+size);
        glClipPlane(GL_CLIP_PLANE1, clip);
        glEnable(GL_CLIP_PLANE1);
 
-       clip[0]=0;
-       clip[1]=1;
-       clip[2]=y-size;
+       clip[0] = 0;
+       clip[1] = 1;
+       clip[2] = y-size;
        glClipPlane(GL_CLIP_PLANE2, clip);
        glEnable(GL_CLIP_PLANE2);
 
-       clip[1]=-1;
-       clip[2]=-(y+size);
+       clip[1] = -1;
+       clip[2] = -(y+size);
        glClipPlane(GL_CLIP_PLANE3, clip);
        glEnable(GL_CLIP_PLANE3);
 
        glPopMatrix();
 
-       render();
+       scene.render(0);
 
        glDisable(GL_CLIP_PLANE0);
        glDisable(GL_CLIP_PLANE1);
@@ -101,30 +102,29 @@ Track3D *Layout3D::pick_track(float x, float y, float size)
        glDisable(GL_CLIP_PLANE3);
 
        GL::render_mode(GL::RENDER);
-       Track3D *track=0;
-       unsigned track_depth=numeric_limits<unsigned>::max();
+       Track3D *track = 0;
+       unsigned track_depth = numeric_limits<unsigned>::max();
        for(vector<GL::SelectRecord>::iterator i=select_buf.begin(); i!=select_buf.end(); ++i)
                if(i->min_depth<track_depth)
                {
-                       track=reinterpret_cast<Track3D *>(i->names.back());
-                       track_depth=i->min_depth;
+                       track = reinterpret_cast<Track3D *>(i->names.back());
+                       track_depth = i->min_depth;
                }
 
        return track;
 }
 
-void Layout3D::track_added(Track *t)
+void Layout3D::track_added(Track &t)
 {
-       tracks.push_back(new Track3D(*t, quality));
+       new Track3D(*this, t);
 }
 
-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);
                        return;
                }
 }