fixed various issues brought up by @dcwhite

Author: Haydelj

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

@@ -74,13 +74,6 @@ namespace SCIRun {
       setClippingPlanes();
     }
 
-    //----------------------------------------------------------------------------------------------
-    void SRCamera::setViewMat(glm::mat4 view)
-    {
-      //mArcLookAt->setView(view[2].xyz(), up);
-      setClippingPlanes();
-    }
-
     //----------------------------------------------------------------------------------------------
     void SRCamera::mouseDownEvent(const glm::ivec2& pos, SRInterface::MouseButton btn)
     {

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

@@ -72,8 +72,6 @@ namespace SCIRun{
       /// Sets the selected View of the window to given up axis and view axis
       void setView(const glm::vec3& view, const glm::vec3& up);
 
-      void setViewMat(glm::mat4 view);
-
       /// Toggles the zoom controls on New Mouse Controls Inverted/Not Inverted
       void setZoomInverted(bool value);
 
@@ -97,14 +95,14 @@ namespace SCIRun{
       float getAspect() {return static_cast<float>(mInterface.getScreenWidthPixels()) /
                                 static_cast<float>(mInterface.getScreenHeightPixels());}
 
-      float getDistance() {return mArcLookAt->getDistance();}
-      void setDistance(float f) {mArcLookAt->setDistance(f);}
+      float getDistance() const {return mArcLookAt->getDistance();}
+      void setDistance(const float f) {mArcLookAt->setDistance(f);}
 
-      glm::vec3 getLookAt() {return mArcLookAt->getLookAt();}
-      void setLookAt(glm::vec3 v) {mArcLookAt->setLookAt(v);}
+      glm::vec3 getLookAt() const {return mArcLookAt->getLookAt();}
+      void setLookAt(const glm::vec3 v) {mArcLookAt->setLookAt(v);}
 
-      glm::quat getRotation() {return mArcLookAt->getRotation();}
-      void setRotation(glm::quat q) {mArcLookAt->setRotation(q);}
+      glm::quat getRotation() const {return mArcLookAt->getRotation();}
+      void setRotation(const glm::quat q) {mArcLookAt->setRotation(q);}
 
       void setLockZoom(bool lock)     {lockZoom_ = lock;}
       void setLockPanning(bool lock)  {lockPanning_ = lock;}

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

@@ -322,12 +322,12 @@ namespace SCIRun {
     }
 
     //Getters/Setters-------------------------------------------------------------------------------
-    void SRInterface::setCameraDistance(float distance) {mCamera->setDistance(distance);}
-    float SRInterface::getCameraDistance() {return mCamera->getDistance();}
-    void SRInterface::setCameraLookAt(glm::vec3 lookAt) {mCamera->setLookAt(lookAt);}
-    glm::vec3 SRInterface::getCameraLookAt() {return mCamera->getLookAt();}
-    void SRInterface::setCameraRotation(glm::quat roation) {mCamera->setRotation(roation);}
-    glm::quat SRInterface::getCameraRotation() {return mCamera->getRotation();}
+    void SRInterface::setCameraDistance(const float distance) {mCamera->setDistance(distance);}
+    float SRInterface::getCameraDistance() const {return mCamera->getDistance();}
+    void SRInterface::setCameraLookAt(const glm::vec3 lookAt) {mCamera->setLookAt(lookAt);}
+    glm::vec3 SRInterface::getCameraLookAt() const {return mCamera->getLookAt();}
+    void SRInterface::setCameraRotation(const glm::quat roation) {mCamera->setRotation(roation);}
+    glm::quat SRInterface::getCameraRotation() const {return mCamera->getRotation();}
     void SRInterface::setAutoRotateSpeed(double speed) { autoRotateSpeed = speed; }
     void SRInterface::setAutoRotateOnDrag(bool value) { doAutoRotateOnDrag = value; }
     void SRInterface::setZoomInverted(bool value) {mCamera->setZoomInverted(value);}

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

@@ -125,12 +125,12 @@ namespace SCIRun {
       void eventResize(size_t width, size_t height);
       void doAutoView();
       // Sets the selected View of the window
-      void setCameraDistance(float distance);
-      float getCameraDistance();
-      void setCameraLookAt(glm::vec3 lookAt);
-      glm::vec3 getCameraLookAt();
-      void setCameraRotation(glm::quat rotation);
-      glm::quat getCameraRotation();
+      void setCameraDistance(const float distance);
+      float getCameraDistance() const;
+      void setCameraLookAt(const glm::vec3 lookAt);
+      glm::vec3 getCameraLookAt() const;
+      void setCameraRotation(const glm::quat rotation);
+      glm::quat getCameraRotation() const;
       void setView(const glm::vec3& view, const glm::vec3& up);
       void setZoomSpeed(int zoomSpeed) {mZoomSpeed = zoomSpeed;}
       void setZoomInverted(bool value);

src/Interface/Modules/Render/ViewScene.cc

@@ -854,7 +854,6 @@ void ViewSceneDialog::wheelEvent(QWheelEvent* event)
     updateModifiedGeometries();
   }
 
-  //pushCameraState();
   auto spire = mSpire.lock();
   if(!spire) return;
   state_->setValue(Modules::Render::ViewScene::CameraDistance, (double)spire->getCameraDistance());
@@ -1938,8 +1937,11 @@ void ViewSceneDialog::setSpecularValue(double value)
 //--------------------------------------------------------------------------------------------------
 void ViewSceneDialog::setShininessValue(double value)
 {
+  const static int maxSpecExp = 40;
+  const static int minSpecExp = 1;
   state_->setValue(Modules::Render::ViewScene::Shine, value);
-  setMaterialFactor(SRInterface::MAT_SHINE, value * value * 39 + 1);
+  //taking square of value makes the ui a little more intuitive in my opinion
+  setMaterialFactor(SRInterface::MAT_SHINE, value * value * (maxSpecExp - minSpecExp) + minSpecExp);
   updateAllGeometries();
 }
 

src/Interface/Modules/Render/ViewScene.h

@@ -39,7 +39,6 @@ DEALINGS IN THE SOFTWARE.
 #include <Interface/Modules/Render/ViewSceneControlsDock.h>
 #include <Graphics/Datatypes/GeometryImpl.h>
 #include <Interface/Modules/Render/share.h>
-#include <glm/gtc/quaternion.hpp>
 
 //TODO: needs to inherit from ModuleWidget somehow
 class QToolBar;