Enforce a lower limit for camera distance

[r2c2.git] / source / designer / manipulator.cpp

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index 42c422923ab7540c4e686263f1bc4a82040370f2..850f79f8be25d857721757004b4ab2a3b8535ebf 100644 (file)
--- a/source/designer/manipulator.cpp
+++ b/source/designer/manipulator.cpp
@@ -64,7 +64,7 @@ void Manipulator::duplicate()
        list<Track *> new_tracks;
        for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
        {
-               Track *track = new Track(*designer.get_layout(), i->track->get_type());
+               Track *track = new Track(designer.get_layout(), i->track->get_type());
                track->set_position(i->track->get_position());
                track->set_rotation(i->track->get_rotation());
                new_tracks.push_back(track);
@@ -227,7 +227,7 @@ void Manipulator::connect()
        float dir1;
        Track *track2 = tracks.back().track;
        bool ok = false;
-       float gap;
+       float gap = 0;
        for(unsigned i=0; i<track1->get_type().get_endpoints().size(); ++i)
        {
                if(track1->get_link(i))
@@ -280,10 +280,10 @@ void Manipulator::connect()
                return;
        }
 
-       const map<unsigned, TrackType *> &track_types = designer.get_catalogue().get_tracks();
+       const Catalogue::TrackMap &track_types = designer.get_catalogue().get_tracks();
        std::map<float, const TrackType *> types_by_length;
        unsigned preference = 0;
-       for(map<unsigned, TrackType *>::const_iterator i=track_types.begin(); i!=track_types.end(); ++i)
+       for(Catalogue::TrackMap::const_iterator i=track_types.begin(); i!=track_types.end(); ++i)
        {
                const vector<TrackPart> &parts = i->second->get_parts();
                if(parts.size()!=1)
@@ -348,7 +348,7 @@ void Manipulator::connect()
                if(j==types_by_length.end())
                        throw LogicError("Internal error");
 
-               Track *track = new Track(*designer.get_layout(), *j->second);
+               Track *track = new Track(designer.get_layout(), *j->second);
                track->set_position(pos1);
                track->set_rotation(dir1);
 
@@ -375,7 +375,7 @@ void Manipulator::button_press(int, int, float, float, unsigned btn)
                        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();
+               const set<Track *> &ltracks = designer.get_layout().get_tracks();
                for(set<Track *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
                {
                        bool ok = true;
@@ -409,7 +409,7 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy)
                        i->track->set_rotation(i->rot);
                }
 
-               const set<Track *> &ltracks = designer.get_layout()->get_tracks();
+               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)
                {