Fix more wasm issues (#2548)

Author: Meakk

library/private/camera_impl.h

@@ -36,20 +36,20 @@ class camera_impl : public camera
    * Documented public API
    */
   camera& setPosition(const point3_t& pos) override;
-  point3_t getPosition() override;
-  void getPosition(point3_t& pos) override;
+  point3_t getPosition() const override;
+  void getPosition(point3_t& pos) const override;
   camera& setFocalPoint(const point3_t& foc) override;
-  point3_t getFocalPoint() override;
-  void getFocalPoint(point3_t& foc) override;
+  point3_t getFocalPoint() const override;
+  void getFocalPoint(point3_t& foc) const override;
   camera& setViewUp(const vector3_t& up) override;
-  vector3_t getViewUp() override;
-  void getViewUp(vector3_t& up) override;
+  vector3_t getViewUp() const override;
+  void getViewUp(vector3_t& up) const override;
   camera& setViewAngle(const angle_deg_t& angle) override;
-  angle_deg_t getViewAngle() override;
-  void getViewAngle(angle_deg_t& angle) override;
+  angle_deg_t getViewAngle() const override;
+  void getViewAngle(angle_deg_t& angle) const override;
   camera& setState(const camera_state_t& state) override;
-  camera_state_t getState() override;
-  void getState(camera_state_t& state) override;
+  camera_state_t getState() const override;
+  void getState(camera_state_t& state) const override;
 
   camera& dolly(double val) override;
   camera& pan(double right, double up, double forward) override;
@@ -77,7 +77,7 @@ class camera_impl : public camera
    * This should only be called after the renderer have been set and initialized
    * so that a camera is available.
    */
-  vtkCamera* GetVTKCamera();
+  vtkCamera* GetVTKCamera() const;
 
 private:
   class internals;

library/public/camera.h

@@ -41,33 +41,33 @@ class F3D_EXPORT camera
   /** Set the position of the camera to the provided arg */
   virtual camera& setPosition(const point3_t& pos) = 0;
   /** Return the position of the camera */
-  [[nodiscard]] virtual point3_t getPosition() = 0;
+  [[nodiscard]] virtual point3_t getPosition() const = 0;
   /** Get the position of the camera into the provided arg */
-  virtual void getPosition(point3_t& pos) = 0;
+  virtual void getPosition(point3_t& pos) const = 0;
   /** Set the focal point of the camera to the provided arg */
   virtual camera& setFocalPoint(const point3_t& foc) = 0;
   /** Return the focal point of the camera */
-  [[nodiscard]] virtual point3_t getFocalPoint() = 0;
+  [[nodiscard]] virtual point3_t getFocalPoint() const = 0;
   /** Get the focal point of the camera into the provided arg */
-  virtual void getFocalPoint(point3_t& foc) = 0;
+  virtual void getFocalPoint(point3_t& foc) const = 0;
   /** Set the view up of the camera to the provided arg */
   virtual camera& setViewUp(const vector3_t& up) = 0;
   /** Return the view up of the camera */
-  [[nodiscard]] virtual vector3_t getViewUp() = 0;
+  [[nodiscard]] virtual vector3_t getViewUp() const = 0;
   /** Get the view up of the camera into the provided arg */
-  virtual void getViewUp(vector3_t& up) = 0;
+  virtual void getViewUp(vector3_t& up) const = 0;
   /** Set the view angle in degrees of the camera to the provided arg */
   virtual camera& setViewAngle(const angle_deg_t& angle) = 0;
   /** Return the view angle in degrees of the camera */
-  [[nodiscard]] virtual angle_deg_t getViewAngle() = 0;
+  [[nodiscard]] virtual angle_deg_t getViewAngle() const = 0;
   /** Get the view angle in degrees of the camera into the provided arg */
-  virtual void getViewAngle(angle_deg_t& angle) = 0;
+  virtual void getViewAngle(angle_deg_t& angle) const = 0;
   /** Set the complete state of the provided arg */
   virtual camera& setState(const camera_state_t& state) = 0;
   /** Return the complete state of the camera */
-  [[nodiscard]] virtual camera_state_t getState() = 0;
+  [[nodiscard]] virtual camera_state_t getState() const = 0;
   /** Get the complete state of the camera into the provided arg */
-  virtual void getState(camera_state_t& state) = 0;
+  virtual void getState(camera_state_t& state) const = 0;
 
   ///@}
 

library/src/camera_impl.cxx

@@ -63,15 +63,15 @@ camera& camera_impl::setPosition(const point3_t& pos)
 }
 
 //----------------------------------------------------------------------------
