Skip to content

Commit

Permalink
Migrate sources in src, test, examples, and include
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <[email protected]>
  • Loading branch information
methylDragon committed May 6, 2022
1 parent cb31790 commit 942a327
Show file tree
Hide file tree
Showing 104 changed files with 440 additions and 440 deletions.
6 changes: 3 additions & 3 deletions dartsim/include/gz/physics/dartsim/World.hh
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*
*/

#ifndef IGNITION_PHYSICS_DARTSIM_WORLD_HH_
#define IGNITION_PHYSICS_DARTSIM_WORLD_HH_
#ifndef GZ_PHYSICS_DARTSIM_WORLD_HH_
#define GZ_PHYSICS_DARTSIM_WORLD_HH_

#include <dart/simulation/World.hpp>

#include <ignition/physics/FeatureList.hh>
#include <gz/physics/FeatureList.hh>

namespace ignition {
namespace physics {
Expand Down
10 changes: 5 additions & 5 deletions examples/hello_world_loader/hello_world_loader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
//! [include statements]
#include <iostream>

#include <ignition/plugin/Loader.hh>
#include <ignition/plugin/PluginPtr.hh>
#include <gz/plugin/Loader.hh>
#include <gz/plugin/PluginPtr.hh>

#include <ignition/physics/FindFeatures.hh>
#include <ignition/physics/GetEntities.hh>
#include <ignition/physics/RequestEngine.hh>
#include <gz/physics/FindFeatures.hh>
#include <gz/physics/GetEntities.hh>
#include <gz/physics/RequestEngine.hh>

// The features that an engine must have to be loaded by this loader.
using Features = ignition::physics::FeatureList<
Expand Down
8 changes: 4 additions & 4 deletions examples/hello_world_plugin/HelloWorldPlugin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

////////////////////////////////////////////////////////////
//! [include statements]
#include <ignition/physics/FeatureList.hh>
#include <ignition/physics/FeaturePolicy.hh>
#include <ignition/physics/GetEntities.hh>
#include <ignition/physics/Register.hh>
#include <gz/physics/FeatureList.hh>
#include <gz/physics/FeaturePolicy.hh>
#include <gz/physics/GetEntities.hh>
#include <gz/physics/Register.hh>
//! [include statements]

namespace mock
Expand Down
4 changes: 2 additions & 2 deletions examples/simple_plugin/EntityManagementFeatures.hh
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

//! [basic include]
#include <string>
#include <ignition/physics/Implements.hh>
#include <gz/physics/Implements.hh>
//! [basic include]

//! [include feature]
#include <ignition/physics/ConstructEmpty.hh>
#include <gz/physics/ConstructEmpty.hh>

namespace ignition {
namespace physics {
Expand Down
4 changes: 2 additions & 2 deletions examples/simple_plugin/EntityManagementFeatures_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

#include <iostream>

#include <ignition/plugin/Loader.hh>
#include <ignition/physics/RequestEngine.hh>
#include <gz/plugin/Loader.hh>
#include <gz/physics/RequestEngine.hh>
#include "EntityManagementFeatures.hh"

// Simple executable that loads the simple plugin and constructs a world.
Expand Down
6 changes: 3 additions & 3 deletions examples/simple_plugin/plugin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*
*/

#include <ignition/physics/FeatureList.hh>
#include <ignition/physics/FeaturePolicy.hh>
#include <ignition/physics/Register.hh>
#include <gz/physics/FeatureList.hh>
#include <gz/physics/FeaturePolicy.hh>
#include <gz/physics/Register.hh>

#include "EntityManagementFeatures.hh"

Expand Down
14 changes: 7 additions & 7 deletions heightmap/include/gz/physics/heightmap/HeightmapShape.hh
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
*
*/

#ifndef IGNITION_PHYSICS_HEIGHTMAP_HEIGHTMAPSHAPE_HH_
#define IGNITION_PHYSICS_HEIGHTMAP_HEIGHTMAPSHAPE_HH_
#ifndef GZ_PHYSICS_HEIGHTMAP_HEIGHTMAPSHAPE_HH_
#define GZ_PHYSICS_HEIGHTMAP_HEIGHTMAPSHAPE_HH_

#include <string>

#include <ignition/common/geospatial/HeightmapData.hh>
#include <gz/common/geospatial/HeightmapData.hh>

#include <ignition/physics/DeclareShapeType.hh>
#include <ignition/physics/Geometry.hh>
#include <gz/physics/DeclareShapeType.hh>
#include <gz/physics/Geometry.hh>

namespace ignition
{
Expand Down Expand Up @@ -111,6 +111,6 @@ namespace heightmap
}
}

#include <ignition/physics/heightmap/detail/HeightmapShape.hh>
#include <gz/physics/heightmap/detail/HeightmapShape.hh>

#endif // IGNITION_PHYSICS_HEIGHTMAP_HEIGHTMAPSHAPE_HH_
#endif // GZ_PHYSICS_HEIGHTMAP_HEIGHTMAPSHAPE_HH_
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*
*/

#ifndef IGNITION_PHYSICS_HEIGHTMAP_DETAIL_HEIGHTMAPSHAPE_HH_
#define IGNITION_PHYSICS_HEIGHTMAP_DETAIL_HEIGHTMAPSHAPE_HH_
#ifndef GZ_PHYSICS_HEIGHTMAP_DETAIL_HEIGHTMAPSHAPE_HH_
#define GZ_PHYSICS_HEIGHTMAP_DETAIL_HEIGHTMAPSHAPE_HH_

#include <string>

#include <ignition/physics/heightmap/HeightmapShape.hh>
#include <gz/physics/heightmap/HeightmapShape.hh>

namespace ignition
{
Expand Down Expand Up @@ -56,4 +56,4 @@ namespace heightmap
}
}

#endif // IGNITION_PHYSICS_MESH_DETAIL_MESHSHAPE_HH_
#endif // GZ_PHYSICS_MESH_DETAIL_MESHSHAPE_HH_
10 changes: 5 additions & 5 deletions include/gz/physics/BoxShape.hh
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
*
*/

#ifndef IGNITION_PHYSICS_BOXSHAPE_HH_
#define IGNITION_PHYSICS_BOXSHAPE_HH_
#ifndef GZ_PHYSICS_BOXSHAPE_HH_
#define GZ_PHYSICS_BOXSHAPE_HH_

#include <string>

#include <ignition/physics/DeclareShapeType.hh>
#include <ignition/physics/Geometry.hh>
#include <gz/physics/DeclareShapeType.hh>
#include <gz/physics/Geometry.hh>

namespace ignition
{
Expand Down Expand Up @@ -131,6 +131,6 @@ namespace ignition
}
}

#include <ignition/physics/detail/BoxShape.hh>
#include <gz/physics/detail/BoxShape.hh>

#endif
8 changes: 4 additions & 4 deletions include/gz/physics/CanReadData.hh
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
*
*/

#ifndef IGNITION_PHYSICS_CANREADDATA_HH_
#define IGNITION_PHYSICS_CANREADDATA_HH_
#ifndef GZ_PHYSICS_CANREADDATA_HH_
#define GZ_PHYSICS_CANREADDATA_HH_


#include "ignition/physics/OperateOnSpecifiedData.hh"
#include "gz/physics/OperateOnSpecifiedData.hh"

namespace ignition
{
Expand Down Expand Up @@ -142,6 +142,6 @@ namespace ignition
}
}

