-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
#include <algorithm>
#include <cmath>
#include <msp/gl/technique.h>
namespace {
-bool compare_z(const R2C2::Point &p1, const R2C2::Point &p2)
+bool compare_z(const R2C2::Vector &p1, const R2C2::Vector &p2)
{
return p1.z<p2.z;
}
// http://en.wikipedia.org/wiki/Graham_scan
// Find point with lowest X coordinate
- R2C2::Point lowest = *begin;
+ R2C2::Vector lowest = *begin;
for(Iter i=begin; i!=end; ++i)
if(i->x<lowest.x || (i->x==lowest.x && i->y>lowest.y))
lowest = *i;
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);
+ float turn = cross(*j-*i, *k-*j).z;
if(turn<1e-5)
{
const vector<TrackPart> &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<GL::Object>(obj_name);
- // XXX border
+ object = &catalogue.get<GL::Object>(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<vertices.size(); ++i)
+ {
+ const float *v = vertices[i]+vertex_offs;
+ border.push_back(Vector(v[0], v[1], 0));
+ }
+ }
}
else
{
unsigned index = 0;
bld.texcoord(0.25, 0.5);
for(vector<TrackPart>::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<TrackPart>::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<TrackPart>::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<GL::Technique>(cat.get_track_technique()));
+ object->set_technique(&catalogue.get<GL::Technique>(cat.get_track_technique()));
}
unsigned paths = tt.get_paths();
unsigned index = 0;
for(vector<TrackPart>::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<Point>::iterator i=border.begin(); i!=border.end(); ++i)
+ for(vector<Vector>::iterator i=border.begin(); i!=border.end(); ++i)
{
min_z = min(min_z, i->z);
max_z = max(max_z, i->z);
delete *i;
}
-void TrackType3D::get_bounds(float angle, Point &minp, Point &maxp) const
+void TrackType3D::get_bounds(const Angle &angle, Vector &minp, Vector &maxp) const
{
- float c = cos(-angle);
- float s = sin(-angle);
+ Transform trans = Transform::rotation(-angle, Vector(0, 0, 1));
- minp = maxp = Point();
+ minp = maxp = Vector();
minp.z = min_z;
maxp.z = max_z;
- for(vector<Point>::const_iterator i=border.begin(); i!=border.end(); ++i)
+ for(vector<Vector>::const_iterator i=border.begin(); i!=border.end(); ++i)
{
- float x = c*i->x-s*i->y;
- float y = s*i->x+c*i->y;
+ Vector v = trans.transform(*i);
- minp.x = min(minp.x, x);
- minp.y = min(minp.y, y);
- maxp.x = max(maxp.x, x);
- maxp.y = max(maxp.y, y);
+ minp.x = min(minp.x, v.x);
+ minp.y = min(minp.y, v.y);
+ maxp.x = max(maxp.x, v.x);
+ maxp.y = max(maxp.y, v.y);
}
}
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<unsigned>(plen*32)+1 : 1);
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<n_vertices; ++j)
{
const Profile::Vertex &v = profile.get_vertex(mirror ? n_vertices-1-j : j);
- Point p = v.pos;
+ Vector p(0, -v.pos.x, v.pos.y);
if(mirror)
- p.x = -p.x;
- p.z = basep.pos.z+p.y+offset.y;
- p.y = basep.pos.y-c*(p.x+offset.x);
- p.x = basep.pos.x+s*(p.x+offset.x);
+ p.y = -p.y;
+ p = basep.pos+trans.transform(offset+p);
- Point n = v.normal;
+ Vector n(0, -v.normal.x, v.normal.y);
if(mirror)
- n.x = -n.x;
+ n.y = -n.y;
+ n = trans.transform(n);
- bld.normal(s*n.x, -c*n.x, n.y);
+ bld.normal(n.x, n.y, n.z);
bld.vertex(p.x, p.y, p.z);
border.push_back(p);
projects / r2c2.git / blobdiff