Move gauge to TrackAppearance

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

diff --git a/source/designer/cameracontroller.cpp b/source/designer/cameracontroller.cpp
index 29eb4c0694edb7c267296ddc623ab6cfa46ae359..7b7e5f1339672d0dac127d8a5931a76d6f54ef57 100644 (file)
--- a/source/designer/cameracontroller.cpp
+++ b/source/designer/cameracontroller.cpp
@@ -18,11 +18,11 @@ CameraController::CameraController(View3D &v, Input::Keyboard &k, Input::Mouse &
        ctrl_pressed(false),
        drag_mode(NONE)
 {
-       mouse.signal_button_press.connect(sigc::mem_fun(this, &CameraController::button_press));
-       mouse.signal_button_release.connect(sigc::mem_fun(this, &CameraController::button_release));
-       mouse.signal_axis_motion.connect(sigc::mem_fun(this, &CameraController::axis_motion));
-       keyboard.signal_button_press.connect(sigc::mem_fun(this, &CameraController::key_press));
-       keyboard.signal_button_release.connect(sigc::mem_fun(this, &CameraController::key_release));
+       mouse.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &CameraController::button_press), false));
+       mouse.signal_button_release.connect(sigc::bind_return(sigc::mem_fun(this, &CameraController::button_release), false));
+       mouse.signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &CameraController::axis_motion), false));
+       keyboard.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &CameraController::key_press), false));
+       keyboard.signal_button_release.connect(sigc::bind_return(sigc::mem_fun(this, &CameraController::key_release), false));
 }
 
 void CameraController::top_down()
@@ -37,7 +37,7 @@ void CameraController::set_look_direction(const GL::Vector3 &look)
        GL::Vector3 focus = get_focus();
        float dist = get_distance();
        camera.set_look_direction(look);
-       camera.set_position(GL::Vector3(focus.x-look.x*dist, focus.y-look.y*dist, focus.z-look.z*dist));
+       camera.set_position(focus-look*dist);
 }
 
 void CameraController::view_all()
@@ -49,10 +49,9 @@ void CameraController::move(float x, float y)
 {
        const GL::Vector3 &pos = camera.get_position();
        const GL::Vector3 &look = camera.get_look_direction();
-       float xy_len = sqrt(look.x*look.x+look.y*look.y);
-       float dx = (look.x*y+look.y*x)/xy_len;
-       float dy = (look.y*y-look.x*x)/xy_len;
-       camera.set_position(GL::Vector3(pos.x+dx, pos.y+dy, pos.z));
+       GL::Vector3 fwd_dir = normalize(GL::Vector3(look.x, look.y, 0));
+       GL::Vector3 right_dir = cross(fwd_dir, GL::Vector3(0, 0, 1));
+       camera.set_position(pos+fwd_dir*y+right_dir*x);
 }
 
 void CameraController::adjust_distance(float delta)
@@ -60,23 +59,22 @@ void CameraController::adjust_distance(float delta)
        const GL::Vector3 &pos = camera.get_position();
        const GL::Vector3 &look = camera.get_look_direction();
        float dist = get_distance();
-       float low = view.get_layout().get_layout().get_catalogue().get_gauge()*5;
+       // XXX This should probably depend on the layout contents in some way
+       float low = 0.1;
        if(dist+delta<low)
                delta = low-dist;
-       camera.set_position(GL::Vector3(pos.x-look.x*delta, pos.y-look.y*delta, pos.z-look.z*delta));
+       camera.set_position(pos-look*delta);
        dist += delta;
        camera.set_depth_clip(dist*0.02, dist*50);
 }
 
-void CameraController::rotate(float angle)
+void CameraController::rotate(const Angle &angle)
 {
        GL::Vector3 look = camera.get_look_direction();
-       float c = cos(angle);
-       float s = sin(angle);
-       set_look_direction(GL::Vector3(look.x*c-look.y*s, look.x*s+look.y*c, look.z));
+       set_look_direction(rotated_vector(look, angle));
 }
 
-void CameraController::pitch(float angle)
+void CameraController::pitch(const Angle &angle)
 {
        GL::Vector3 look = camera.get_look_direction();
        float xy_len = sqrt(look.x*look.x+look.y*look.y);
@@ -139,9 +137,9 @@ void CameraController::axis_motion(unsigned axis, float, float change)
        else if(drag_mode==ROTATE)
        {
                if(axis==0)
-                       rotate(-change*M_PI);
+                       rotate(Angle::from_turns(-change/2));
                else if(axis==1)
-                       pitch(change*M_PI/2);
+                       pitch(Angle::from_turns(change/4));
        }
        else if(drag_mode==DISTANCE && axis==1)
                adjust_distance(-change*3*get_distance());
@@ -194,6 +192,6 @@ float CameraController::get_distance() const
 
 float CameraController::get_view_scale() const
 {
-       float t = tan(camera.get_field_of_view()/2)*2;
+       float t = tan(camera.get_field_of_view()/2.0f)*2.0f;
        return get_distance()*t;
 }