Multiple fixes

- Do not recommend the user to call Camera::PreRender in docs. This is
done implicitly via Scene::PreRender
- Rename GetCameraPassCountPerGpuFlush -> CameraPassCountPerGpuFlush
- CameraPassCountPerGpuFlush was incorrectly always returning 0
- Grammar mistakes in comments

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>

Migration.md

@@ -21,10 +21,7 @@ release will remove the deprecated code.
       ```
       scene->PreRender();
       for( auto& camera in cameras )
-      {
-          camera->PreRender();
           camera->Render();
-      }
       for( auto& camera in cameras )
           camera->PostRender();
       scene->PostRender();

include/ignition/rendering/Scene.hh

@@ -1032,10 +1032,7 @@ namespace ignition
       /// \code
       ///   scene->PreRender();
       ///   for( auto& camera in cameras )
-      ///   {
-      ///     camera->PreRender();
       ///     camera->Render();
-      ///   }
       ///   for( auto& camera in cameras )
       ///     camera->PostRender();
       ///   scene->PostRender();
@@ -1128,7 +1125,7 @@ namespace ignition
       /// \return Value in range [0; 255].
       /// ALWAYS returns 0 for plugins that ignore
       /// SetCameraPassCountPerGpuFlush
-      public: virtual uint8_t GetCameraPassCountPerGpuFlush() const = 0;
+      public: virtual uint8_t CameraPassCountPerGpuFlush() const = 0;
 
       /// \brief Checks if SetCameraPassCountPerGpuFlush is 0
       /// \return True if Gazebo is using the old method (i.e. 0).

include/ignition/rendering/base/BaseScene.hh

@@ -489,7 +489,7 @@ namespace ignition
             uint8_t _numPass) override;
 
       // Documentation inherited.
-      public: virtual uint8_t GetCameraPassCountPerGpuFlush() const override;
+      public: virtual uint8_t CameraPassCountPerGpuFlush() const override;
 
       // Documentation inherited.
       public: virtual bool LegacyAutoGpuFlush() const override;

ogre2/include/ignition/rendering/ogre2/Ogre2Scene.hh

@@ -98,6 +98,9 @@ namespace ignition
       public: virtual void SetCameraPassCountPerGpuFlush(
             uint8_t _numPass) override;
 
+      // Documentation inherited.
+      public: virtual uint8_t CameraPassCountPerGpuFlush() const override;
+
       // Documentation inherited.
       public: virtual bool LegacyAutoGpuFlush() const override;
 
@@ -111,7 +114,7 @@ namespace ignition
       /// \cond PRIVATE
       /// \brief Certain functions like Ogre2Camera::VisualAt would
       /// need to call PreRender and PostFrame, which is very unintuitive
-      /// and use hostile.
+      /// and user-hostile.
       ///
       /// More over, it's likely that we don't want to advance the frame
       /// in those cases (e.g. particle FXs should not advance), but we

ogre2/src/Ogre2Scene.cc

@@ -311,11 +311,11 @@ void Ogre2Scene::FlushGpuCommandsOnly()
 
 #if OGRE_VERSION_MAJOR == 2 && OGRE_VERSION_MINOR == 1
   auto hlmsManager = ogreRoot->getHlmsManager();
-  // Updating the compositor with all workspaces disables achieves our goal
+  // Updating the compositor with all workspaces disabled achieves our goal
   ogreCompMgr->_update(Ogre::SceneManagerEnumerator::getSingleton(),
                        hlmsManager);
 #else
-  // Updating the compositor with all workspaces disables achieves our goal
+  // Updating the compositor with all workspaces disabled achieves our goal
   ogreCompMgr->_update();
 #endif
 
@@ -346,6 +346,12 @@ void Ogre2Scene::SetCameraPassCountPerGpuFlush(uint8_t _numPass)
   this->dataPtr->cameraPassCountPerGpuFlush = _numPass;
 }
 
+//////////////////////////////////////////////////
+uint8_t Ogre2Scene::CameraPassCountPerGpuFlush() const
+{
+  return this->dataPtr->cameraPassCountPerGpuFlush;
+}
+
 //////////////////////////////////////////////////
 bool Ogre2Scene::LegacyAutoGpuFlush() const
 {

src/base/BaseScene.cc

@@ -1246,7 +1246,7 @@ void BaseScene::SetCameraPassCountPerGpuFlush(uint8_t /*_numPass*/)
 }
 
 //////////////////////////////////////////////////
-uint8_t BaseScene::GetCameraPassCountPerGpuFlush() const
+uint8_t BaseScene::CameraPassCountPerGpuFlush() const
 {
   return 0u;
 }