X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.cpp;h=802adb16fd45942e95deb2ac7038b347cb909557;hb=679c37910ab4d8030b3c09f6591381789b14a5f0;hp=5bf02e9760ab2765cc01e0842c111b760b89b429;hpb=0b75458245997b9df6da47cc4534341c8426084b;p=r2c2.git

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index 5bf02e9..802adb1 100644
--- a/source/designer/manipulator.cpp
+++ b/source/designer/manipulator.cpp
@@ -116,9 +116,6 @@ void Manipulator::flatten()
 			track->set_slope(0);
 	}
 
-	for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
-		(*i)->check_slope();
-
 	update_objects();
 }
 
@@ -142,7 +139,7 @@ void Manipulator::even_slope(bool smooth)
 	float total_len = 0;
 
 	list<TrackOrder> order;
-	Track *cur = *neighbors.begin();
+	Track *cur = dynamic_cast<Track *>(*neighbors.begin());
 	while(tracks2.size())
 	{
 		bool rev = false;
@@ -167,7 +164,7 @@ void Manipulator::even_slope(bool smooth)
 		total_len += cur->get_type().get_total_length();
 	}
 
-	set<Track *>::iterator nb = neighbors.begin();
+	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;
@@ -204,9 +201,6 @@ void Manipulator::even_slope(bool smooth)
 		cur_z += dz;
 	}
 
-	for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
-		(*i)->check_slope();
-
 	update_objects();
 }
 
@@ -307,9 +301,6 @@ void Manipulator::cancel()
 		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();
@@ -334,7 +325,7 @@ void Manipulator::button_press(unsigned btn)
 
 		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)
 					j->object->break_link(**i);
 		}
@@ -440,9 +431,6 @@ void Manipulator::axis_motion(unsigned axis, float value, float)
 
 		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();
 	}
 	else if(mode==EXTEND)
 	{
@@ -579,24 +567,21 @@ void Manipulator::update_neighbors()
 	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);
 		}
 	}
 }