Store zone blocks in order and use add_tracks to load them

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

diff --git a/source/designer/cameracontroller.cpp b/source/designer/cameracontroller.cpp
index 0679cbe2f165934f93824929c6268640100690aa..ef0020081dbc1652bd66dd97b278db36defb49a7 100644 (file)
--- a/source/designer/cameracontroller.cpp
+++ b/source/designer/cameracontroller.cpp
@@ -59,7 +59,8 @@ 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(pos-look*delta);
@@ -109,13 +110,9 @@ void CameraController::button_press(unsigned btn)
                        drag_mode = ((btn==2)==shift_pressed ? ROTATE : PAN);
        }
        else if(btn==4)
-       {
                adjust_distance(-get_distance()*0.1);
-       }
        else if(btn==5)
-       {
                adjust_distance(get_distance()*0.1);
-       }
 }
 
 void CameraController::button_release(unsigned btn)
@@ -191,6 +188,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;
 }