#include "ignition/physics/detail/CanReadData.hh"
#include "gz/physics/detail/CanReadData.hh"

#endif
8 changes: 4 additions & 4 deletions include/gz/physics/CanWriteData.hh
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*
*/

#ifndef IGNITION_PHYSICS_CANWRITEDATA_HH_
#define IGNITION_PHYSICS_CANWRITEDATA_HH_
#ifndef GZ_PHYSICS_CANWRITEDATA_HH_
#define GZ_PHYSICS_CANWRITEDATA_HH_

#include "ignition/physics/OperateOnSpecifiedData.hh"
#include "gz/physics/OperateOnSpecifiedData.hh"

namespace ignition
{
Expand Down Expand Up @@ -143,6 +143,6 @@ namespace ignition
}
}

#include "ignition/physics/detail/CanWriteData.hh"
#include "gz/physics/detail/CanWriteData.hh"

#endif
10 changes: 5 additions & 5 deletions include/gz/physics/CapsuleShape.hh
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
*
*/

#ifndef IGNITION_PHYSICS_CAPSULESHAPE_HH_
#define IGNITION_PHYSICS_CAPSULESHAPE_HH_
#ifndef GZ_PHYSICS_CAPSULESHAPE_HH_
#define GZ_PHYSICS_CAPSULESHAPE_HH_

#include <string>

#include <ignition/physics/DeclareShapeType.hh>
#include <ignition/physics/Geometry.hh>
#include <gz/physics/DeclareShapeType.hh>
#include <gz/physics/Geometry.hh>

namespace ignition
{
Expand Down Expand Up @@ -146,6 +146,6 @@ namespace ignition
}
}

#include <ignition/physics/detail/CapsuleShape.hh>
#include <gz/physics/detail/CapsuleShape.hh>

#endif
6 changes: 3 additions & 3 deletions include/gz/physics/Cloneable.hh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*
*/

