Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fortress: Removed warnings #1754

Merged
merged 5 commits into from
Oct 11, 2022
Merged

Fortress: Removed warnings #1754

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2508e38
Fortress: Removed warnings
ahcorde Oct 10, 2022
5e5d5e4
Merge remote-tracking branch 'origin/ign-gazebo6' into ahcorde/6/remo…
ahcorde Oct 10, 2022
6fa7303
Removed windows warning
ahcorde Oct 10, 2022
b73c991
Fixed warnings
ahcorde Oct 11, 2022
cf54985
Fixed build
ahcorde Oct 11, 2022
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
3 changes: 1 addition & 2 deletions src/systems/optical_tactile_plugin/OpticalTactilePlugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,8 +615,7 @@ void OpticalTactilePluginPrivate::Load(const EntityComponentManager &_ecm)
this->sensorSize,
this->forceLength,
this->cameraUpdateRate,
this->depthCameraOffset,
this->visualizationResolution);
this->depthCameraOffset);

this->initialized = true;
}
Expand Down
6 changes: 2 additions & 4 deletions src/systems/optical_tactile_plugin/Visualization.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,12 @@ OpticalTactilePluginVisualization::OpticalTactilePluginVisualization(
ignition::math::Vector3d &_sensorSize,
double &_forceLength,
float &_cameraUpdateRate,
ignition::math::Pose3f &_depthCameraOffset,
int &_visualizationResolution) :
ignition::math::Pose3f &_depthCameraOffset) :
modelName(_modelName),
sensorSize(_sensorSize),
forceLength(_forceLength),
cameraUpdateRate(_cameraUpdateRate),
depthCameraOffset(_depthCameraOffset),
visualizationResolution(_visualizationResolution)
depthCameraOffset(_depthCameraOffset)
{
}

Expand Down
8 changes: 1 addition & 7 deletions src/systems/optical_tactile_plugin/Visualization.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,12 @@ namespace optical_tactile_sensor
/// \param[in] _forceLength Value of the forceLength attribute
/// \param[in] _cameraUpdateRate Value of the cameraUpdateRate attribute
/// \param[in] _depthCameraOffset Value of the depthCameraOffset attribute
/// \param[in] _visualizationResolution Value of the
/// visualizationResolution attribute
public: OpticalTactilePluginVisualization(
std::string &_modelName,
ignition::math::Vector3d &_sensorSize,
double &_forceLength,
float &_cameraUpdateRate,
ignition::math::Pose3f &_depthCameraOffset,
int &_visualizationResolution);
ignition::math::Pose3f &_depthCameraOffset);

/// \brief Initialize the marker message representing the optical tactile
/// sensor
Expand Down Expand Up @@ -153,9 +150,6 @@ namespace optical_tactile_sensor
/// \brief Offset between depth camera pose and model pose
private: ignition::math::Pose3f depthCameraOffset;

/// \brief Resolution of the sensor in pixels to skip.
private: int visualizationResolution;

/// \brief Whether the normal forces messages are initialized or not
private: bool normalForcesMsgsAreInitialized{false};
};
Expand Down