X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftracktype.cpp;h=b9ebc73c31708615536549b3e4a771c2a56b5ec1;hb=5929b101ee38b5668b328e7b1eac4bf49c912412;hp=e402c89c5f597823e6daabde9943ef27b30d72bb;hpb=0db89b665527609582df98854c9e3255d1017811;p=r2c2.git diff --git a/source/3d/tracktype.cpp b/source/3d/tracktype.cpp index e402c89..b9ebc73 100644 --- a/source/3d/tracktype.cpp +++ b/source/3d/tracktype.cpp @@ -9,26 +9,31 @@ using namespace Msp; namespace R2C2 { -TrackType3D::TrackType3D(Catalogue3D &cat3d, const TrackType &tt): - catalogue(cat3d), +TrackType3D::TrackType3D(Catalogue3D &c, const TrackType &tt): + ObjectType3D(c), mesh(0), object(0), own_data(false) { - const Catalogue &cat = cat3d.get_catalogue(); + const TrackAppearance &appearance = tt.get_appearance(); const vector &parts = tt.get_parts(); - const Profile &ballast_profile = cat.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(); float ballast_h = ballast_max.y-ballast_min.y; - const Profile &rail_profile = cat.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(); float rail_h = rail_max.y-rail_min.y; - float gauge = cat.get_gauge(); + const Profile &tie_profile = appearance.get_tie_profile(); + const Vector &tie_min = tie_profile.get_min_coords(); + const Vector &tie_max = tie_profile.get_max_coords(); + float tie_h = tie_max.y-tie_min.y; + + float gauge = appearance.get_gauge(); string obj_name = tt.get_object(); if(!obj_name.empty()) @@ -40,12 +45,17 @@ TrackType3D::TrackType3D(Catalogue3D &cat3d, const TrackType &tt): GL::MeshBuilder bld(*mesh); unsigned index = 0; - bld.texcoord(0.25, 0.5); + bld.texcoord(0.17, 0.5); + for(vector::const_iterator i=parts.begin(); i!=parts.end(); ++i) + build_part(*i, ballast_profile, Vector(0, 0, -ballast_min.y), false, bld, index); + + float y = ballast_h-tie_min.y; + bld.texcoord(0.83, 0.5); for(vector::const_iterator i=parts.begin(); i!=parts.end(); ++i) - build_part(*i, ballast_profile, Vector(0, -ballast_min.y, 0), false, bld, index); + build_ties(*i, tie_profile, appearance.get_tie_length(), appearance.get_tie_spacing(), Vector(0, 0, y), bld, index); - bld.texcoord(0.75, 0.5); - float y = ballast_h-rail_min.y; + bld.texcoord(0.5, 0.5); + y = ballast_h+tie_h-rail_min.y; for(vector::const_iterator i=parts.begin(); i!=parts.end(); ++i) build_part(*i, rail_profile, Vector(0, gauge/2, y), true, bld, index); for(vector::const_iterator i=parts.begin(); i!=parts.end(); ++i) @@ -53,32 +63,49 @@ TrackType3D::TrackType3D(Catalogue3D &cat3d, const TrackType &tt): object = new GL::Object; object->set_mesh(mesh); - object->set_technique(&catalogue.get(cat.get_track_technique())); + object->set_technique(&catalogue.get(appearance.get_technique())); own_data = true; } - + unsigned paths = tt.get_paths(); - for(unsigned i=0; paths; ++i, paths>>=1) + for(int i=-1; i<=1; ++i) { - GL::Mesh *m = 0; - if(paths&1) + // TODO Make profile width configurable + Profile profile; + if(i==0) + { + float rail_w = (rail_max.x-rail_min.x)*2; + profile.append_vertex(Vector(rail_w*-0.5, 0, 0), false); + profile.append_vertex(Vector(rail_w*0.5, 0, 0), false); + } + else { - m = new GL::Mesh(GL::VERTEX3); + profile.append_vertex(Vector(i*(gauge*0.5+rail_min.x*2), 0, 0), false); + profile.append_vertex(Vector(i*(gauge*0.5+rail_max.x*2), 0, 0), false); + } + + // TODO Avoid generating redundant meshes for single-path tracks + for(int j=-1; j<=4; ++j) + { + if(j>=0 && !((paths>>j)&1)) + continue; + + GL::Mesh *m = new GL::Mesh(GL::VERTEX3); GL::MeshBuilder bld(*m); unsigned index = 0; - for(vector::const_iterator j=parts.begin(); j!=parts.end(); ++j) - if(j->get_path()==i) - build_part(*j, cat.get_path_profile(), Vector(0, 0, ballast_h+1.5*rail_h), false, bld, index); + for(vector::const_iterator k=parts.begin(); k!=parts.end(); ++k) + if(j<0 || k->get_path()==static_cast(j)) + build_part(*k, profile, Vector(0, 0, ballast_h+1.5*rail_h), false, bld, index); + path_meshes[(j&0xFF)|((i&3)<<8)] = m; } - path_meshes.push_back(m); } } TrackType3D::~TrackType3D() { - for(vector::iterator i=path_meshes.begin(); i!=path_meshes.end(); ++i) - delete *i; + for(map::iterator i=path_meshes.begin(); i!=path_meshes.end(); ++i) + delete i->second; if(own_data) { delete object; @@ -86,13 +113,10 @@ TrackType3D::~TrackType3D() } } -const GL::Mesh &TrackType3D::get_path_mesh(unsigned p) const +const GL::Mesh &TrackType3D::get_path_mesh(int p, int s) const { - if(p>=path_meshes.size()) - throw out_of_range("TrackType3D::get_path_mesh"); - if(!path_meshes[p]) - throw invalid_argument("TrackType3D::get_path_mesh"); - return *path_meshes[p]; + unsigned key = (p<0 ? 0xFF : p) | ((s&3)<<8); + return *get_item(path_meshes, key); } void TrackType3D::build_part(const TrackPart &part, const Profile &profile, const Vector &offset, bool mirror, GL::MeshBuilder &bld, unsigned &base_index) @@ -103,8 +127,8 @@ void TrackType3D::build_part(const TrackPart &part, const Profile &profile, cons unsigned n_vertices = profile.get_n_vertices(); for(unsigned i=0; i<=nsegs; ++i) { - TrackPoint basep = part.get_point(i*plen/nsegs); - Transform trans = Transform::rotation(basep.dir, Vector(0, 0, 1)); + OrientedPoint basep = part.get_point(i*plen/nsegs); + Transform trans = Transform::rotation(basep.rotation, Vector(0, 0, 1)); for(unsigned j=0; j cap_vertices; + for(unsigned i=0; i+1=2) + { + if(i+2=2 && !profile.get_vertex(j).smooth) + { + bld.end(); + strip = 0; + } + } + if(strip) + bld.end(); + + for(unsigned j=0; j<2; ++j) + { + Vector n = trans.transform(Vector(j*2.0-1, 0, 0)); + bld.normal(n.x, n.y, n.z); + + bld.begin(GL::TRIANGLE_STRIP); + for(unsigned k=0; k