X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.cpp;h=802adb16fd45942e95deb2ac7038b347cb909557;hb=679c37910ab4d8030b3c09f6591381789b14a5f0;hp=5b95d5c4bddab072fbdce0c4d3b0588aa1925e70;hpb=f950f5a77714a155e57c868101911e181a617818;p=r2c2.git diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp index 5b95d5c..802adb1 100644 --- a/source/designer/manipulator.cpp +++ b/source/designer/manipulator.cpp @@ -83,12 +83,8 @@ void Manipulator::duplicate() for(vector::iterator i=objects.begin(); i!=objects.end(); ++i) { Object *obj = i->object->clone(&designer.get_layout()); - if(Track *track = dynamic_cast(obj)) - { - for(list::iterator j=new_objs.begin(); j!=new_objs.end(); ++j) - if(Track *track2 = dynamic_cast(*j)) - track->snap_to(*track2, true); - } + for(list::iterator j=new_objs.begin(); j!=new_objs.end(); ++j) + obj->link_to(**j); new_objs.push_back(obj); } @@ -120,9 +116,6 @@ void Manipulator::flatten() track->set_slope(0); } - for(set::iterator i=neighbors.begin(); i!=neighbors.end(); ++i) - (*i)->check_slope(); - update_objects(); } @@ -135,9 +128,8 @@ void Manipulator::even_slope(bool smooth) return; for(vector::iterator i=objects.begin(); i!=objects.end(); ++i) - if(Track *track = dynamic_cast(i->object)) - if(track->get_type().get_endpoints().size()!=2) - return; + if(i->object->get_n_link_slots()!=2) + return; list tracks2; for(vector::iterator i=objects.begin(); i!=objects.end(); ++i) @@ -147,7 +139,7 @@ void Manipulator::even_slope(bool smooth) float total_len = 0; list order; - Track *cur = *neighbors.begin(); + Track *cur = dynamic_cast(*neighbors.begin()); while(tracks2.size()) { bool rev = false; @@ -172,12 +164,12 @@ void Manipulator::even_slope(bool smooth) total_len += cur->get_type().get_total_length(); } - set::iterator nb = neighbors.begin(); - int epi = (*nb)->get_endpoint_by_link(*order.front().track); - float start_z = (*nb)->get_endpoint_position(epi).z; + set::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) { @@ -209,9 +201,6 @@ void Manipulator::even_slope(bool smooth) cur_z += dz; } - for(set::iterator i=neighbors.begin(); i!=neighbors.end(); ++i) - (*i)->check_slope(); - update_objects(); } @@ -233,8 +222,7 @@ void Manipulator::connect() 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; iget_type().get_endpoints().size(); ++i) @@ -242,22 +230,20 @@ void Manipulator::connect() 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; jget_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; + float adiff = sn1.rotation+M_PI-sn2.rotation; while(adiff<-M_PI) adiff += M_PI*2; while(adiff>M_PI) @@ -265,10 +251,10 @@ void Manipulator::connect() if(abs(adiff)>0.01) continue; - float c = cos(dir1); - float s = sin(dir1); - float dx = pos2.x-pos1.x; - float dy = pos2.y-pos1.y; + float c = cos(sn1.rotation); + float s = sin(sn1.rotation); + float dx = sn2.position.x-sn1.position.x; + float dy = sn2.position.y-sn1.position.y; if(abs(dx*s-dy*c)>limit) continue; @@ -289,7 +275,7 @@ void Manipulator::connect() return; } - vector trks = create_straight(pos1, dir1, gap, limit); + vector trks = create_straight(sn1.position, sn1.rotation, gap, limit); if(trks.empty()) { @@ -297,8 +283,8 @@ void Manipulator::connect() 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()); } @@ -315,9 +301,6 @@ void Manipulator::cancel() i->object->set_rotation(i->rot); } - for(set::iterator i=neighbors.begin(); i!=neighbors.end(); ++i) - (*i)->check_slope(); - for(vector::iterator i=extend_tracks.begin(); i!=extend_tracks.end(); ++i) delete *i; extend_tracks.clear(); @@ -342,10 +325,9 @@ void Manipulator::button_press(unsigned btn) if(m!=EXTEND) { - for(set::iterator i=neighbors.begin(); i!=neighbors.end(); ++i) + for(set::iterator i=neighbors.begin(); i!=neighbors.end(); ++i) for(vector::iterator j=objects.begin(); j!=objects.end(); ++j) - if(Track *track = dynamic_cast(j->object)) - track->break_link(**i); + j->object->break_link(**i); } const set <racks = designer.get_layout().get_tracks(); @@ -357,8 +339,7 @@ void Manipulator::button_press(unsigned btn) if(!ok) continue; for(vector::iterator j=objects.begin(); j!=objects.end(); ++j) - if(Track *track = dynamic_cast(j->object)) - track->snap_to(**i, true); + j->object->link_to(**i); } if(m==EXTEND) @@ -407,9 +388,8 @@ void Manipulator::axis_motion(unsigned axis, float value, float) continue; for(vector::iterator j=objects.begin(); (j!=objects.end() && !snapped); ++j) - if(Track *track = dynamic_cast(j->object)) - if(track->snap_to(**i, false, limit)) - snapped = &*j; + if(j->object->snap_to(**i, limit)) + snapped = &*j; } if(snapped) @@ -451,9 +431,6 @@ void Manipulator::axis_motion(unsigned axis, float value, float) for(vector::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::iterator i=neighbors.begin(); i!=neighbors.end(); ++i) - (*i)->check_slope(); } else if(mode==EXTEND) { @@ -462,29 +439,24 @@ void Manipulator::axis_motion(unsigned axis, float value, float) float length = 0; for(vector::iterator i=objects.begin(); i!=objects.end(); ++i) { - Track *track = dynamic_cast(i->object); - if(!track) - continue; - - unsigned n_endpoints = track->get_type().get_endpoints().size(); - for(unsigned j=0; jobject->get_n_link_slots(); + for(unsigned j=0; jget_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); + float c = cos(sn.rotation); + float s = sin(sn.rotation); + float dx = gpointer.x-sn.position.x; + float dy = gpointer.y-sn.position.y; float len = dx*c+dy*s; if(lenget_type().get_endpoints().size(); for(unsigned j=0; jget_endpoint_position(j); + Vector p = track->get_snap_node(j).position; if(i==objects.begin() && j==0) minp = maxp = p; else @@ -595,24 +567,21 @@ void Manipulator::update_neighbors() neighbors.clear(); for(vector::iterator i=objects.begin(); i!=objects.end(); ++i) { - Track *track = dynamic_cast(i->object); - if(!track) - continue; - - const vector &links = track->get_links(); - for(vector::const_iterator j=links.begin(); j!=links.end(); ++j) + unsigned nls = i->object->get_n_link_slots(); + for(unsigned j=0; jobject->get_link(j); + if(!linked) continue; - if(neighbors.count(*j)) + if(neighbors.count(linked)) continue; bool ok = true; for(vector::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); } } } @@ -702,7 +671,7 @@ vector Manipulator::create_straight(const R2C2::Vector &start, float di 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;