X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftracktype.cpp;h=e402c89c5f597823e6daabde9943ef27b30d72bb;hb=51d3c122fb489f9e3f00060f885f00c1fae7ceb5;hp=755f0080807771f7e1bd4ddf76d34a86c0affaf5;hpb=c5f5ec54e81a6a85f911fa1075a0939a7352fbfd;p=r2c2.git diff --git a/source/3d/tracktype.cpp b/source/3d/tracktype.cpp index 755f008..e402c89 100644 --- a/source/3d/tracktype.cpp +++ b/source/3d/tracktype.cpp @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of R²C² -Copyright © 2010 Mikkosoft Productions, Mikko Rasa -Distributed under the GPL -*/ - #include #include #include @@ -14,89 +7,32 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace { - -bool compare_z(const R2C2::Point &p1, const R2C2::Point &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::Point 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), mesh(0), - object(0) + object(0), + own_data(false) { const Catalogue &cat = cat3d.get_catalogue(); const vector &parts = tt.get_parts(); const Profile &ballast_profile = cat.get_ballast_profile(); - const Point &ballast_min = ballast_profile.get_min_coords(); - const Point &ballast_max = ballast_profile.get_max_coords(); + 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 Point &rail_min = rail_profile.get_min_coords(); - const Point &rail_max = rail_profile.get_max_coords(); + 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(); string obj_name = tt.get_object(); if(!obj_name.empty()) - { - object = catalogue.get(obj_name); - // XXX border - } + object = &catalogue.get(obj_name); else { mesh = new GL::Mesh((GL::NORMAL3, GL::TEXCOORD2, GL::VERTEX3)); @@ -106,18 +42,20 @@ TrackType3D::TrackType3D(Catalogue3D &cat3d, const TrackType &tt): unsigned index = 0; bld.texcoord(0.25, 0.5); for(vector::const_iterator i=parts.begin(); i!=parts.end(); ++i) - build_part(*i, ballast_profile, Point(0, -ballast_min.y), false, bld, index); + build_part(*i, ballast_profile, Vector(0, -ballast_min.y, 0), false, bld, index); bld.texcoord(0.75, 0.5); float y = ballast_h-rail_min.y; for(vector::const_iterator i=parts.begin(); i!=parts.end(); ++i) - build_part(*i, rail_profile, Point(-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, Point(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(cat.get_track_technique())); + + own_data = true; } unsigned paths = tt.get_paths(); @@ -131,55 +69,33 @@ TrackType3D::TrackType3D(Catalogue3D &cat3d, const TrackType &tt): 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(), Point(0, ballast_h+1.5*rail_h), false, bld, index); + build_part(*j, cat.get_path_profile(), Vector(0, 0, ballast_h+1.5*rail_h), false, bld, index); } 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, Point &minp, Point &maxp) const -{ - float c = cos(-angle); - float s = sin(-angle); - - minp = maxp = Point(); - minp.z = min_z; - maxp.z = max_z; - - for(vector::const_iterator i=border.begin(); i!=border.end(); ++i) + 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 { - if(p>=path_meshes.size() || !path_meshes[p]) - throw InvalidParameterValue("Invalid path"); + 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]; } -void TrackType3D::build_part(const TrackPart &part, const Profile &profile, const Point &offset, bool mirror, GL::MeshBuilder &bld, unsigned &base_index) +void TrackType3D::build_part(const TrackPart &part, const Profile &profile, const Vector &offset, bool mirror, GL::MeshBuilder &bld, unsigned &base_index) { float plen = part.get_length(); unsigned nsegs = (part.is_curved() ? static_cast(plen*32)+1 : 1); @@ -188,27 +104,23 @@ void TrackType3D::build_part(const TrackPart &part, const Profile &profile, cons 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); + Transform trans = Transform::rotation(basep.dir, Vector(0, 0, 1)); for(unsigned j=0; j