Fold in material hard-tock

Signed-off-by: methylDragon <[email protected]>
gazebosim · Jun 17, 2022 · a9517c0 · a9517c0
1 parent ecaa403
commit a9517c0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/graphics/src/Material.cc b/graphics/src/Material.cc
@@ -104,7 +104,7 @@ unsigned int Material::Implementation::counter = 0;
 Material::Material()
 : dataPtr(gz::utils::MakeUniqueImpl<Implementation>())
 {
-  this->dataPtr->name = "ignition_material_" +
+  this->dataPtr->name = "gz_material_" +
     std::to_string(this->dataPtr->counter++);
   this->dataPtr->blendMode = REPLACE;
   this->dataPtr->shadeMode = GOURAUD;
@@ -118,7 +118,7 @@ Material::Material()
 Material::Material(const math::Color &_clr)
 : dataPtr(gz::utils::MakeUniqueImpl<Implementation>())
 {
-  this->dataPtr->name = "ignition_material_" +
+  this->dataPtr->name = "gz_material_" +
     std::to_string(this->dataPtr->counter++);
   this->dataPtr->blendMode = REPLACE;
   this->dataPtr->shadeMode = GOURAUD;

diff --git a/graphics/src/Material_TEST.cc b/graphics/src/Material_TEST.cc
@@ -31,7 +31,7 @@ TEST_F(MaterialTest, Material)
   common::Material mat(math::Color(1.0f, 0.5f, 0.2f, 1.0f));
   EXPECT_TRUE(mat.Ambient() == math::Color(1.0f, 0.5f, 0.2f, 1.0f));
   EXPECT_TRUE(mat.Diffuse() == math::Color(1.0f, 0.5f, 0.2f, 1.0f));
-  EXPECT_STREQ("ignition_material_0", mat.Name().c_str());
+  EXPECT_STREQ("gz_material_0", mat.Name().c_str());
 
   mat.SetTextureImage("texture_image");
   EXPECT_STREQ("texture_image", mat.TextureImage().c_str());

diff --git a/test/integration/mesh.cc b/test/integration/mesh.cc
@@ -210,16 +210,16 @@ TEST_F(MeshTest, Access)
 /////////////////////////////////////////////////
 TEST_F(MeshTest, RoundtripStl)
 {
-  std::ofstream stlFile("ignition_stl_test.stl", std::ios::out);
+  std::ofstream stlFile("gz_stl_test.stl", std::ios::out);
   stlFile << asciiSTLBox;
   stlFile.close();
 
   auto mesh =
-    common::MeshManager::Instance()->Load("ignition_stl_test-bad.stl");
+    common::MeshManager::Instance()->Load("gz_stl_test-bad.stl");
   EXPECT_EQ(nullptr, mesh);
 
   common::systemPaths()->AddFilePaths(common::cwd());
-  mesh = common::MeshManager::Instance()->Load("ignition_stl_test.stl");
+  mesh = common::MeshManager::Instance()->Load("gz_stl_test.stl");
   ASSERT_NE(nullptr, mesh);
 
   math::Vector3d center, min, max;
@@ -232,20 +232,20 @@ TEST_F(MeshTest, RoundtripStl)
 /////////////////////////////////////////////////
 TEST_F(MeshTest, Export)
 {
-  std::ofstream stlFile("ignition_stl_test.stl", std::ios::out);
+  std::ofstream stlFile("gz_stl_test.stl", std::ios::out);
   stlFile << asciiSTLBox;
   stlFile.close();
 
   common::systemPaths()->AddFilePaths(common::cwd());
-  auto mesh = common::MeshManager::Instance()->Load("ignition_stl_test.stl");
+  auto mesh = common::MeshManager::Instance()->Load("gz_stl_test.stl");
 
   ASSERT_NE(nullptr, mesh);
   common::MeshManager::Instance()->Export(mesh,
-      common::joinPaths(common::cwd(), "ignition_stl_test2"), "stl", false);
+      common::joinPaths(common::cwd(), "gz_stl_test2"), "stl", false);
   common::MeshManager::Instance()->Export(mesh,
-      common::joinPaths(common::cwd(), "ignition_stl_test2"), "dae", false);
+      common::joinPaths(common::cwd(), "gz_stl_test2"), "dae", false);
 
-  EXPECT_FALSE(common::exists("ignition_stl_test2.stl"));
-  EXPECT_TRUE(common::exists("ignition_stl_test2.dae"));
+  EXPECT_FALSE(common::exists("gz_stl_test2.stl"));
+  EXPECT_TRUE(common::exists("gz_stl_test2.dae"));
 }