Fold in some unrelated comment changes

Signed-off-by: methylDragon <[email protected]>

examples/simple_demo_qml/IgnitionRenderer.cc

@@ -175,7 +175,7 @@ gz::rendering::CameraPtr CreateCamera(const std::string &_engineName)
   // create and populate scene
   std::map<std::string, std::string> params;
 
-  // ensure that the QML application and Ignition / Ogre2 share an OpenGL
+  // ensure that the QML application and Gazebo / Ogre2 share an OpenGL
   // context
   params["useCurrentGLContext"] = "1";
   RenderEngine *engine = rendering::engine(_engineName, params);

examples/simple_demo_qml/IgnitionRenderer.hh

@@ -22,8 +22,8 @@
 
 #include <gz/rendering.hh>
 
-/// \brief Ignition renderer class. This manages  the initialisation
-/// and update of an Ignition rendering engine instance and makes the
+/// \brief Gazebo renderer class. This manages the initialisation
+/// and update of an Gazebo rendering engine instance and makes the
 /// rendered texture available in a shared context for an application
 /// to apply to a render surface.
 class IgnitionRenderer

ogre/include/gz/rendering/ogre/OgreConversions.hh

@@ -82,13 +82,13 @@ namespace gz
       /// return Ign-math angle
       public: static math::Angle Convert(const Ogre::Radian &_angle);
 
-      /// \brief Ogre Matrix4 to ignition math Matrix4d
+      /// \brief Ogre Matrix4 to Gazebo Math Matrix4d
       /// \param[in] _m Ogre Matrix4
-      /// \return ignition math Matrix4d
+      /// \return Gazebo Math Matrix4d
       public: static math::Matrix4d Convert(const Ogre::Matrix4 &_m);
 
-      /// \brief Ignition math Matrix4d to Ogre Matrix4
-      /// \param[in] _m ignition math Matrix4d
+      /// \brief Gazebo Math Matrix4d to Ogre Matrix4
+      /// \param[in] _m Gazebo Math Matrix4d
       /// \return Ogre Matrix4
       public: static Ogre::Matrix4 Convert(const math::Matrix4d &_m);
 

ogre/include/gz/rendering/ogre/OgreMaterial.hh

@@ -198,7 +198,7 @@ namespace gz
       protected: void UpdateShaderParams();
 
       /// \brief Transfer params from ign-rendering type to ogre type
-      /// \param[in] _params ignition rendering params
+      /// \param[in] _params Gazebo Rendering params
       /// \param[out] _ogreParams ogre type for holding params
       protected: void UpdateShaderParams(ConstShaderParamsPtr _params,
         Ogre::GpuProgramParametersSharedPtr _ogreParams);

ogre/src/OgreHeightmap.cc

@@ -45,7 +45,7 @@ using Ogre::TechniqueType;
 #if OGRE_VERSION_MAJOR == 1 && OGRE_VERSION_MINOR < 11
 /// \internal
 /// \brief Custom terrain material generator for GLSL terrains.
-/// A custom material generator that lets Ignition use GLSL shaders
+/// A custom material generator that lets Gazebo use GLSL shaders
 /// (as opposed to the default Cg shaders provided by Ogre) for rendering
 /// terrain.
 class IgnTerrainMatGen : public Ogre::TerrainMaterialGeneratorA
@@ -679,7 +679,7 @@ void OgreHeightmap::Init()
     for (int x = 0; x <= sqrtN - 1; ++x)
       this->DefineTerrain(x, y);
 
-  // use ignition shaders
+  // use Gazebo shaders
   this->CreateMaterial();
 
   // Sync load since we want everything in place when we start

ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh

@@ -48,7 +48,7 @@ namespace gz
     /// \{
 
     /// \brief Conversions Conversions.hh rendering/Conversions.hh
-    /// \brief A set of utility function to convert between Ignition and Ogre
+    /// \brief A set of utility function to convert between Gazebo and Ogre
     /// data types
     class GZ_RENDERING_OGRE2_VISIBLE Ogre2Conversions
     {
@@ -94,13 +94,13 @@ namespace gz
       /// return Ign-math angle
       public: static math::Angle Convert(const Ogre::Radian &_angle);
 
-      /// \brief Ogre Matrix4 to ignition math Matrix4d
+      /// \brief Ogre Matrix4 to Gazebo Math Matrix4d
       /// \param[in] _m Ogre Matrix4
-      /// \return ignition math Matrix4d
+      /// \return Gazebo Math Matrix4d
       public: static math::Matrix4d Convert(const Ogre::Matrix4 &_m);
 
-      /// \brief Ignition math Matrix4d to Ogre Matrix4
-      /// \param[in] _m ignition math Matrix4d
+      /// \brief Gazebo Math Matrix4d to Ogre Matrix4
+      /// \param[in] _m Gazebo Math Matrix4d
       /// \return Ogre Matrix4
       public: static Ogre::Matrix4 Convert(const math::Matrix4d &_m);
 

ogre2/include/gz/rendering/ogre2/Ogre2GzOgreRenderingMode.hh

@@ -50,7 +50,7 @@ namespace gz
         /// \brief Total number of rendering modes
         IORM_COUNT,
       };
-    }  // namespace IGNITION_RENDERING_VERSION_NAMESPACE
+    }  // namespace GZ_RENDERING_VERSION_NAMESPACE
   }    // namespace rendering
 }  // namespace gz
 

ogre2/include/gz/rendering/ogre2/Ogre2Material.hh

@@ -289,7 +289,7 @@ namespace gz
       protected: void UpdateShaderParams();
 
       /// \brief Transfer params from ign-rendering type to ogre type
-      /// \param[in] _params ignition rendering params
+      /// \param[in] _params Gazebo Rendering params
       /// \param[out] _ogreParams ogre type for holding params
       protected: void UpdateShaderParams(ConstShaderParamsPtr _params,
           Ogre::GpuProgramParametersSharedPtr _ogreParams);

ogre2/src/Ogre2SegmentationCamera.cc

@@ -182,7 +182,7 @@ void Ogre2SegmentationCamera::CreateCamera()
   this->ogreCamera->detachFromParent();
   this->ogreNode->attachObject(this->ogreCamera);
 
-  // rotate to ignition gazebo coord.
+  // rotate to Gazebo Sim coord.
   this->ogreCamera->yaw(Ogre::Degree(-90));
   this->ogreCamera->roll(Ogre::Degree(-90));
   this->ogreCamera->setFixedYawAxis(false);