added state change signaling for the camera state

Author: Haydelj

src/Interface/Modules/Render/ES/SRCamera.h

@@ -96,13 +96,13 @@ namespace SCIRun{
                                 static_cast<float>(mInterface.getScreenHeightPixels());}
 
       float getDistance() const {return mArcLookAt->getDistance();}
-      void setDistance(const float f) {mArcLookAt->setDistance(f);}
+      void setDistance(const float f) {mArcLookAt->setDistance(f); setClippingPlanes();}
 
       glm::vec3 getLookAt() const {return mArcLookAt->getLookAt();}
-      void setLookAt(const glm::vec3 v) {mArcLookAt->setLookAt(v);}
+      void setLookAt(const glm::vec3 v) {mArcLookAt->setLookAt(v); setClippingPlanes();}
 
       glm::quat getRotation() const {return mArcLookAt->getRotation();}
-      void setRotation(const glm::quat q) {mArcLookAt->setRotation(q);}
+      void setRotation(const glm::quat q) {mArcLookAt->setRotation(q); setClippingPlanes();}
 
       void setLockZoom(bool lock)     {lockZoom_ = lock;}
       void setLockPanning(bool lock)  {lockPanning_ = lock;}

src/Interface/Modules/Render/ES/SRInterface.cc

@@ -1408,8 +1408,8 @@ namespace SCIRun {
     //----------------------------------------------------------------------------------------------
     void SRInterface::doFrame(double currentTime, double constantDeltaTime)
     {
-      /// \todo Only render a frame if something has changed (new or deleted
-      /// objects, or the view point has changed).
+      // todo Only render a frame if something has changed (new or deleted
+      // objects, or the view point has changed).
       mContext->makeCurrent();
 
       applyAutoRotation();

src/Interface/Modules/Render/ES/SRInterface.h

@@ -202,8 +202,8 @@ namespace SCIRun {
       void setupLights();
 
       //---------------- Camera ----------------------------------------------------------------------
-      void updateCamera(); // Places mCamera's transform into our static camera component.
       void applyAutoRotation();
+      void updateCamera(); // Places mCamera's transform into our static camera component.
 
       //---------------- Widgets -------------------------------------------------------------------
       bool foundWidget(const glm::ivec2& pos); // search for a widget at mouse position

src/Interface/Modules/Render/ViewScene.cc

@@ -140,6 +140,15 @@ ViewSceneDialog::ViewSceneDialog(const std::string& name, ModuleStateHandle stat
   state->connectSpecificStateChanged(Parameters::GeomData,[this](){Q_EMIT newGeometryValueForwarder();});
   connect(this, SIGNAL(newGeometryValueForwarder()), this, SLOT(updateAllGeometries()));
 
+  state->connectSpecificStateChanged(Modules::Render::ViewScene::CameraRotation,[this](){Q_EMIT cameraRotationChangeForwarder();});
+  connect(this, SIGNAL(cameraRotationChangeForwarder()), this, SLOT(pullCameraRotation()));
+
+  state->connectSpecificStateChanged(Modules::Render::ViewScene::CameraLookAt,[this](){Q_EMIT cameraLookAtChangeForwarder();});
+  connect(this, SIGNAL(cameraLookAtChangeForwarder()), this, SLOT(pullCameraLookAt()));
+
+  state->connectSpecificStateChanged(Modules::Render::ViewScene::CameraDistance,[this](){Q_EMIT cameraDistnaceChangeForwarder();});
+  connect(this, SIGNAL(cameraDistnaceChangeForwarder()), this, SLOT(pullCameraDistance()));
+
   std::string filesystemRoot = Application::Instance().executablePath().string();
   std::string sep;
   sep += boost::filesystem::path::preferred_separator;
@@ -492,9 +501,43 @@ void ViewSceneDialog::pullCameraState()
   spire->setCameraRotation(glm::quat(rotation[0], rotation[1], rotation[2], rotation[3]));
 }
 
+//--------------------------------------------------------------------------------------------------
+void ViewSceneDialog::pullCameraRotation()
+{
+  if(pushingCameraState_) return;
+  auto spire = mSpire.lock();
+  if(!spire) return;
+
+  auto rotation = toDoubleVector(state_->getValue(Modules::Render::ViewScene::CameraRotation).toVector());
+  spire->setCameraRotation(glm::quat(rotation[0], rotation[1], rotation[2], rotation[3]));
+}
+
+//--------------------------------------------------------------------------------------------------
+void ViewSceneDialog::pullCameraLookAt()
+{
+  if(pushingCameraState_) return;
+  auto spire = mSpire.lock();
+  if(!spire) return;
+
+  auto lookAt = toDoubleVector(state_->getValue(Modules::Render::ViewScene::CameraLookAt).toVector());
+  spire->setCameraLookAt(glm::vec3(lookAt[0], lookAt[1], lookAt[2]));
+}
+
+//--------------------------------------------------------------------------------------------------
+void ViewSceneDialog::pullCameraDistance()
+{
+  if(pushingCameraState_) return;
+  auto spire = mSpire.lock();
+  if(!spire) return;
+
+  float distance = state_->getValue(Modules::Render::ViewScene::CameraDistance).toDouble();
+  spire->setCameraDistance(distance);
+}
+
 //--------------------------------------------------------------------------------------------------
 void ViewSceneDialog::pushCameraState()
 {
+  pushingCameraState_ = true;
   auto spire = mSpire.lock();
   if(!spire) return;
 
@@ -507,6 +550,7 @@ void ViewSceneDialog::pushCameraState()
   glm::quat q = spire->getCameraRotation();
   auto rotation = makeAnonymousVariableList((double)q.w, (double)q.x, (double)q.y, (double)q.z);
   state_->setValue(Modules::Render::ViewScene::CameraRotation, rotation);
+  pushingCameraState_ = false;
 }
 
 //--------------------------------------------------------------------------------------------------

src/Interface/Modules/Render/ViewScene.h

@@ -69,6 +69,9 @@ namespace SCIRun {
 
     Q_SIGNALS:
       void newGeometryValueForwarder();
+      void cameraRotationChangeForwarder();
+      void cameraLookAtChangeForwarder();
+      void cameraDistnaceChangeForwarder();
       void mousePressSignalForTestingGeometryObjectFeedback(int x, int y, const std::string& selName);
 
 
@@ -110,6 +113,9 @@ namespace SCIRun {
       void autoRotateLeft();
       void autoRotateUp();
       void autoRotateDown();
+      void pullCameraRotation();
+      void pullCameraLookAt();
+      void pullCameraDistance();
 
 
       //---------------- Widgets -------------------------------------------------------------------
@@ -298,6 +304,7 @@ namespace SCIRun {
       bool                                  saveScreenshotOnNewGeometry_  {false};
       bool                                  pulledSavedVisibility_        {false};
       QTimer                                resizeTimer_                  {};
+      std::atomic<bool>                     pushingCameraState_           {false};
 
       //geometries
       Modules::Visualization::TextBuilder               textBuilder_        {};