X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.cpp;h=77269228b88567f92dc9575dd1a49ce7c955f98a;hb=d84f187ca34a6ab2f8c37d85fa13d5c113714344;hp=e690c1d43aa34bf242361a0e485d49117a4b4574;hpb=c0c5a34d1056eabdebd350da3534e24c902c0dac;p=r2c2.git

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index e690c1d..7726922 100644
--- a/source/designer/manipulator.cpp
+++ b/source/designer/manipulator.cpp
@@ -1,480 +1,91 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <algorithm>
 #include <cmath>
-#include <GL/gl.h>
-#include <msp/strings/formatter.h>
-#include "3d/layout.h"
-#include "libmarklin/tracktype.h"
+#include <msp/strings/format.h>
+#include "libr2c2/tracktype.h"
 #include "designer.h"
 #include "manipulator.h"
 #include "selection.h"
 
 using namespace std;
-using namespace Marklin;
+using namespace R2C2;
 using namespace Msp;
 
-Manipulator::Manipulator(Designer &d, Selection &s):
-	designer(d),
-	selection(s),
-	wrap_rot(0),
-	mode(NONE),
-	angle(0)
-{
-	selection.signal_changed.connect(sigc::mem_fun(this, &Manipulator::selection_changed));
-}
-
-void Manipulator::start_move()
-{
-	if(mode)
-		cancel();
-
-	move_origin = gpointer;
-
-	mode = MOVE;
-}
-
-void Manipulator::start_rotate()
-{
-	if(mode)
-		cancel();
-
-	rot_origin = atan2(gpointer.y-center.y, gpointer.x-center.x);
-
-	mode = ROTATE;
-}
-
-void Manipulator::start_elevate()
-{
-	if(mode)
-		cancel();
-
-	elev_origin = pointer_y;
-
-	mode = ELEVATE;
-}
-
-void Manipulator::duplicate()
-{
-	if(mode)
-		cancel();
-
-	list<Track *> new_tracks;
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-	{
-		Track *track = i->track->copy();
-		designer.get_layout()->add_track(*track);
-		new_tracks.push_back(track);
-	}
-
-	selection.clear();
-	for(list<Track *>::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i)
-	{
-		selection.add_track(*i);
-		for(list<Track *>::iterator j=i; j!=new_tracks.end(); ++j)
-			if(j!=i)
-				(*i)->snap_to(**j, true);
-	}
-}
-
-void Manipulator::flatten()
-{
-	if(mode)
-		cancel();
-
-	if(tracks.empty()) return;
-
-	float z = 0;
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		z += i->track->get_position().z+i->track->get_slope()/2;
-	z /= tracks.size();
-
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-	{
-		Point p = i->track->get_position();
-		i->track->set_position(Point(p.x, p.y, z));
-		i->track->set_slope(0);
-	}
-
-	for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
-		(*i)->check_slope();
-
-	update_wrap();
-}
-
-void Manipulator::even_slope(bool smooth)
+Manipulator::Manipulator(Designer &d, Input::Keyboard &k, Input::Mouse &m, const set<Object *> &objs):
+	Tool(d, k, m)
 {
-	if(mode)
-		cancel();
-
-	if(neighbors.size()!=2)
-		return;
-
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if(i->track->get_type().get_endpoints().size()!=2)
-			return;
-
-	list<Track *> tracks2;
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		tracks2.push_back(i->track);
-
-	float total_len = 0;
-
-	list<TrackOrder> order;
-	Track *cur = *neighbors.begin();
-	while(tracks2.size())
+	set<Object *> pending = objs;
+	while(!pending.empty())
 	{
-		bool rev = false;
-		for(list<Track *>::iterator i=tracks2.begin(); i!=tracks2.end(); ++i)
+		for(set<Object *>::iterator i=pending.begin(); i!=pending.end(); )
 		{
-			const vector<Track *> &links = (*i)->get_links();
-			if(links[0]==cur)
+			if((*i)->get_parent() && pending.count((*i)->get_parent()))
+				++i;
+			else
 			{
-				cur = *i;
-				tracks2.erase(i);
-				break;
-			}
-			else if(links[1]==cur)
-			{
-				cur = *i;
-				rev = true;
-				tracks2.erase(i);
-				break;
+				objects.push_back(*i);
+				pending.erase(i++);
 			}
 		}
-		order.push_back(TrackOrder(cur, rev));
-		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;
-	++nb;
-	epi = (*nb)->get_endpoint_by_link(*order.back().track);
-	float end_z = (*nb)->get_endpoint_position(epi).z;
-
-	if(smooth)
-	{
-		float dir = (end_z>start_z)?1:-1;
-		float cur_slope = 0;
-		while((end_z-start_z)*dir/total_len>cur_slope+0.025 && order.size()>2)
-		{
-			cur_slope += 0.025;
+	Geometry::BoundingBox<float, 3> bbox;
+	for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
+		bbox = bbox|i->object->get_bounding_box();
 
-			float dz = order.front().track->get_type().get_total_length()*dir*cur_slope;
-			set_slope(order.front(), start_z, dz);
-			start_z += dz;
-			total_len -= order.front().track->get_type().get_total_length();
-			order.erase(order.begin());
+	const Vector &minp = bbox.get_minimum_point();
+	const Vector &maxp = bbox.get_maximum_point();
 
-			dz = order.back().track->get_type().get_total_length()*dir*cur_slope;
-			set_slope(order.back(), end_z-dz, dz);
-			end_z -= dz;
-			total_len -= order.back().track->get_type().get_total_length();
-			order.erase(--order.end());
-		}
-	}
-
-	float cur_z = start_z;
-	for(list<TrackOrder>::iterator i=order.begin(); i!=order.end(); ++i)
+	center = (minp+maxp)/2.0f;
+	center.z = minp.z;
+	for(ObjectArray::iterator i=objects.begin(); i!=objects.end(); ++i)
 	{
-		float dz = i->track->get_type().get_total_length()*(end_z-start_z)/total_len;
-		set_slope(*i, cur_z, dz);
-		cur_z += dz;
-	}
-
-	for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
-		(*i)->check_slope();
-
-	update_wrap();
-}
-
-void Manipulator::cancel()
-{
-	if(!mode)
-		return;
-	mode = NONE;
-
-	wrap_pos = center;
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-	{
-		i->track->set_position(Point(center.x+i->pos.x, center.y+i->pos.y, center.z+i->pos.z));
-		i->track->set_rotation(i->rot);
-	}
-
-	for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
-		(*i)->check_slope();
-
-	angle = 0;
-	wrap_rot = 0;
-
-	signal_done.emit(false);
-}
-
-void Manipulator::button_press(int, int, float, float, unsigned btn)
-{
-	if(btn==3)
-		cancel();
-	else if(mode)
-	{
-		mode = NONE;
-		update_wrap();
-		angle = 0;
-
-		for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
-			for(vector<MTrack>::iterator j=tracks.begin(); j!=tracks.end(); ++j)
-				j->track->break_link(**i);
-
-		const set<Track *> &ltracks = designer.get_layout()->get_tracks();
-		for(set<Track *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
-		{
-			bool ok = true;
-			for(vector<MTrack>::iterator j=tracks.begin(); (j!=tracks.end() && ok); ++j)
-				ok = (j->track!=*i);
-			if(!ok) continue;
-
-			for(vector<MTrack>::iterator j=tracks.begin(); j!=tracks.end(); ++j)
-				j->track->snap_to(**i, true);
-		}
-
-		for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-			i->rot = i->track->get_rotation();
-
-		update_neighbors();
-
-		signal_done.emit(true);
+		i->original_position = i->object->get_position()-center;
+		i->original_rotation = i->object->get_rotation();
 	}
 }
 
-void Manipulator::pointer_motion(int, int y, float gx, float gy)
+Manipulator::~Manipulator()
 {
-	pointer_y = y;
-	gpointer = Point(gx, gy, 0);
-
-	if(mode==MOVE)
+	if(!accepted)
 	{
-		Point delta(gpointer.x-move_origin.x, gpointer.y-move_origin.y, 0);
-
-		wrap_pos = Point(center.x+delta.x, center.y+delta.y, center.z);
-		for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		{
-			i->track->set_position(Point(wrap_pos.x+i->pos.x, wrap_pos.y+i->pos.y, wrap_pos.z+i->pos.z));
-			i->track->set_rotation(i->rot);
-		}
-
-		const set<Track *> &ltracks = designer.get_layout()->get_tracks();
-		MTrack *snapped = 0;
-		for(set<Track *>::const_iterator i=ltracks.begin(); (i!=ltracks.end() && !snapped); ++i)
+		for(ObjectArray::iterator i=objects.begin(); i!=objects.end(); ++i)
 		{
-			bool ok = true;
-			for(vector<MTrack>::iterator j=tracks.begin(); (j!=tracks.end() && ok); ++j)
-				ok = (j->track!=*i);
-			if(!ok) continue;
-
-			for(vector<MTrack>::iterator j=tracks.begin(); (j!=tracks.end() && !snapped); ++j)
-				if(j->track->snap_to(**i, false))
-					snapped = &*j;
-		}
-
-		if(snapped)
-		{
-			float da = snapped->track->get_rotation()-snapped->rot;
-			float c = cos(da);
-			float s = sin(da);
-			const Point &sp = snapped->track->get_position();
-			for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-			{
-				if(&*i==snapped)
-					continue;
-
-				Point dp(i->pos.x-snapped->pos.x, i->pos.y-snapped->pos.y, 0);
-				i->track->set_position(Point(sp.x+c*dp.x-s*dp.y, sp.y+s*dp.x+c*dp.y, sp.z));
-				i->track->set_rotation(i->rot+da);
-			}
+			i->object->set_position(center+i->original_position);
+			i->object->set_rotation(i->original_rotation);
 		}
 	}
-	else if(mode==ROTATE)
-	{
-		float a = atan2(gpointer.y-center.y, gpointer.x-center.x);
-		angle += a-rot_origin;
-		rot_origin = a;
-
-		wrap_rot = angle;
-		for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		{
-			float c = cos(angle);
-			float s = sin(angle);
-			i->track->set_position(Point(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->track->set_rotation(angle+i->rot);
-		}
-	}
-	else if(mode==ELEVATE)
-	{
-		float dz = (y-elev_origin)/1000.;
-
-		signal_status.emit(format("Elevation: %+.0fmm (%.0fmm)", dz*1000, (center.z+dz)*1000));
-
-		wrap_pos.z = center.z+dz;
-		for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-			i->track->set_position(Point(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();
-	}
-}
-
-void Manipulator::render()
-{
-	glPushMatrix();
-	glTranslatef(wrap_pos.x, wrap_pos.y, wrap_pos.z);
-	glRotatef(wrap_rot*180/M_PI, 0, 0, 1);
-
-	glLineWidth(2);
-	glColor4f(0, 1, 0, 0.5);
-	for(list<TrackWrap>::iterator i=wrap.begin(); i!=wrap.end(); ++i)
-	{
-		glPushMatrix();
-		glTranslatef(i->pos.x, i->pos.y, i->pos.z);
-		glRotatef(i->rot*180/M_PI, 0, 0, 1);
-
-		glBegin(GL_LINE_LOOP);
-		glVertex2f(-i->width/2, -i->height/2);
-		glVertex2f(i->width/2, -i->height/2);
-		glVertex2f(i->width/2, i->height/2);
-		glVertex2f(-i->width/2, i->height/2);
-		glEnd();
-
-		glPopMatrix();
-	}
-
-	glPopMatrix();
 }
 
-/*** private ***/
-
-void Manipulator::selection_changed()
+void Manipulator::finish()
 {
-	if(mode)
-		cancel();
-
-	tracks.clear();
-	const set<Track *> &stracks = selection.get_tracks();
-	tracks.insert(tracks.end(), stracks.begin(), stracks.end());
-
-	update_neighbors();
-	update_wrap();
-}
-
-void Manipulator::update_wrap()
-{
-	wrap.clear();
-	float min_x = 0, max_x = 0;
-	float min_y = 0, max_y = 0;
-	float min_z = 0;
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	set<Object *> object_set;
+	for(ObjectArray::iterator i=objects.begin(); i!=objects.end(); ++i)
+		object_set.insert(i->object);
+	for(ObjectArray::iterator i=objects.begin(); i!=objects.end(); ++i)
 	{
-		Track3D &t3d = designer.get_layout_3d()->get_track(*i->track);
-
-		TrackWrap tw;
-		float min_area = 100;
-		for(float a=0; a<M_PI; a+=0.01)
-		{
-			Point minp, maxp;
-			t3d.get_bounds(a, minp, maxp);
-			float area = (maxp.x-minp.x)*(maxp.y-minp.y);
-			if(area<min_area)
-			{
-				float c = cos(a);
-				float s = sin(a);
-				float x = (minp.x+maxp.x)/2;
-				float y = (minp.y+maxp.y)/2;
-				tw.pos = Point(c*x-s*y, s*x+c*y, minp.z);
-				tw.rot = a;
-				tw.width = maxp.x-minp.x+0.01;
-				tw.height = maxp.y-minp.y+0.01;
-
-				min_area = area;
-			}
-		}
-
-		if(i==tracks.begin())
-		{
-			min_x = max_x = tw.pos.x;
-			min_y = max_y = tw.pos.y;
-			min_z = tw.pos.z;
-		}
-		else
-		{
-			min_x = min(min_x, tw.pos.x);
-			max_x = max(max_x, tw.pos.x);
-			min_y = min(min_y, tw.pos.y);
-			max_y = max(max_y, tw.pos.y);
-			min_z = min(min_z, tw.pos.z);
-		}
-		wrap.push_back(tw);
+		unsigned nls = i->object->get_n_link_slots();
+		for(unsigned j=0; j<nls; ++j)
+			if(Object *link = i->object->get_link(j))
+				if(!object_set.count(link))
+					i->object->break_link(j);
 	}
 
-	center = Point((min_x+max_x)/2, (min_y+max_y)/2, min_z);
-	wrap_pos = center;
-	wrap_rot = 0;
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-	{
-		const Point &tp = i->track->get_position();
-		i->pos = Point(tp.x-center.x, tp.y-center.y, tp.z-center.z);
-	}
-	for(list<TrackWrap>::iterator i=wrap.begin(); i!=wrap.end(); ++i)
+	const set<Track *> &ltracks = designer.get_layout().get_all<Track>();
+	for(set<Track *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
 	{
-		i->pos.x -= center.x;
-		i->pos.y -= center.y;
-		i->pos.z -= center.z;
-	}
-}
-
-void Manipulator::update_neighbors()
-{
-	neighbors.clear();
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-	{
-		const vector<Track *> &links = i->track->get_links();
-		for(vector<Track *>::const_iterator j=links.begin(); j!=links.end(); ++j)
-		{
-			if(!*j)
-				continue;
-			if(neighbors.count(*j))
-				continue;
+		bool ok = true;
+		for(vector<MObject>::iterator j=objects.begin(); (j!=objects.end() && ok); ++j)
+			ok = (j->object!=*i);
+		if(!ok) continue;
 
-			bool ok = true;
-			for(vector<MTrack>::iterator k=tracks.begin(); (k!=tracks.end() && ok); ++k)
-				ok = (k->track!=*j);
-
-			if(ok)
-				neighbors.insert(*j);
-		}
+		for(vector<MObject>::iterator j=objects.begin(); j!=objects.end(); ++j)
+			j->object->link_to(**i);
 	}
 }
 
-void Manipulator::set_slope(TrackOrder &track, float z, float dz)
-{
-	const Point &p = track.track->get_position();
-	if(track.rev)
-	{
-		track.track->set_position(Point(p.x, p.y, z+dz));
-		track.track->set_slope(-dz);
-	}
-	else
-	{
-		track.track->set_position(Point(p.x, p.y, z));
-		track.track->set_slope(dz);
-	}
-}
 
-Manipulator::MTrack::MTrack(Track *t):
-	track(t),
-	pos(track->get_position()),
-	rot(track->get_rotation())
+Manipulator::MObject::MObject(Object *o):
+	object(o),
+	original_position(object->get_position()),
+	original_rotation(object->get_rotation())
 { }