Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/camera_tracking/GlutWindow.cc
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ void keyboardCB(unsigned char _key, int, int)
g_followOffset.Z() -= 0.1;
}

for (unsigned int i = 0; i < g_cameras.size(); ++i)
for (size_t i = 0; i < g_cameras.size(); ++i)
{
auto cam = g_cameras[i];
auto node = g_nodes[i];
Expand Down
2 changes: 1 addition & 1 deletion examples/lidar_visual/GlutWindow.cc
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ void run(std::vector<ir::CameraPtr> _cameras,
initContext();
printUsage();
g_lidarData.clear();
for (int pt =0; pt < _pts.size(); pt++)
for (size_t pt =0; pt < _pts.size(); pt++)
{
g_lidarData.push_back(_pts[pt]);
}
Expand Down
18 changes: 9 additions & 9 deletions include/gz/rendering/OrbitViewController.hh
Original file line number Diff line number Diff line change
Expand Up @@ -49,35 +49,35 @@ namespace gz
public: explicit OrbitViewController(const CameraPtr &_camera);

/// \brief Destructor
public: virtual ~OrbitViewController();
public: ~OrbitViewController() override;

/// \brief Set the camera that will be controlled by this view controller.
/// \param[in] _camera Camera to control
public: virtual void SetCamera(const CameraPtr &_camera);
public: void SetCamera(const CameraPtr &_camera) override;

/// \brief Get the camera that is controlled by this view controller.
/// \return Camera being controlled
public: virtual CameraPtr Camera() const;

/// \brief Set target point for pan, zoom, oribit
/// \brief Set target point for pan, zoom, orbit
/// \param[in] _target Target point in world coordinates
public: virtual void SetTarget(const math::Vector3d &_target);
public: void SetTarget(const math::Vector3d &_target) override;

/// \brief Get target point for pan, zoom, oribit
/// \brief Get target point for pan, zoom, orbit
/// \return target point in world coordinates
public: virtual const math::Vector3d &Target() const;

/// \brief Set zoom amount
/// \param[in] _value Camera zoom value, e.g. mouse scroll delta
public: virtual void Zoom(const double _value);
public: void Zoom(const double _value) override;

/// \brief Set camera pan (translational movement) around target point.
/// \param[in] _value Pan amount in image plane, e.g. mouse drag delta.
public: virtual void Pan(const math::Vector2d &_value);
public: void Pan(const math::Vector2d &_value) override;

/// \brief Set camera orbit (rotational movement) around target point.
/// \param[in] _value robit amount in image plane, e.g. mouse drag delta
public: virtual void Orbit(const math::Vector2d &_value);
/// \param[in] _value orbit amount in image plane, e.g. mouse drag delta
public: void Orbit(const math::Vector2d &_value) override;

GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
/// \brief Private data pointer
Expand Down
14 changes: 7 additions & 7 deletions include/gz/rendering/OrthoViewController.hh
Original file line number Diff line number Diff line change
Expand Up @@ -45,35 +45,35 @@ namespace gz
public: explicit OrthoViewController(const CameraPtr &_camera);

/// \brief Destructor.
public: virtual ~OrthoViewController();
public: ~OrthoViewController() override;

/// \brief Set the camera that will be controlled by this view controller.
/// \param[in] _camera Camera to control
public: virtual void SetCamera(const CameraPtr &_camera);
public: void SetCamera(const CameraPtr &_camera) override;

/// \brief Get the camera that is controlled by this view controller.
/// \return Camera being controlled
public: virtual CameraPtr Camera() const;

/// \brief Set target point for pan, zoom, oribit
/// \param[in] _target Target point in world coordinates
public: virtual void SetTarget(const math::Vector3d &_target);
public: void SetTarget(const math::Vector3d &_target) override;

/// \brief Get target point for pan, zoom, oribit
/// \return target point in world coordinates
public: virtual const math::Vector3d &Target() const;

/// \brief Set zoom amount
/// \param[in] _value Camera zoom value, e.g. mouse scroll delta
public: virtual void Zoom(const double _value);
public: void Zoom(const double _value) override;

/// \brief Set camera pan (translational movement) around target point.
/// \param[in] _value Pan amount in image plane, e.g. mouse drag delta.
public: virtual void Pan(const math::Vector2d &_value);
public: void Pan(const math::Vector2d &_value) override;

/// \brief Set camera orbit (rotational movement) around target point.
/// \param[in] _value robit amount in image plane, e.g. mouse drag delta
public: virtual void Orbit(const math::Vector2d &_value);
/// \param[in] _value orbit amount in image plane, e.g. mouse drag delta
public: void Orbit(const math::Vector2d &_value) override;

/// \brief Resize and update the camera projection matrix
/// \param[in] _width Image width
Expand Down
17 changes: 9 additions & 8 deletions include/gz/rendering/base/BaseBoundingBoxCamera.hh
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,25 @@ namespace gz
protected: BaseBoundingBoxCamera();

/// \brief Destructor
public: virtual ~BaseBoundingBoxCamera();
public: ~BaseBoundingBoxCamera() override;

// Documentation inherited
public: virtual const std::vector<BoundingBox> &BoundingBoxData() const;
public: const std::vector<BoundingBox> &BoundingBoxData() const override;

// Documentation inherited
public: virtual gz::common::ConnectionPtr ConnectNewBoundingBoxes(
std::function<void(const std::vector<BoundingBox> &)> _subscriber) = 0;
public: gz::common::ConnectionPtr ConnectNewBoundingBoxes(
std::function<void(const std::vector<BoundingBox> &)> _subscriber)
override = 0;

// Documentation inherited
public: virtual void SetBoundingBoxType(BoundingBoxType _type);
public: void SetBoundingBoxType(BoundingBoxType _type) override;

// Documentation inherited
public: virtual BoundingBoxType Type() const;
public: BoundingBoxType Type() const override;

// Documentation inherited
public: virtual void DrawBoundingBox(unsigned char *_data,
const math::Color &_color, const BoundingBox &_box) const = 0;
public: void DrawBoundingBox(unsigned char *_data,
const math::Color &_color, const BoundingBox &_box) const override = 0;

/// \brief The bounding box type
protected: BoundingBoxType type = BoundingBoxType::BBT_FULLBOX2D;
Expand Down
6 changes: 3 additions & 3 deletions include/gz/rendering/base/BaseCamera.hh
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ namespace gz

// Documentation inherited.
public: virtual void SetFollowTarget(const NodePtr &_target,
const math::Vector3d &_Offset, const bool _worldFrame)
const math::Vector3d &_offset, const bool _worldFrame)
override;

// Documentation inherited.
Expand Down Expand Up @@ -680,9 +680,9 @@ namespace gz

//////////////////////////////////////////////////
template <class T>
void BaseCamera<T>::SetAspectRatio(const double _aspect)
void BaseCamera<T>::SetAspectRatio(const double _ratio)
{
this->aspect = _aspect;
this->aspect = _ratio;
}

//////////////////////////////////////////////////
Expand Down
10 changes: 5 additions & 5 deletions include/gz/rendering/base/BaseDepthCamera.hh
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ namespace gz
{
protected: BaseDepthCamera();

public: virtual ~BaseDepthCamera();
public: ~BaseDepthCamera() override;

public: virtual void CreateDepthTexture();
public: void CreateDepthTexture() override;

public: virtual const float *DepthData() const;
public: const float *DepthData() const override;

public: virtual gz::common::ConnectionPtr ConnectNewDepthFrame(
public: gz::common::ConnectionPtr ConnectNewDepthFrame(
std::function<void(const float *, unsigned int, unsigned int,
unsigned int, const std::string &)> _subscriber);
unsigned int, const std::string &)> _subscriber) override;

public: virtual gz::common::ConnectionPtr ConnectNewRGBPointCloud(
std::function<void(const float *, unsigned int, unsigned int,
Expand Down
26 changes: 13 additions & 13 deletions include/gz/rendering/base/BaseDistortionPass.hh
Original file line number Diff line number Diff line change
Expand Up @@ -38,43 +38,43 @@ namespace gz
protected: BaseDistortionPass();

/// \brief Destructor
public: virtual ~BaseDistortionPass();
public: ~BaseDistortionPass() override;

// Documentation inherited.
public: double K1() const;
public: double K1() const override;

// Documentation inherited.
public: double K2() const;
public: double K2() const override;

// Documentation inherited.
public: double K3() const;
public: double K3() const override;

// Documentation inherited.
public: double P1() const;
public: double P1() const override;

// Documentation inherited.
public: double P2() const;
public: double P2() const override;

// Documentation inherited.
public: math::Vector2d Center() const;
public: math::Vector2d Center() const override;

// Documentation inherited.
public: void SetK1(double _k1);
public: void SetK1(double _k1) override;

// Documentation inherited.
public: void SetK2(double _k2);
public: void SetK2(double _k2) override;

// Documentation inherited.
public: void SetK3(double _k3);
public: void SetK3(double _k3) override;

// Documentation inherited.
public: void SetP1(double _p1);
public: void SetP1(double _p1) override;

// Documentation inherited.
public: void SetP2(double _p2);
public: void SetP2(double _p2) override;

// Documentation inherited.
public: void SetCenter(const math::Vector2d &_center);
public: void SetCenter(const math::Vector2d &_center) override;

/// \brief Radial distortion coefficient k1.
public: double k1 = 0;
Expand Down
16 changes: 8 additions & 8 deletions include/gz/rendering/base/BaseGaussianNoisePass.hh
Original file line number Diff line number Diff line change
Expand Up @@ -41,28 +41,28 @@ namespace gz
protected: BaseGaussianNoisePass();

/// \brief Destructor
public: virtual ~BaseGaussianNoisePass();
public: ~BaseGaussianNoisePass() override;

// Documentation inherited.
public: double Mean() const;
public: double Mean() const override;

// Documentation inherited.
public: double StdDev() const;
public: double StdDev() const override;

// Documentation inherited.
public: double Bias() const;
public: double Bias() const override;

// Documentation inherited.
public: void SetMean(double _mean);
public: void SetMean(double _mean) override;

// Documentation inherited.
public: void SetStdDev(double _stdDev);
public: void SetStdDev(double _stdDev) override;

// Documentation inherited.
public: void SetBiasMean(double _biasMean);
public: void SetBiasMean(double _biasMean) override;

// Documentation inherited.
public: void SetBiasStdDev(double _biasStdDev);
public: void SetBiasStdDev(double _biasStdDev) override;

// Sample the bias from bias mean and bias standard deviation
protected: void SampleBias();
Expand Down
14 changes: 7 additions & 7 deletions include/gz/rendering/base/BaseGeometry.hh
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@ namespace gz
{
protected: BaseGeometry();

public: virtual ~BaseGeometry();
public: ~BaseGeometry() override;

public: virtual VisualPtr Parent() const override = 0;
public: VisualPtr Parent() const override = 0;

public: virtual void RemoveParent() override;
public: void RemoveParent() override;

// Documentation inherited
public: virtual void SetMaterial(const std::string &_material,
public: void SetMaterial(const std::string &_name,
bool _unique = true) override;

// Documentation inherited
public: virtual void SetMaterial(MaterialPtr _material,
public: void SetMaterial(MaterialPtr _material,
bool _unique = true) override = 0;

// Documentation inherited
public: virtual GeometryPtr Clone() const override;
public: GeometryPtr Clone() const override;

// Documentation inherited
public: virtual void Destroy() override;
public: void Destroy() override;
};

//////////////////////////////////////////////////
Expand Down
4 changes: 2 additions & 2 deletions include/gz/rendering/base/BaseGpuRays.hh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ namespace gz
public: virtual const float *Data() const override;

// Documentation inherited.
public: virtual void Copy(float *_data) override;
public: virtual void Copy(float *_dataDest) override;

// Documentation inherited.
public: virtual void SetClamp(bool _enable) override;
Expand Down Expand Up @@ -146,7 +146,7 @@ namespace gz
public: virtual double HorizontalResolution() const override;

// Documentation inherited.
public: virtual void SetVerticalResolution(double resolution) override;
public: virtual void SetVerticalResolution(double _resolution) override;

// Documentation inherited.
public: virtual double VerticalResolution() const override;
Expand Down
18 changes: 9 additions & 9 deletions include/gz/rendering/base/BaseGrid.hh
Original file line number Diff line number Diff line change
Expand Up @@ -37,31 +37,31 @@ namespace gz
protected: BaseGrid();

/// \brief Destructor
public: virtual ~BaseGrid();
public: ~BaseGrid() override;

// Documentation inherited.
public: virtual void PreRender();
public: void PreRender() override;

// Documentation inherited.
public: virtual void Destroy();
public: void Destroy() override;

// Documentation inherited.
public: virtual unsigned int CellCount() const;
public: unsigned int CellCount() const override;

// Documentation inherited.
public: virtual void SetCellCount(const unsigned int _count);
public: void SetCellCount(const unsigned int _count) override;

// Documentation inherited.
public: virtual double CellLength() const;
public: double CellLength() const override;

// Documentation inherited.
public: virtual void SetCellLength(const double _len);
public: void SetCellLength(const double _len) override;

// Documentation inherited.
public: virtual unsigned int VerticalCellCount() const;
public: unsigned int VerticalCellCount() const override;

// Documentation inherited.
public: virtual void SetVerticalCellCount(const unsigned int _count);
public: void SetVerticalCellCount(const unsigned int _count) override;

/// \brief Number of cells in grid
protected: unsigned int cellCount = 10u;
Expand Down
Loading
Loading