Emit signals from loco status command only when all data has been gathered

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

diff --git a/source/3d/tracktype.cpp b/source/3d/tracktype.cpp
index 1a898d4cd5383c21e0104fe8a5bfef7758c45188..1e20c5d8aa82f966a904970f972d79e92b0feb5b 100644 (file)
--- a/source/3d/tracktype.cpp
+++ b/source/3d/tracktype.cpp
@@ -1,6 +1,6 @@
 /* $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
 */
@@ -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,7 +69,7 @@ Iter graham_scan(Iter begin, Iter end)
 
 }
 
-namespace Marklin {
+namespace R2C2 {
 
 TrackType3D::TrackType3D(const Catalogue3D &cat3d, const TrackType &tt):
        catalogue(cat3d),
@@ -82,10 +82,12 @@ TrackType3D::TrackType3D(const Catalogue3D &cat3d, const TrackType &tt):
        const Profile &ballast_profile = cat.get_ballast_profile();
        const Point &ballast_min = ballast_profile.get_min_coords();
        const Point &ballast_max = ballast_profile.get_max_coords();
+       float ballast_h = ballast_max.y-ballast_min.y;
 
        const Profile &rail_profile = cat.get_rail_profile();
        const Point &rail_min = rail_profile.get_min_coords();
        const Point &rail_max = rail_profile.get_max_coords();
+       float rail_h = rail_max.y-rail_min.y;
 
        float gauge = cat.get_gauge();
 
@@ -101,12 +103,28 @@ TrackType3D::TrackType3D(const Catalogue3D &cat3d, const TrackType &tt):
                unsigned index = 0;
                GL::MeshBuilder bld(rail_mesh);
                bld.color(0.85f, 0.85f, 0.85f);
-               float y = ballast_max.y-ballast_min.y-rail_min.y;
+               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);
        }
+ 
+       unsigned paths = tt.get_paths();
+       for(unsigned i=0; paths; ++i, paths>>=1)
+       {
+               GL::Mesh *mesh = 0;
+               if(paths&1)
+               {
+                       mesh = new GL::Mesh(GL::VERTEX3);
+                       GL::MeshBuilder bld(*mesh);
+                       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);
+       }
 
        min_z = max_z = border.front().z;
        for(vector<Point>::iterator i=border.begin(); i!=border.end(); ++i)
@@ -117,6 +135,12 @@ TrackType3D::TrackType3D(const Catalogue3D &cat3d, const TrackType &tt):
        border.erase(graham_scan(border.begin(), border.end()), border.end());
 }
 
+TrackType3D::~TrackType3D()
+{
+       for(vector<GL::Mesh *>::iterator i=path_meshes.begin(); i!=path_meshes.end(); ++i)
+               delete *i;
+}
+
 void TrackType3D::get_bounds(float angle, Point &minp, Point &maxp) const
 {
        float c = cos(-angle);
@@ -138,6 +162,13 @@ void TrackType3D::get_bounds(float angle, Point &minp, Point &maxp) const
        }
 }
 
+const GL::Mesh &TrackType3D::get_path_mesh(unsigned p) const
+{
+       if(p>=path_meshes.size() || !path_meshes[p])
+               throw InvalidParameterValue("Invalid path");
+       return *path_meshes[p];
+}
+
 void TrackType3D::render(const GL::Tag &tag) const
 {
        if(tag==0)
@@ -152,7 +183,7 @@ void TrackType3D::render(const GL::Tag &tag) const
 void TrackType3D::build_part(const TrackPart &part, const Profile &profile, const Point &offset, GL::MeshBuilder &bld, unsigned &base_index)
 {
        float plen = part.get_length();
-       unsigned nsegs = (part.is_curved() ? static_cast<unsigned>(plen*16)+1 : 1);
+       unsigned nsegs = (part.is_curved() ? static_cast<unsigned>(plen*32)+1 : 1);
 
        unsigned n_points = profile.get_n_points();
        for(unsigned i=0; i<=nsegs; ++i)
@@ -199,4 +230,4 @@ void TrackType3D::build_part(const TrackPart &part, const Profile &profile, cons
        base_index += (nsegs+1)*(n_points-1)*2;
 }
 
-} // namespace Marklin
+} // namespace R2C2