Merge remote-tracking branch 'drummyfish/cs-cam'

apps/opencs/model/prefs/state.cpp

@@ -180,6 +180,7 @@ void CSMPrefs::State::declare()
     declareDouble ("navi-free-speed-mult", "Free Camera Speed Multiplier (from Modifier)", 8).setRange(0.001, 1000.0);
     declareDouble ("navi-orbit-rot-speed", "Orbital Camera Rotational Speed", 3.14 / 4).setRange(0.001, 6.28);
     declareDouble ("navi-orbit-speed-mult", "Orbital Camera Speed Multiplier (from Modifier)", 4).setRange(0.001, 1000.0);
+    declareBool ("navi-orbit-const-roll", "Keep camera roll constant for orbital camera", true);
     declareSeparator();
     declareBool ("context-select", "Context Sensitive Selection", false);
     declareDouble ("drag-factor", "Mouse sensitivity during drag operations", 1.0).
@@ -193,6 +194,11 @@ void CSMPrefs::State::declare()
     declareDouble ("rotate-factor", "Free rotation factor", 0.007).setPrecision(4).setRange(0.0001, 0.1);
     declareDouble ("object-marker-alpha", "Object Marker Transparency", 0.5).setPrecision(2).setRange(0,1);
 
+    declareCategory ("Rendering");
+    declareDouble ("camera-fov", "Camera FOV", 90.).setPrecision(5).setRange(10.0, 160.0);
+    declareBool ("camera-ortho", "Orthographic projection for camera", false);
+    declareDouble ("camera-ortho-size", "Orthographic projection size parameter", 100.0).setPrecision(5).setRange(0.0, 1000.0);
+
     declareCategory ("Tooltips");
     declareBool ("scene", "Show Tooltips in 3D scenes", true);
     declareBool ("scene-hide-basic", "Hide basic  3D scenes tooltips", false);

apps/opencs/view/prefs/dialogue.cpp

@@ -84,7 +84,6 @@ CSVPrefs::Dialogue::~Dialogue()
 void CSVPrefs::Dialogue::closeEvent (QCloseEvent *event)
 {
     QMainWindow::closeEvent (event);
-
     CSMPrefs::State::get().save();
 }
 

apps/opencs/view/render/cameracontroller.cpp

@@ -668,16 +668,25 @@ namespace CSVRender
 
         mInitialized = true;
     }
+    
+    void OrbitCameraController::setConstRoll(bool enabled)
+    {
+        mConstRoll = enabled;
+    }
 
     void OrbitCameraController::rotateHorizontal(double value)
     {
         osg::Vec3d eye, center, up;
         getCamera()->getViewMatrixAsLookAt(eye, center, up);
+        osg::Vec3d absoluteUp = osg::Vec3(0,0,1);
 
-        osg::Quat rotation = osg::Quat(value, up);
+        osg::Quat rotation = osg::Quat(value, mConstRoll ? absoluteUp : up);
         osg::Vec3d oldOffset = eye - mCenter;
         osg::Vec3d newOffset = rotation * oldOffset;
 
+        if (mConstRoll)
+            up = rotation * up;
+
         getCamera()->setViewMatrixAsLookAt(mCenter + newOffset, mCenter, up);
     }
 
@@ -687,9 +696,14 @@ namespace CSVRender
         getCamera()->getViewMatrixAsLookAt(eye, center, up);
 
         osg::Vec3d forward = center - eye;
-        osg::Quat rotation = osg::Quat(value, up ^ forward);
+        osg::Vec3d axis = up ^ forward;
+
+        osg::Quat rotation = osg::Quat(value,axis);
         osg::Vec3d oldOffset = eye - mCenter;
         osg::Vec3d newOffset = rotation * oldOffset;
+            
+        if (mConstRoll)
+            up = rotation * up;
 
         getCamera()->setViewMatrixAsLookAt(mCenter + newOffset, mCenter, up);
     }

apps/opencs/view/render/cameracontroller.hpp