-point3_t camera_impl::getPosition()
+point3_t camera_impl::getPosition() const
 {
   point3_t pos;
   this->getPosition(pos);
   return pos;
 }
 
 //----------------------------------------------------------------------------
-void camera_impl::getPosition(point3_t& pos)
+void camera_impl::getPosition(point3_t& pos) const
 {
   vtkCamera* cam = this->GetVTKCamera();
   cam->GetPosition(pos.data());
@@ -88,15 +88,15 @@ camera& camera_impl::setFocalPoint(const point3_t& foc)
 }
 
 //----------------------------------------------------------------------------
-point3_t camera_impl::getFocalPoint()
+point3_t camera_impl::getFocalPoint() const
 {
   point3_t foc;
   this->getFocalPoint(foc);
   return foc;
 }
 
 //----------------------------------------------------------------------------
-void camera_impl::getFocalPoint(point3_t& foc)
+void camera_impl::getFocalPoint(point3_t& foc) const
 {
   vtkCamera* cam = this->GetVTKCamera();
   cam->GetFocalPoint(foc.data());
@@ -113,15 +113,15 @@ camera& camera_impl::setViewUp(const vector3_t& up)
 }
 
 //----------------------------------------------------------------------------
-vector3_t camera_impl::getViewUp()
+vector3_t camera_impl::getViewUp() const
 {
   vector3_t up;
   this->getViewUp(up);
   return up;
 }
 
 //----------------------------------------------------------------------------
-void camera_impl::getViewUp(vector3_t& up)
+void camera_impl::getViewUp(vector3_t& up) const
 {
   vtkCamera* cam = this->GetVTKCamera();
   cam->GetViewUp(up.data());
@@ -138,15 +138,15 @@ camera& camera_impl::setViewAngle(const angle_deg_t& angle)
 }
 
 //----------------------------------------------------------------------------
-angle_deg_t camera_impl::getViewAngle()
+angle_deg_t camera_impl::getViewAngle() const
 {
   angle_deg_t angle;
   this->getViewAngle(angle);
   return angle;
 }
 
 //----------------------------------------------------------------------------
-void camera_impl::getViewAngle(angle_deg_t& angle)
+void camera_impl::getViewAngle(angle_deg_t& angle) const
 {
   vtkCamera* cam = this->GetVTKCamera();
   angle = cam->GetViewAngle();
@@ -166,15 +166,15 @@ camera& camera_impl::setState(const camera_state_t& state)
 }
 
 //----------------------------------------------------------------------------
-camera_state_t camera_impl::getState()
+camera_state_t camera_impl::getState() const
 {
   camera_state_t state;
   this->getState(state);
   return state;
 }
 
 //----------------------------------------------------------------------------
-void camera_impl::getState(camera_state_t& state)
+void camera_impl::getState(camera_state_t& state) const
 {
   vtkCamera* cam = this->GetVTKCamera();
   cam->GetPosition(state.position.data());
@@ -319,7 +319,7 @@ void camera_impl::SetVTKRenderer(vtkRenderer* renderer)
 }
 
 //----------------------------------------------------------------------------
-vtkCamera* camera_impl::GetVTKCamera()
+vtkCamera* camera_impl::GetVTKCamera() const
 {
   return this->Internals->VTKRenderer->GetActiveCamera();
 }