designer(d),
mouse(m),
selection(s),
- mode(NONE),
- angle(0)
+ mode(NONE)
{
mouse.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Manipulator::button_press), false));
mouse.signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Manipulator::axis_motion), false));
if(mode)
cancel();
- rot_origin = atan2(gpointer.y-center.y, gpointer.x-center.x);
+ rot_origin = Geometry::atan2(gpointer.y-center.y, gpointer.x-center.x);
mode = ROTATE;
}
for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
{
Object *obj = i->object->clone(&designer.get_layout());
- if(Track *track = dynamic_cast<Track *>(obj))
- {
- for(list<Object *>::iterator j=new_objs.begin(); j!=new_objs.end(); ++j)
- if(Track *track2 = dynamic_cast<Track *>(*j))
- track->snap_to(*track2, true);
- }
+ for(list<Object *>::iterator j=new_objs.begin(); j!=new_objs.end(); ++j)
+ obj->link_to(**j);
new_objs.push_back(obj);
}
track->set_slope(0);
}
- for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
- (*i)->check_slope();
-
update_objects();
}
return;
for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
- if(Track *track = dynamic_cast<Track *>(i->object))
- if(track->get_type().get_endpoints().size()!=2)
- return;
+ if(i->object->get_n_link_slots()!=2)
+ return;
list<Track *> tracks2;
for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
float total_len = 0;
list<TrackOrder> order;
- Track *cur = *neighbors.begin();
+ Track *cur = dynamic_cast<Track *>(*neighbors.begin());
while(tracks2.size())
{
bool rev = false;
total_len += cur->get_type().get_total_length();
}
- set<Track *>::iterator nb = neighbors.begin();
- int epi = (*nb)->get_endpoint_by_link(*order.front().track);
- float start_z = (*nb)->get_endpoint_position(epi).z;
+ set<Object *>::iterator nb = neighbors.begin();
+ int epi = (*nb)->get_link_slot(*order.front().track);
+ float start_z = (*nb)->get_snap_node(epi).position.z;
++nb;
- epi = (*nb)->get_endpoint_by_link(*order.back().track);
- float end_z = (*nb)->get_endpoint_position(epi).z;
+ epi = (*nb)->get_link_slot(*order.back().track);
+ float end_z = (*nb)->get_snap_node(epi).position.z;
if(smooth)
{
cur_z += dz;
}
- for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
- (*i)->check_slope();
-
update_objects();
}
float limit = designer.get_layout().get_catalogue().get_gauge()/10;
- Vector pos1;
- float dir1;
+ Snap sn1;
bool ok = false;
float gap = 0;
for(unsigned i=0; i<track1->get_type().get_endpoints().size(); ++i)
if(track1->get_link(i))
continue;
- pos1 = track1->get_endpoint_position(i);
- dir1 = track1->get_endpoint_direction(i);
+ sn1 = track1->get_snap_node(i);
for(unsigned j=0; j<track2->get_type().get_endpoints().size(); ++j)
{
if(track2->get_link(j))
continue;
- Vector pos2 = track2->get_endpoint_position(j);
- float dir2 = track2->get_endpoint_direction(j);
+ Snap sn2 = track2->get_snap_node(j);
- float dz = pos2.z-pos1.z;
+ float dz = sn2.position.z-sn1.position.z;
if(abs(dz)>0.02)
continue;
- float adiff = dir1+M_PI-dir2;
- while(adiff<-M_PI)
- adiff += M_PI*2;
- while(adiff>M_PI)
- adiff -= M_PI*2;
- if(abs(adiff)>0.01)
+ Angle adiff = wrap_balanced(sn1.rotation+Angle::half_turn()-sn2.rotation);
+ if(abs(adiff).radians()>0.01)
continue;
- float c = cos(dir1);
- float s = sin(dir1);
- float dx = pos2.x-pos1.x;
- float dy = pos2.y-pos1.y;
- if(abs(dx*s-dy*c)>limit)
+ Vector delta = rotated_vector(sn2.position-sn1.position, -sn1.rotation);
+ if(abs(delta.y)>limit)
continue;
- gap = dx*c+dy*s;
+ gap = delta.x;
if(gap<0)
continue;
return;
}
- vector<Track *> trks = create_straight(pos1, dir1, gap, limit);
+ vector<Track *> trks = create_straight(sn1.position, sn1.rotation, gap, limit);
if(trks.empty())
{
return;
}
- trks.front()->snap_to(*track1, true);
- trks.back()->snap_to(*track2, true);
+ trks.front()->link_to(*track1);
+ trks.back()->link_to(*track2);
selection.replace(trks.begin(), trks.end());
}
for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
{
- i->object->set_position(Vector(center.x+i->pos.x, center.y+i->pos.y, center.z+i->pos.z));
+ i->object->set_position(center+i->pos);
i->object->set_rotation(i->rot);
}
- for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
- (*i)->check_slope();
-
for(vector<Track *>::iterator i=extend_tracks.begin(); i!=extend_tracks.end(); ++i)
delete *i;
extend_tracks.clear();
- angle = 0;
+ angle = Angle::zero();
signal_done.emit(false);
}
{
Mode m = mode;
mode = NONE;
- angle = 0;
+ angle = Angle::zero();
if(m!=EXTEND)
{
- for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
+ for(set<Object *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
for(vector<MObject>::iterator j=objects.begin(); j!=objects.end(); ++j)
- if(Track *track = dynamic_cast<Track *>(j->object))
- track->break_link(**i);
+ j->object->break_link(**i);
}
const set<Track *> <racks = designer.get_layout().get_tracks();
if(!ok) continue;
for(vector<MObject>::iterator j=objects.begin(); j!=objects.end(); ++j)
- if(Track *track = dynamic_cast<Track *>(j->object))
- track->snap_to(**i, true);
+ j->object->link_to(**i);
}
if(m==EXTEND)
if(mode==MOVE)
{
- Vector delta(gpointer.x-move_origin.x, gpointer.y-move_origin.y, 0);
- Vector offset(center.x+delta.x, center.y+delta.y, center.z);
+ Vector offset = center+gpointer-move_origin;
for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
{
- i->object->set_position(Vector(offset.x+i->pos.x, offset.y+i->pos.y, offset.z+i->pos.z));
+ i->object->set_position(offset+i->pos);
i->object->set_rotation(i->rot);
}
continue;
for(vector<MObject>::iterator j=objects.begin(); (j!=objects.end() && !snapped); ++j)
- if(Track *track = dynamic_cast<Track *>(j->object))
- if(track->snap_to(**i, false, limit))
- snapped = &*j;
+ if(j->object->snap_to(**i, limit))
+ snapped = &*j;
}
if(snapped)
{
- float da = snapped->object->get_rotation()-snapped->rot;
- float c = cos(da);
- float s = sin(da);
+ Angle da = snapped->object->get_rotation()-snapped->rot;
+ Transform trans = Transform::rotation(da, Vector(0, 0, 1));
const Vector &sp = snapped->object->get_position();
for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
{
if(&*i==snapped)
continue;
- Vector dp(i->pos.x-snapped->pos.x, i->pos.y-snapped->pos.y, 0);
- i->object->set_position(Vector(sp.x+c*dp.x-s*dp.y, sp.y+s*dp.x+c*dp.y, sp.z+i->pos.z-snapped->pos.z));
+ i->object->set_position(sp+trans.transform(i->pos-snapped->pos));
i->object->set_rotation(i->rot+da);
}
}
}
else if(mode==ROTATE)
{
- float a = atan2(gpointer.y-center.y, gpointer.x-center.x);
+ Angle a = Geometry::atan2(gpointer.y-center.y, gpointer.x-center.x);
angle += a-rot_origin;
rot_origin = a;
+ Transform trans = Transform::rotation(angle, Vector(0, 0, 1));
for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
{
- float c = cos(angle);
- float s = sin(angle);
- i->object->set_position(Vector(center.x+c*i->pos.x-s*i->pos.y, center.y+s*i->pos.x+c*i->pos.y, center.z+i->pos.z));
+ i->object->set_position(center+trans.transform(i->pos));
i->object->set_rotation(angle+i->rot);
}
}
signal_status.emit(format("Elevation: %+.0fmm (%.0fmm)", dz*1000, (center.z+dz)*1000));
for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
- i->object->set_position(Vector(center.x+i->pos.x, center.y+i->pos.y, center.z+i->pos.z+dz));
-
- for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
- (*i)->check_slope();
+ i->object->set_position(center+i->pos+Vector(0, 0, dz));
}
else if(mode==EXTEND)
{
Vector pos;
- float dir = 0;
+ Angle dir;
float length = 0;
for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
{
- Track *track = dynamic_cast<Track *>(i->object);
- if(!track)
- continue;
-
- unsigned n_endpoints = track->get_type().get_endpoints().size();
- for(unsigned j=0; j<n_endpoints; ++j)
+ unsigned nls = i->object->get_n_link_slots();
+ for(unsigned j=0; j<nls; ++j)
{
- if(track->get_link(j))
+ if(i->object->get_link(j))
continue;
- Vector ep_pos = track->get_endpoint_position(j);
- float ep_dir = track->get_endpoint_direction(j);
- float c = cos(ep_dir);
- float s = sin(ep_dir);
- float dx = gpointer.x-ep_pos.x;
- float dy = gpointer.y-ep_pos.y;
+ Snap sn = i->object->get_snap_node(j);
+ Vector delta = rotated_vector(gpointer-sn.position, -sn.rotation);
- float len = dx*c+dy*s;
- if(len<length)
+ if(delta.x<length)
continue;
- pos = ep_pos;
- dir = ep_dir;
- length = len;
+ pos = sn.position;
+ dir = sn.rotation;
+ length = delta.x;
}
}
unsigned n_endpoints = track->get_type().get_endpoints().size();
for(unsigned j=0; j<n_endpoints; ++j)
{
- Vector p = track->get_endpoint_position(j);
+ Vector p = track->get_snap_node(j).position;
if(i==objects.begin() && j==0)
minp = maxp = p;
else
}
}
- center = Vector((minp.x+maxp.x)/2, (minp.y+maxp.y)/2, minp.z);
+ center = (minp+maxp)/2.0f;
+ center.z = minp.z;
for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
{
- const Vector &p = i->object->get_position();
- i->pos = Vector(p.x-center.x, p.y-center.y, p.z-center.z);
+ i->pos = i->object->get_position()-center;
i->rot = i->object->get_rotation();
}
}
neighbors.clear();
for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
{
- Track *track = dynamic_cast<Track *>(i->object);
- if(!track)
- continue;
-
- const vector<Track *> &links = track->get_links();
- for(vector<Track *>::const_iterator j=links.begin(); j!=links.end(); ++j)
+ unsigned nls = i->object->get_n_link_slots();
+ for(unsigned j=0; j<nls; ++j)
{
- if(!*j)
+ Object *linked = i->object->get_link(j);
+ if(!linked)
continue;
- if(neighbors.count(*j))
+ if(neighbors.count(linked))
continue;
bool ok = true;
for(vector<MObject>::iterator k=objects.begin(); (k!=objects.end() && ok); ++k)
- ok = (k->object!=*j);
+ ok = (k->object!=linked);
if(ok)
- neighbors.insert(*j);
+ neighbors.insert(linked);
}
}
}
}
}
-vector<Track *> Manipulator::create_straight(const R2C2::Vector &start, float dir, float length, float limit)
+vector<Track *> Manipulator::create_straight(const R2C2::Vector &start, const Angle &dir, float length, float limit)
{
const Catalogue::TrackMap &track_types = designer.get_catalogue().get_tracks();
std::map<float, const TrackType *> types_by_length;
if(!lengths.empty())
{
Vector pos = start;
- float c = cos(dir);
- float s = sin(dir);
+ Transform trans = Transform::rotation(dir, Vector(0, 0, 1));
for(vector<float>::iterator i=lengths.begin(); i!=lengths.end(); ++i)
{
Track *track = new Track(designer.get_layout(), *get_item(types_by_length, *i));
track->set_rotation(dir);
if(!trks.empty())
- track->snap_to(*trks.back(), true);
+ track->link_to(*trks.back());
trks.push_back(track);
- pos.x += c**i;
- pos.y += s**i;
+ pos += trans.transform(Vector(*i, 0, 0));
}
}
projects / r2c2.git / blobdiff