X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftracktype.cpp;h=b9ebc73c31708615536549b3e4a771c2a56b5ec1;hb=5929b101ee38b5668b328e7b1eac4bf49c912412;hp=243da7fc4830c5279d782dc4d76499ccc2eb5fff;hpb=621c5c938d70ba0d155e0eda91a708db0a52c0dc;p=r2c2.git diff --git a/source/3d/tracktype.cpp b/source/3d/tracktype.cpp index 243da7f..b9ebc73 100644 --- a/source/3d/tracktype.cpp +++ b/source/3d/tracktype.cpp @@ -7,99 +7,37 @@ using namespace std; using namespace Msp; -namespace { - -bool compare_z(const R2C2::Vector &p1, const R2C2::Vector &p2) -{ - return p1.z -Iter graham_scan(Iter begin, Iter end) -{ - // http://en.wikipedia.org/wiki/Graham_scan - - // Find point with lowest X coordinate - R2C2::Vector lowest = *begin; - for(Iter i=begin; i!=end; ++i) - if(i->xx==lowest.x && i->y>lowest.y)) - lowest = *i; - - // Compute tangents and sort points - for(Iter i=begin; i!=end; ++i) - i->z = (i->x==lowest.x ? 1e5/(i->y-lowest.y-1) : (i->y-lowest.y)/(i->x-lowest.x)); - sort(begin, end, compare_z); - - for(Iter k=begin, i=k++, j=k++;; ) - { - // Compute winding by cross product - float turn = (j->x-i->x)*(k->y-j->y) - (k->x-j->x)*(j->y-i->y); - - if(turn<1e-5) - { - // Right turn - throw the middle point away - // Special case for collinear vertices in the beginning - if(i==begin) - j = k++; - else - j = i--; - } - else - { - // Left turn - store the middle point and advance - if(++i!=j) - *i = *j; - j = k++; - } - - // Cycle back to beginning and terminate after checking the last point - if(k==end) - k = begin; - else if(j==begin) - return ++i; - } -} - -} - namespace R2C2 { -TrackType3D::TrackType3D(Catalogue3D &cat3d, const TrackType &tt): - catalogue(cat3d), +TrackType3D::TrackType3D(Catalogue3D &c, const TrackType &tt): + ObjectType3D(c), mesh(0), - object(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()) - { - object = catalogue.get(obj_name); - const GL::Mesh *m = object->get_mesh(); - const GL::VertexArray &vertices = m->get_vertices(); - int vertex_offs = vertices.get_format().offset(GL::VERTEX2); - if(vertex_offs>=0) - { - for(unsigned i=0; i(obj_name); else { mesh = new GL::Mesh((GL::NORMAL3, GL::TEXCOORD2, GL::VERTEX3)); @@ -107,81 +45,78 @@ 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), 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(-gauge/2, y), true, bld, index); + build_part(*i, rail_profile, Vector(0, gauge/2, y), true, bld, index); for(vector::const_iterator i=parts.begin(); i!=parts.end(); ++i) - build_part(*i, rail_profile, Vector(gauge/2, y), false, bld, index); + build_part(*i, rail_profile, Vector(0, -gauge/2, y), false, bld, index); 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) { - m = new GL::Mesh(GL::VERTEX3); + 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 + { + 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, 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); } - - min_z = max_z = border.front().z; - for(vector::iterator i=border.begin(); i!=border.end(); ++i) - { - min_z = min(min_z, i->z); - max_z = max(max_z, i->z); - } - border.erase(graham_scan(border.begin(), border.end()), border.end()); } TrackType3D::~TrackType3D() { - for(vector::iterator i=path_meshes.begin(); i!=path_meshes.end(); ++i) - delete *i; -} - -void TrackType3D::get_bounds(float angle, Vector &minp, Vector &maxp) const -{ - float c = cos(-angle); - float s = sin(-angle); - - minp = maxp = Vector(); - minp.z = min_z; - maxp.z = max_z; - - for(vector::const_iterator i=border.begin(); i!=border.end(); ++i) + for(map::iterator i=path_meshes.begin(); i!=path_meshes.end(); ++i) + delete i->second; + if(own_data) { - float x = c*i->x-s*i->y; - float y = s*i->x+c*i->y; - - minp.x = min(minp.x, x); - minp.y = min(minp.y, y); - maxp.x = max(maxp.x, x); - maxp.y = max(maxp.y, y); + delete object; + delete mesh; } } -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) @@ -192,28 +127,24 @@ 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); - float c = cos(basep.dir); - float s = sin(basep.dir); + 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