@@ -160,6 +160,8 @@ namespace CSVRender
             /// \brief Flag controller to be re-initialized.
             void reset();
 
+            void setConstRoll(bool enable);
+
         private:
 
             void initialize();
@@ -181,6 +183,8 @@ namespace CSVRender
             double mOrbitSpeed;
             double mOrbitSpeedMult;
 
+            bool mConstRoll;
+
         private slots:
 
             void naviPrimary(bool active);

apps/opencs/view/render/scenewidget.cpp

@@ -56,6 +56,7 @@ RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f)
     traits->vsync = false;
 
     mView = new osgViewer::View;
+    updateCameraParameters( traits->width / static_cast<double>(traits->height) );
 
     osg::ref_ptr<osgQt::GraphicsWindowQt> window = new osgQt::GraphicsWindowQt(traits.get());
     QLayout* layout = new QHBoxLayout(this);
@@ -66,7 +67,6 @@ RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f)
     mView->getCamera()->setGraphicsContext(window);
     mView->getCamera()->setClearColor( osg::Vec4(0.2, 0.2, 0.6, 1.0) );
     mView->getCamera()->setViewport( new osg::Viewport(0, 0, traits->width, traits->height) );
-    mView->getCamera()->setProjectionMatrixAsPerspective(30.0f, static_cast<double>(traits->width)/static_cast<double>(traits->height), 1.0f, 10000.0f );
 
     SceneUtil::LightManager* lightMgr = new SceneUtil::LightManager;
     lightMgr->setStartLight(1);
@@ -188,6 +188,8 @@ SceneWidget::SceneWidget(std::shared_ptr<Resource::ResourceSystem> resourceSyste
 
     mOrbitCamControl->setPickingMask(Mask_Reference | Mask_Terrain);
 
+    mOrbitCamControl->setConstRoll( CSMPrefs::get()["3D Scene Input"]["navi-orbit-const-roll"].isTrue() );
+
     // we handle lighting manually
     mView->setLightingMode(osgViewer::View::NO_LIGHT);
 
@@ -370,6 +372,40 @@ void SceneWidget::settingChanged (const CSMPrefs::Setting *setting)
     {
         mOrbitCamControl->setOrbitSpeedMultiplier(setting->toDouble());
     }
+    else if (*setting=="3D Scene Input/navi-orbit-const-roll")
+    {
+        mOrbitCamControl->setConstRoll(setting->isTrue());
+    }
+    else if (*setting=="Rendering/camera-fov" ||
+             *setting=="Rendering/camera-ortho" ||
+             *setting=="Rendering/camera-ortho-size")
+    {
+        updateCameraParameters();
+    }
+}
+
+void RenderWidget::updateCameraParameters(double overrideAspect)
+{
+    const float nearDist = 1.0;
+    const float farDist = 1000.0;
+
+    if (CSMPrefs::get()["Rendering"]["camera-ortho"].isTrue())
+    {
+        const float size = CSMPrefs::get()["Rendering"]["camera-ortho-size"].toDouble();
+        const float aspect = overrideAspect >= 0.0 ? overrideAspect : (width() / static_cast<double>(height()));
+        const float halfH = size * 10.0;
+        const float halfW = halfH * aspect;
+
+        mView->getCamera()->setProjectionMatrixAsOrtho(
+            -halfW, halfW, -halfH, halfH, nearDist, farDist);
+    }
+    else
+    { 
+        mView->getCamera()->setProjectionMatrixAsPerspective(
+            CSMPrefs::get()["Rendering"]["camera-fov"].toDouble(),
+            static_cast<double>(width())/static_cast<double>(height()),
+            nearDist, farDist);
+    }
 }
 
 void SceneWidget::selectNavigationMode (const std::string& mode)

apps/opencs/view/render/scenewidget.hpp

@@ -64,6 +64,8 @@ namespace CSVRender
             osg::ref_ptr<osgViewer::View> mView;
             osg::ref_ptr<osg::Group> mRootNode;
 
+            void updateCameraParameters(double overrideAspect = -1.0);
+
             QTimer mTimer;
 
         protected slots: