Move track appearance properties into a separate class

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

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index 9daa7c809c7421dc71b9a68e2e044107358d7750..e28237f9fb37e27ec2b326ff6fe7b2f492b4d2ca 100644 (file)
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/maputils.h>
 #include <msp/fs/stat.h>
 #include <msp/gl/meshbuilder.h>
 #include <msp/gl/object.h>
@@ -14,8 +15,7 @@ using namespace Msp;
 namespace R2C2 {
 
 Catalogue3D::Catalogue3D(Catalogue &c):
-       catalogue(c),
-       endpoint_mesh((GL::NORMAL3, GL::VERTEX3))
+       catalogue(c)
 {
        add_type<GL::Material>().creator(&Catalogue3D::create<GL::Material>);
        add_type<GL::Mesh>().creator(&Catalogue3D::create<GL::Mesh>);
@@ -28,8 +28,6 @@ Catalogue3D::Catalogue3D(Catalogue &c):
        const Catalogue::ObjectMap &objs = catalogue.get_all();
        for(Catalogue::ObjectMap::const_iterator i=objs.begin(); i!=objs.end(); ++i)
                object_added(*i->second);
-
-       build_endpoint_mesh();
 }
 
 Catalogue3D::~Catalogue3D()
@@ -41,7 +39,12 @@ Catalogue3D::~Catalogue3D()
 void Catalogue3D::object_added(const ObjectType &ot)
 {
        if(const TrackType *tt = dynamic_cast<const TrackType *>(&ot))
+       {
                objects[&ot] = new TrackType3D(*this, *tt);
+               const TrackAppearance &appearance = tt->get_appearance();
+               if(!endpoint_meshes.count(&appearance))
+                       build_endpoint_mesh(appearance);
+       }
        else if(const SignalType *st = dynamic_cast<const SignalType *>(&ot))
                objects[&ot] = new SignalType3D(*this, *st);
        else if(const VehicleType *vt = dynamic_cast<const VehicleType *>(&ot))
@@ -53,13 +56,13 @@ const ObjectType3D &Catalogue3D::get_3d(const ObjectType &ot) const
        return *get_item(objects, &ot);
 }
 
-void Catalogue3D::build_endpoint_mesh()
+void Catalogue3D::build_endpoint_mesh(const TrackAppearance &appearance)
 {
-       const Profile &ballast_profile = catalogue.get_ballast_profile();
+       const Profile &ballast_profile = appearance.get_ballast_profile();
        const Vector &ballast_min = ballast_profile.get_min_coords();
        const Vector &ballast_max = ballast_profile.get_max_coords();
 
-       const Profile &rail_profile = catalogue.get_rail_profile();
+       const Profile &rail_profile = appearance.get_rail_profile();
        const Vector &rail_min = rail_profile.get_min_coords();
        const Vector &rail_max = rail_profile.get_max_coords();
 
@@ -68,7 +71,8 @@ void Catalogue3D::build_endpoint_mesh()
        float width = max(max(-ballast_min.x, ballast_max.x)*2, gauge+(rail_max.x-rail_min.x)*2)+0.004;
        float height = ballast_max.y-ballast_min.y+rail_max.y-rail_min.y+0.01;
 
-       GL::MeshBuilder bld(endpoint_mesh);
+       GL::Mesh *mesh = new GL::Mesh((GL::NORMAL3, GL::VERTEX3));
+       GL::MeshBuilder bld(*mesh);
        bld.normal(1, 0, 0);
        bld.begin(GL::QUADS);
        bld.vertex(0, width/2, 0);
@@ -76,6 +80,13 @@ void Catalogue3D::build_endpoint_mesh()
        bld.vertex(0, -width/2, height);
        bld.vertex(0, -width/2, 0);
        bld.end();
+
+       endpoint_meshes[&appearance] = mesh;
+}
+
+const GL::Mesh &Catalogue3D::get_endpoint_mesh(const TrackAppearance &appearance) const
+{
+       return *get_item(endpoint_meshes, &appearance);
 }
 
 FS::Path Catalogue3D::locate_file(const string &name)