X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.h;h=6b819b71b61561c2a2db2589bd74df859934f4e7;hb=51779f52d3f1fe23e2bdb8864c88b5edd49c57ed;hp=caf104e5ef146bcb9ec844dd963037bf41294ab7;hpb=8dce175e31941c2f6e92ce52204e9b61a071d4f9;p=r2c2.git diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h index caf104e..6b819b7 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_ @@ -25,8 +18,6 @@ private: Catalogue &catalogue; std::map tracks; std::map vehicles; - Msp::GL::Material ballast_material; - Msp::GL::Material rail_material; Msp::GL::Mesh endpoint_mesh; public: @@ -36,8 +27,6 @@ public: const Catalogue &get_catalogue() const { return catalogue; } const TrackType3D &get_track(const TrackType &) const; const VehicleType3D &get_vehicle(const VehicleType &) const; - const Msp::GL::Material &get_ballast_material() const { return ballast_material; } - const Msp::GL::Material &get_rail_material() const { return rail_material; } const Msp::GL::Mesh &get_endpoint_mesh() const { return endpoint_mesh; } private: void track_added(const TrackType &);