#ifndef IGNITION_PHYSICS_CLONEABLE_HH_
#define IGNITION_PHYSICS_CLONEABLE_HH_
#ifndef GZ_PHYSICS_CLONEABLE_HH_
#define GZ_PHYSICS_CLONEABLE_HH_

#include <memory>

Expand Down Expand Up @@ -118,6 +118,6 @@ namespace ignition
}
}

#include "ignition/physics/detail/Cloneable.hh"
#include "gz/physics/detail/Cloneable.hh"

#endif
34 changes: 17 additions & 17 deletions include/gz/physics/CompositeData.hh
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
*
*/

#ifndef IGNITION_PHYSICS_COMPOSITEDATA_HH_
#define IGNITION_PHYSICS_COMPOSITEDATA_HH_
#ifndef GZ_PHYSICS_COMPOSITEDATA_HH_
#define GZ_PHYSICS_COMPOSITEDATA_HH_

#include <string>
#include <map>
#include <set>

#include <ignition/utils/SuppressWarning.hh>
#include <gz/utils/SuppressWarning.hh>

#include "ignition/physics/Cloneable.hh"
#include "ignition/physics/Export.hh"
#include "gz/physics/Cloneable.hh"
#include "gz/physics/Export.hh"

namespace ignition
{
Expand Down Expand Up @@ -60,7 +60,7 @@ namespace ignition
///
/// \code
/// #include <iostream>
/// #include <ignition/physics/CompositeData.hh>
/// #include <gz/physics/CompositeData.hh>
///
/// using namespace ignition::physics;
///
Expand Down Expand Up @@ -136,7 +136,7 @@ namespace ignition
/// \code
/// #include <iostream>
/// #include <cassert>
/// #include <ignition/physics/CompositeData.hh>
/// #include <gz/physics/CompositeData.hh>
///
/// using namespace ignition::physics;
///
Expand Down Expand Up @@ -223,7 +223,7 @@ namespace ignition
///
/// \code
/// #include <iostream>
/// #include <ignition/physics/CompositeData.hh>
/// #include <gz/physics/CompositeData.hh>
///
/// using namespace ignition::physics;
///
Expand Down Expand Up @@ -305,7 +305,7 @@ namespace ignition
///
/// \code
/// #include <iostream>
/// #include <ignition/physics/CompositeData.hh>
/// #include <gz/physics/CompositeData.hh>
///
/// using namespace ignition::physics;
///
Expand Down Expand Up @@ -380,7 +380,7 @@ namespace ignition
///
/// \code
/// #include <iostream>
/// #include <ignition/physics/CompositeData.hh>
/// #include <gz/physics/CompositeData.hh>
///
/// using namespace ignition::physics;
///
Expand Down Expand Up @@ -476,7 +476,7 @@ namespace ignition
///
/// \code
/// #include <iostream>
/// #include <ignition/physics/CompositeData.hh>
/// #include <gz/physics/CompositeData.hh>
///
/// using namespace ignition::physics;
///
Expand Down Expand Up @@ -592,7 +592,7 @@ namespace ignition
///
/// \code
/// #include <cassert>
/// #include <ignition/physics/CompositeData.hh>
/// #include <gz/physics/CompositeData.hh>
///
/// using namespace ignition::physics;
///
Expand Down Expand Up @@ -652,7 +652,7 @@ namespace ignition
///
/// \code
/// #include <cassert>
/// #include <ignition/physics/CompositeData.hh>
/// #include <gz/physics/CompositeData.hh>
///
/// using namespace ignition::physics;
///
Expand Down Expand Up @@ -776,7 +776,7 @@ namespace ignition
///
/// \code
/// #include <iostream>
/// #include <ignition/physics/CompositeData.hh>
/// #include <gz/physics/CompositeData.hh>
///
/// using namespace ignition::physics;
///
Expand Down Expand Up @@ -840,7 +840,7 @@ namespace ignition
///
/// \code
/// #include <iostream>
/// #include <ignition/physics/CompositeData.hh>
/// #include <gz/physics/CompositeData.hh>
///
/// using namespace ignition::physics;
///
Expand Down Expand Up @@ -955,7 +955,7 @@ namespace ignition
public: CompositeData &operator=(CompositeData &&_other);

/// \brief Struct which contains information about a data type within the
/// CompositeData. See ignition/physics/detail/CompositeData.hh for the
/// CompositeData. See gz/physics/detail/CompositeData.hh for the
/// definition. This class is public so that helper functions can use it
/// without being friends of the class.
/// \private
Expand Down Expand Up @@ -986,6 +986,6 @@ namespace ignition
}
}

#include "ignition/physics/detail/CompositeData.hh"
#include "gz/physics/detail/CompositeData.hh"

#endif
Loading

0 comments on commit 942a327

Please sign in to comment.