X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftracktype.h;h=27bf7fe97723ec8e9e0c39d2f4b63ade8bcd0c89;hb=a5e1363ceac1ab552849640c9021fcda362c4416;hp=0f6b30fa29a1241047d45f8892b07404355a25c3;hpb=7a36d396eded897c421424905b2c938d770df341;p=r2c2.git diff --git a/source/3d/tracktype.h b/source/3d/tracktype.h index 0f6b30f..27bf7fe 100644 --- a/source/3d/tracktype.h +++ b/source/3d/tracktype.h @@ -1,6 +1,7 @@ #ifndef R2C2_3D_TRACKTYPE_H_ #define R2C2_3D_TRACKTYPE_H_ +#include #include #include #include @@ -17,18 +18,15 @@ private: Catalogue3D &catalogue; Msp::GL::Mesh *mesh; Msp::GL::Object *object; - std::vector path_meshes; - std::vector border; - float min_z; - float max_z; + bool own_data; + std::map path_meshes; public: TrackType3D(Catalogue3D &, const TrackType &); ~TrackType3D(); - void get_bounds(const Angle &, Vector &, Vector &) const; const Msp::GL::Object &get_object() const { return *object; } - const Msp::GL::Mesh &get_path_mesh(unsigned) const; + const Msp::GL::Mesh &get_path_mesh(int, int) const; private: void build_part(const TrackPart &, const Profile &, const Vector &, bool, Msp::GL::MeshBuilder &, unsigned &);