Fixed TrackballNavigationEventListener setting the window ratio of its...

Fixed TrackballNavigationEventListener setting the window ratio of its CameraProperty being directly overwritten due to concurrent access.

core/eventhandlers/trackballnavigationeventlistener.cpp

@@ -158,7 +158,13 @@ namespace campvis {
 
         _trackball->setViewprtSize(_viewportSizeProp->getValue());
         float ratio = static_cast<float>(_viewportSizeProp->getValue().x) / static_cast<float>(_viewportSizeProp->getValue().y);
-        _cameraProperty->setWindowRatio(ratio);
+
+        if (ratio == 0) {
+            LERROR("Window ratio must not be 0.");
+        }
+        else {
+            _trackball->setWindowRatio(ratio);
+        }
     }
 
 }

core/properties/cameraproperty.cpp

@@ -37,14 +37,4 @@ namespace campvis {
     CameraProperty::~CameraProperty() {
     }
 
-    void CameraProperty::setWindowRatio(float r) {
-        if (r == 0) {
-            LERROR("Window ratio must not be 0.");
-            return;
-        }
-        tgt::Camera c = getValue();
-        c.setWindowRatio(r);
-        setValue(c);
-    }
-
 }

core/properties/cameraproperty.h

@@ -47,11 +47,6 @@ namespace campvis {
         virtual ~CameraProperty();
 
 
-        /**
-         * Sets the camera's window ratio.
-         * \param r     The new camera's window ratio (viewport.x / viewport.y)
-         */
-        void setWindowRatio(float r);
 
     protected:
 

ext/tgt/navigation/trackball.cpp

@@ -552,6 +552,11 @@ void Trackball::timerEvent(TimeEvent* e) {
     }
 }
 
+void Trackball::setWindowRatio(float r) {
+    getCamera()->setWindowRatio(r);
+    hcam_->update();
+}
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
 

ext/tgt/navigation/trackball.h

@@ -247,6 +247,12 @@ class TGT_API Trackball : public Navigation {
             if (getCamera() != 0)
                 reset();
         }
+        
+        /**
+         * Sets the camera's window ratio.
+         * \param r     The new camera's window ratio (viewport.x / viewport.y)
+         */
+        void setWindowRatio(float r);
 
 ///////////////////////////////////////////////////////////////////////////////////////////////