X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.h;h=ecac7ddca27b97ca05ac3a71c8c37fecdb0fd56f;hb=4049f5bdacfdb61247f3c74fc5f748990be7bd4d;hp=8572f6ce18e89545ca282ff21e5fecff26fffb45;hpb=d91ab10fd78ef29272282b020fa4e08063cb4808;p=r2c2.git diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h index 8572f6c..ecac7dd 100644 --- a/source/3d/catalogue.h +++ b/source/3d/catalogue.h @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of R²C² -Copyright © 2010 Mikkosoft Productions, Mikko Rasa -Distributed under the GPL -*/ - #ifndef R2C2_3D_CATALOGUE_H_ #define R2C2_3D_CATALOGUE_H_ @@ -16,6 +9,7 @@ Distributed under the GPL namespace R2C2 { +class SignalType3D; class TrackType3D; class VehicleType3D; @@ -25,6 +19,7 @@ private: Catalogue &catalogue; std::map tracks; std::map vehicles; + std::map signals; Msp::GL::Mesh endpoint_mesh; public: @@ -34,10 +29,12 @@ public: const Catalogue &get_catalogue() const { return catalogue; } const TrackType3D &get_track(const TrackType &) const; const VehicleType3D &get_vehicle(const VehicleType &) const; + const SignalType3D &get_signal(const SignalType &) const; const Msp::GL::Mesh &get_endpoint_mesh() const { return endpoint_mesh; } private: void track_added(const TrackType &); void vehicle_added(const VehicleType &); + void signal_added(const SignalType &); void build_endpoint_mesh(); Msp::FS::Path locate_file(const std::string &);