Skip to content

Commit

Permalink
Fold in some unrelated comment changes
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <[email protected]>
  • Loading branch information
methylDragon committed Jun 7, 2022
1 parent cbf2fc6 commit 5ef36e1
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions graphics/src/ColladaLoader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2278,7 +2278,7 @@ void ColladaLoader::Implementation::LoadPolylist(
}
}

// add the new ignition submesh vertex index to the map
// add the new Gazebo submesh vertex index to the map
if (!inputs[VERTEX].empty())
{
std::vector<GeometryIndices> inputValues;
Expand Down Expand Up @@ -2602,7 +2602,7 @@ void ColladaLoader::Implementation::LoadTriangles(
}
}

// add the new ignition submesh vertex index to the map
// add the new Gazebo submesh vertex index to the map
if (hasVertices)
{
std::vector<GeometryIndices> inputValues;
Expand Down
2 changes: 1 addition & 1 deletion graphics/src/OBJLoader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Mesh *OBJLoader::Load(const std::string &_filename)

for (auto const &s : shapes)
{
// obj mesh assigns a material id to each 'face' but ignition assigns a
// obj mesh assigns a material id to each 'face' but Gazebo assigns a
// single material to each 'submesh'. The strategy here is to identify
// the number of unique material ids in each obj shape and create a new
// submesh per unique material id
Expand Down
2 changes: 1 addition & 1 deletion include/gz/common/Util.hh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
std::chrono::system_clock::now().time_since_epoch()).count())

/// \brief This macro defines the standard way of launching an exception
/// inside ignition.
/// inside Gazebo.
#define GZ_ASSERT(_expr, _msg) assert((_msg, _expr))

/// \brief Forward declarations for the common classes
Expand Down
2 changes: 1 addition & 1 deletion src/Filesystem.cc
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ bool gz::common::copyDirectory(
| fs::copy_options::overwrite_existing;

// std::filesystem won't create intermediate directories
// before copying, this maintains compatibility with ignition behavior.
// before copying, this maintains compatibility with Gazebo behavior.
if (!gz::common::createDirectories(_newDirname))
{
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/URI_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ TEST(URITEST, HasAuthority)
//////////////////////////////////////////////////
TEST(URITEST, Resource)
{
// Test URIs that are commonly used for resources in Ignition
// Test URIs that are commonly used for resources in Gazebo
{
URI uri;
EXPECT_TRUE(uri.Parse("model://model_name/meshes/mesh.dae"));
Expand Down
4 changes: 2 additions & 2 deletions testing/include/gz/common/testing/AutoLogFixture.hh
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@

namespace gz::common::testing
{
/// \brief A utility class that stores test logs in ~/.ignition/test_logs.
/// \brief A utility class that stores test logs in ~/.gz/test_logs.
/// This functionality is needed to keep all the log information reported
/// by ignition during continuous integration. Without this, debugging
/// by Gazebo during continuous integration. Without this, debugging
/// failing tests is significantly more difficult.
class AutoLogFixture : public ::testing::Test
{
Expand Down
4 changes: 2 additions & 2 deletions testing/include/gz/common/testing/TestPaths.hh
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ std::string TestFile(Args const &... args)
//////////////////////////////////////////////////
/// \brief Get the path to a file in a temporary directory
///
/// Example: to get ${TMP}/.ignition/foo.log
/// TempPath(".ignition", "foo.log");
/// Example: to get ${TMP}/.gz/foo.log
/// TempPath(".gz", "foo.log");
///
/// \param[in] args Path to the file, relative to the temporary directory
/// \return Full path to the temporary directory
Expand Down

0 comments on commit 5ef36e1

Please sign in to comment.