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

Resolve inconsistent visibility on ign-gazebo6 #1914

Merged
merged 1 commit into from
Mar 8, 2023
Merged

Resolve inconsistent visibility on ign-gazebo6 #1914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions src/cmd/ModelCommandAPI.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,18 @@
*
*/

#include "ignition/gazebo/Export.hh"
#include "ignition/gazebo/ign/Export.hh"

/// \brief External hook to get a list of available models.
extern "C" IGNITION_GAZEBO_VISIBLE void cmdModelList();
extern "C" IGNITION_GAZEBO_IGN_VISIBLE void cmdModelList();

/// \brief External hook to dump model information.
/// \param[in] _modelName Model name.
/// \param[in] _pose --pose option.
/// \param[in] _linkName Link name.
/// \param[in] _jointName Joint name.
/// \param[in] _sensorName Sensor name.
extern "C" IGNITION_GAZEBO_VISIBLE void cmdModelInfo(
extern "C" IGNITION_GAZEBO_IGN_VISIBLE void cmdModelInfo(
const char *_modelName, int _pose, const char *_linkName,
const char *_jointName,
const char *_sensorName);

16 changes: 8 additions & 8 deletions src/ign.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@
#ifndef IGNITION_GAZEBO_IGN_HH_
#define IGNITION_GAZEBO_IGN_HH_

#include "ignition/gazebo/Export.hh"
#include "ignition/gazebo/ign/Export.hh"

/// \brief External hook to read the library version.
/// \return C-string representing the version. Ex.: 0.1.2
extern "C" IGNITION_GAZEBO_VISIBLE char *ignitionGazeboVersion();
extern "C" IGNITION_GAZEBO_IGN_VISIBLE char *ignitionGazeboVersion();

/// \brief Get the Gazebo version header.
/// \return C-string containing the Gazebo version information.
extern "C" IGNITION_GAZEBO_VISIBLE char *gazeboVersionHeader();
extern "C" IGNITION_GAZEBO_IGN_VISIBLE char *gazeboVersionHeader();

/// \brief Set verbosity level
/// \param[in] _verbosity 0 to 4
extern "C" IGNITION_GAZEBO_VISIBLE void cmdVerbosity(
extern "C" IGNITION_GAZEBO_IGN_VISIBLE void cmdVerbosity(
const char *_verbosity);

extern "C" IGNITION_GAZEBO_VISIBLE const char *worldInstallDir();
extern "C" IGNITION_GAZEBO_IGN_VISIBLE const char *worldInstallDir();

/// \brief External hook to run simulation server.
/// \param[in] _sdfString SDF file to run, as a string.
Expand All @@ -59,7 +59,7 @@ extern "C" IGNITION_GAZEBO_VISIBLE const char *worldInstallDir();
/// \param[in] _headless True if server rendering should run headless
/// \param[in] _recordPeriod --record-period option
/// \return 0 if successful, 1 if not.
extern "C" IGNITION_GAZEBO_VISIBLE int runServer(const char *_sdfString,
extern "C" IGNITION_GAZEBO_IGN_VISIBLE int runServer(const char *_sdfString,
int _iterations, int _run, float _hz, int _levels,
const char *_networkRole, int _networkSecondaries, int _record,
const char *_recordPath, int _recordResources, int _logOverwrite,
Expand All @@ -77,14 +77,14 @@ extern "C" IGNITION_GAZEBO_VISIBLE int runServer(const char *_sdfString,
/// it receives a world path from GUI.
/// \param[in] _renderEngine --render-engine-gui option
/// \return 0 if successful, 1 if not.
extern "C" IGNITION_GAZEBO_VISIBLE int runGui(const char *_guiConfig,
extern "C" IGNITION_GAZEBO_IGN_VISIBLE int runGui(const char *_guiConfig,
const char *_file, int _waitGui, const char *_renderEngine);

/// \brief External hook to find or download a fuel world provided a URL.
/// \param[in] _pathToResource Path to the fuel world resource, ie,
/// https://staging-fuel.gazebosim.org/1.0/gmas/worlds/ShapesClone
/// \return C-string containing the path to the local world sdf file
extern "C" IGNITION_GAZEBO_VISIBLE const char *findFuelResource(
extern "C" IGNITION_GAZEBO_IGN_VISIBLE const char *findFuelResource(
char *_pathToResource);

#endif