Render tracks through GL::Objects

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

diff --git a/source/3d/tracktype.cpp b/source/3d/tracktype.cpp
index 6dab43c4f7d59de418bcbbe8622fba641298e7d4..d76e8ebe6bfcb136b54c965ce593abf9bba01cfe 100644 (file)
--- a/source/3d/tracktype.cpp
+++ b/source/3d/tracktype.cpp
@@ -1,13 +1,13 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #include <algorithm>
 #include <cmath>
-#include <msp/gl/meshbuilder.h>
+#include <msp/gl/technique.h>
 #include "catalogue.h"
 #include "tracktype.h"
 
@@ -16,7 +16,7 @@ using namespace Msp;
 
 namespace {
 
-bool compare_z(const Marklin::Point &p1, const Marklin::Point &p2)
+bool compare_z(const R2C2::Point &p1, const R2C2::Point &p2)
 {
        return p1.z<p2.z;
 }
@@ -27,7 +27,7 @@ Iter graham_scan(Iter begin, Iter end)
        // http://en.wikipedia.org/wiki/Graham_scan
 
        // Find point with lowest X coordinate
-       Marklin::Point lowest = *begin;
+       R2C2::Point lowest = *begin;
        for(Iter i=begin; i!=end; ++i)
                if(i->x<lowest.x || (i->x==lowest.x && i->y>lowest.y))
                        lowest = *i;
@@ -69,12 +69,11 @@ Iter graham_scan(Iter begin, Iter end)
 
 }
 
-namespace Marklin {
+namespace R2C2 {
 
-TrackType3D::TrackType3D(const Catalogue3D &cat3d, const TrackType &tt):
+TrackType3D::TrackType3D(Catalogue3D &cat3d, const TrackType &tt):
        catalogue(cat3d),
-       ballast_mesh((GL::NORMAL3, GL::COLOR4_UBYTE, GL::VERTEX3)),
-       rail_mesh((GL::NORMAL3, GL::COLOR4_UBYTE, GL::VERTEX3))
+       mesh((GL::NORMAL3, GL::TEXCOORD2, GL::VERTEX3))
 {
        const Catalogue &cat = cat3d.get_catalogue();
        const vector<TrackPart> &parts = tt.get_parts();
@@ -93,37 +92,36 @@ TrackType3D::TrackType3D(const Catalogue3D &cat3d, const TrackType &tt):
 
        {
                unsigned index = 0;
-               GL::MeshBuilder bld(ballast_mesh);
-               bld.color(0.25f, 0.25f, 0.25f);
+               GL::MeshBuilder bld(mesh);
+               bld.texcoord(0.25, 0.5);
                for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
                        build_part(*i, ballast_profile, Point(0, -ballast_min.y), bld, index);
-       }
 
-       {
-               unsigned index = 0;
-               GL::MeshBuilder bld(rail_mesh);
-               bld.color(0.85f, 0.85f, 0.85f);
+               bld.texcoord(0.75, 0.5);
                float y = ballast_h-rail_min.y;
                for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
                        build_part(*i, rail_profile, Point(-gauge/2-rail_max.x, y), bld, index);
                for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
                        build_part(*i, rail_profile, Point(gauge/2-rail_min.x, y), bld, index);
        }
+
+       object.set_mesh(&mesh);
+       object.set_technique(catalogue.get<GL::Technique>(cat.get_track_technique()));
  
        unsigned paths = tt.get_paths();
        for(unsigned i=0; paths; ++i, paths>>=1)
        {
-               GL::Mesh *mesh = 0;
+               GL::Mesh *m = 0;
                if(paths&1)
                {
-                       mesh = new GL::Mesh(GL::VERTEX3);
-                       GL::MeshBuilder bld(*mesh);
+                       m = new GL::Mesh(GL::VERTEX3);
+                       GL::MeshBuilder bld(*m);
                        unsigned index = 0;
                        for(vector<TrackPart>::const_iterator j=parts.begin(); j!=parts.end(); ++j)
                                if(j->get_path()==i)
                                        build_part(*j, cat.get_path_profile(), Point(0, ballast_h+1.5*rail_h), bld, index);
                }
-               path_meshes.push_back(mesh);
+               path_meshes.push_back(m);
        }
 
        min_z = max_z = border.front().z;
@@ -169,17 +167,6 @@ const GL::Mesh &TrackType3D::get_path_mesh(unsigned p) const
        return *path_meshes[p];
 }
 
-void TrackType3D::render(const GL::Tag &tag) const
-{
-       if(tag==0)
-       {
-               catalogue.get_ballast_material().bind();
-               ballast_mesh.draw();
-               catalogue.get_rail_material().bind();
-               rail_mesh.draw();
-       }
-}
-
 void TrackType3D::build_part(const TrackPart &part, const Profile &profile, const Point &offset, GL::MeshBuilder &bld, unsigned &base_index)
 {
        float plen = part.get_length();
@@ -230,4 +217,4 @@ void TrackType3D::build_part(const TrackPart &part, const Profile &profile, cons
        base_index += (nsegs+1)*(n_points-1)*2;
 }
 
-} // namespace Marklin
+} // namespace R2C2