カメラ制御処理のソース整理

diff --git a/Src/QtGeoViewer/View3D.cpp b/Src/QtGeoViewer/View3D.cpp
index 426badf..345ba21 100644 (file)
--- a/Src/QtGeoViewer/View3D.cpp
+++ b/Src/QtGeoViewer/View3D.cpp
@@ -1695,12 +1695,11 @@ bool View3D::MouseMove_OnCameraControl(QMouseEvent* e, QPointF& diff)
        if (mouse.Mid || (mouse.Left && mouse.Right))
        {
                LockMouseMoveDir(m, mx, my);
-
                mx *= camera_dist;
                my *= camera_dist;
                mx = -mx;
 
-               manip.Track( mx , my );
+               manip.Track(mx, my);
        }
        else if (mouse.Right)
        {
@@ -1716,7 +1715,6 @@ bool View3D::MouseMove_OnCameraControl(QMouseEvent* e, QPointF& diff)
                else
                {
                        LockMouseMoveDir(m, mx, my);
-
                        mx *= camera_dist;
                        my *= camera_dist;
                        mx = -mx;
@@ -1726,23 +1724,22 @@ bool View3D::MouseMove_OnCameraControl(QMouseEvent* e, QPointF& diff)
        }
        else if (mouse.Left)
        {
+               LockMouseMoveDir(m, mx, my);
                mx *= float(M_PI);
                my *= float(M_PI);
                mx = -mx;
                my = -my;
 
-               LockMouseMoveDir(m, mx, my);
-
                if (!m_FpsMode)
                {
                        if (m_CameraReverse)
                                mx *= -1.0f;
 
-                       manip.Tumble( mx , my );
+                       manip.Tumble(mx, my);
                }
                else
                {
-                       manip.Rotate( mx , my );
+                       manip.Rotate(mx, my);
                }
        }
        else