6 -> main

CMakeLists.txt

@@ -62,30 +62,21 @@ endif()
 
 #--------------------------------------
 # Find OGRE
-list(APPEND ign_ogre_components "RTShaderSystem" "Terrain" "Overlay")
+list(APPEND ign_ogre_components "RTShaderSystem" "Terrain" "Overlay" "Paging")
 
-# Ogre versions greater than 1.9 are not officialy supported.
+ign_find_package(IgnOGRE VERSION 1.9.0
+  COMPONENTS ${ign_ogre_components}
+  REQUIRED_BY ogre
+  PRIVATE_FOR ogre)
+
+# Ogre versions greater than 1.9.x are not officialy supported.
 # Display a warning for the users on this setup unless they provide
 # USE_UNOFFICIAL_OGRE_VERSIONS flag
 if (NOT USE_UNOFFICIAL_OGRE_VERSIONS)
-  # Only for checking the ogre version
-  ign_find_package(IgnOGRE VERSION 1.10 QUIET)
-
-  if (OGRE_FOUND)
+  if (${OGRE_VERSION} VERSION_GREATER_EQUAL 1.10.0)
     IGN_BUILD_WARNING("Ogre 1.x versions greater than 1.9 are not officially supported."
                       "The software might compile and even work but support from upstream"
                       "could be reduced to accepting patches for newer versions")
-    ign_find_package(IgnOGRE VERSION 1.10
-      COMPONENTS ${ign_ogre_components}
-      REQUIRED_BY ogre
-      PRIVATE_FOR ogre)
-  else()
-    # If ogre 1.10 or greater was not found, then proceed to look for 1.9.x
-    # versions which are offically supported
-    ign_find_package(IgnOGRE VERSION 1.9.0
-      COMPONENTS ${ign_ogre_components}
-      REQUIRED_BY ogre
-      PRIVATE_FOR ogre)
   endif()
 endif()
 

Changelog.md

@@ -6,17 +6,31 @@
 
 ### Ignition Rendering 6.X
 
-### Ignition Rendering 6.0.0 (20XX-XX-XX)
+### Ignition Rendering 6.0.1 (2021-10-01)
+
+1. Disable using selection buffer for ray queries
+    * [Pull request #447](https://github.com/ignitionrobotics/ign-rendering/pull/447)
+
+### Ignition Rendering 6.0.0 (2021-09-30)
+
+1. Avoid configure warning when checking ogre-1.10
+    * [Pull request #411](https://github.com/ignitionrobotics/ign-rendering/pull/411)
+    * [Pull request #413](https://github.com/ignitionrobotics/ign-rendering/pull/413)
+
+1. Use selection buffer in ray queries (ogre2)
+    * [Pull request #378](https://github.com/ignitionrobotics/ign-rendering/pull/378)
+
+1. Fix particle effect randomness
+    * [Pull request #388](https://github.com/ignitionrobotics/ign-rendering/pull/388)
 
 1. Update test config to run ogre 1.x tests in ign-rendering6 on macOS
     * [Pull request #407](https://github.com/ignitionrobotics/ign-rendering/pull/407)
     * [Pull request #409](https://github.com/ignitionrobotics/ign-rendering/pull/409)
-
-1. Check if key exists in gpu lidar's user data
-    * [Pull request #396](https://github.com/ignitionrobotics/ign-rendering/pull/396)
+    * [Pull request #409](https://github.com/ignitionrobotics/ign-rendering/pull/409)
 
 1. Clone visuals and geometries
     * [Pull request #397](https://github.com/ignitionrobotics/ign-rendering/pull/397)
+    * [Pull request #434](https://github.com/ignitionrobotics/ign-rendering/pull/434)
 
 1. Add SetSize API for LidarVisual and markers
     * [Pull request #392](https://github.com/ignitionrobotics/ign-rendering/pull/392)
@@ -27,36 +41,36 @@
 
 1. Prevent default-constructed variants from holding a type
     * [Pull request #371](https://github.com/ignitionrobotics/ign-rendering/pull/371)
+    * [Pull request #396](https://github.com/ignitionrobotics/ign-rendering/pull/396)
 
 1. Temporarily set number of camera pass count per flush to 0 in ogre2 to prevent downstream build failures
     * [Pull request #367](https://github.com/ignitionrobotics/ign-rendering/pull/367)
 
-1. Joint visual
-    * [Pull request #366](https://github.com/ignitionrobotics/ign-rendering/pull/366)
-    * [Pull request #387](https://github.com/ignitionrobotics/ign-rendering/pull/387)
+1. New visuals
+    1. Joint visual
+        * [Pull request #366](https://github.com/ignitionrobotics/ign-rendering/pull/366)
+        * [Pull request #387](https://github.com/ignitionrobotics/ign-rendering/pull/387)
 
-1. Fixing camera projection type test
-    * [Pull request #361](https://github.com/ignitionrobotics/ign-rendering/pull/361)
+    1. Center of mass visual
+        * [Pull request #345](https://github.com/ignitionrobotics/ign-rendering/pull/345)
+
+    1. Inertia visual
+        * [Pull request #326](https://github.com/ignitionrobotics/ign-rendering/pull/326)
 
 1. UserData methods moved from Visual to Node
     * [Pull request #358](https://github.com/ignitionrobotics/ign-rendering/pull/358)
 
 1. Replace renderOneFrame for per-workspace update calls
     * [Pull request #353](https://github.com/ignitionrobotics/ign-rendering/pull/353)
 
-1. Center of mass visual
-    * [Pull request #345](https://github.com/ignitionrobotics/ign-rendering/pull/345)
-
 1. Segmentation Camera
     * [Pull request #329](https://github.com/ignitionrobotics/ign-rendering/pull/329)
     * [Pull request #419](https://github.com/ignitionrobotics/ign-rendering/pull/419)
+    * [Pull request #443](https://github.com/ignitionrobotics/ign-rendering/pull/443)
 
 1. Stub bounding box camera APIs
     * [Pull request #420](https://github.com/ignitionrobotics/ign-rendering/pull/420)
 
-1. Inertia visual
-    * [Pull request #326](https://github.com/ignitionrobotics/ign-rendering/pull/326)
-
 1. Changed calculation for range clipping
     * [Pull request #325](https://github.com/ignitionrobotics/ign-rendering/pull/325)
 
@@ -65,9 +79,7 @@
 
 1. Add orthographic view controller
     * [Pull request #322](https://github.com/ignitionrobotics/ign-rendering/pull/322)
-
-1. Port codecov to new configuration
-    * [Pull request #318](https://github.com/ignitionrobotics/ign-rendering/pull/318)
+    * [Pull request #361](https://github.com/ignitionrobotics/ign-rendering/pull/361)
 
 1. Visualize wireframes
     * [Pull request #314](https://github.com/ignitionrobotics/ign-rendering/pull/314)
@@ -78,13 +90,16 @@
 1. From Ogre 2.1 to Ogre 2.2
     * [Pull request #272](https://github.com/ignitionrobotics/ign-rendering/pull/272)
     * [Pull request #393](https://github.com/ignitionrobotics/ign-rendering/pull/393)
+    * [Pull request #436](https://github.com/ignitionrobotics/ign-rendering/pull/436)
+    * [Pull request #426](https://github.com/ignitionrobotics/ign-rendering/pull/426)
+    * [Pull request #440](https://github.com/ignitionrobotics/ign-rendering/pull/440)
 
-1. All changes merged forward from ign-rendering5
-    * [Pull request #310](https://github.com/ignitionrobotics/ign-rendering/pull/310)
-    * [Pull request #331](https://github.com/ignitionrobotics/ign-rendering/pull/331)
-    * [Pull request #350](https://github.com/ignitionrobotics/ign-rendering/pull/350)
-    * [Pull request #401](https://github.com/ignitionrobotics/ign-rendering/pull/401)
-    * [Pull request #406](https://github.com/ignitionrobotics/ign-rendering/pull/406)
+1. Documentation updates
+    * [Pull request #425](https://github.com/ignitionrobotics/ign-rendering/pull/425)
+    * [Pull request #431](https://github.com/ignitionrobotics/ign-rendering/pull/431)
+
+1. Infrastructure
+    * [Pull request #318](https://github.com/ignitionrobotics/ign-rendering/pull/318)
 
 ### Ignition Rendering 5.X
 

examples/particles_demo/Main.cc

@@ -161,7 +161,7 @@ int main(int _argc, char** _argv)
 
   // Expose engine name to command line because we can't instantiate both
   // ogre and ogre2 at the same time
-  std::string ogreEngineName("ogre");
+  std::string ogreEngineName("ogre2");
   if (_argc > 1)
   {
     ogreEngineName = _argv[1];

include/ignition/rendering/Storage.hh

@@ -294,6 +294,10 @@ namespace ignition
       public: virtual ~StoreWrapper() { }
     };
 
+// armhf failed to build with this code. It can not be removed for the rest
+// of arches to keep ABI but should be removed in major versions unreleased
+// see https://github.com/ignitionrobotics/ign-rendering/pull/457
+#ifndef __ARM_PCS_VFP
     template class Store<Scene>;
     template class Store<Node>;
     template class Store<Light>;
@@ -303,6 +307,7 @@ namespace ignition
     template class Store<SubMesh>;
     template class Map<Material>;
     template class CompositeStore<Node>;
+#endif
 
     /// \def SceneStore
     /// \brief Store of Scene

ogre/include/ignition/rendering/ogre/OgreStorage.hh

@@ -34,7 +34,11 @@ namespace ignition
   namespace rendering
   {
     inline namespace IGNITION_RENDERING_VERSION_NAMESPACE {
-    //
+
+// armhf failed to build with this code. It can not be removed for the rest
+// of arches to keep ABI but should be removed in major versions unreleased
+// see https://github.com/ignitionrobotics/ign-rendering/pull/457
+#ifndef __ARM_PCS_VFP
     template class BaseSceneStore<OgreScene>;
     template class BaseNodeStore<OgreNode>;
     template class BaseLightStore<OgreLight>;
@@ -43,6 +47,7 @@ namespace ignition
     template class BaseGeometryStore<OgreGeometry>;
     template class BaseSubMeshStore<OgreSubMesh>;
     template class BaseMaterialMap<OgreMaterial>;
+#endif
 
     typedef BaseSceneStore<OgreScene>       OgreSceneStore;
     typedef BaseNodeStore<OgreNode>         OgreNodeStore;

ogre/src/CMakeLists.txt

@@ -15,11 +15,8 @@ set(engine_name "ogre")
 
 ign_add_component(${engine_name} SOURCES ${sources} GET_TARGET_NAME ogre_target)
 
-if(OGRE_VERSION VERSION_LESS 1.10.3)
-  add_definitions(-DOGRE_VERSION_LT_1_10_3)
-endif()
-if(OGRE_VERSION VERSION_LESS 1.10.1)
-  add_definitions(-DOGRE_VERSION_LT_1_10_1)
+if(OGRE_VERSION VERSION_LESS 1.11.0)
+  add_definitions(-DOGRE_VERSION_LT_1_11_0)
 endif()
 if(OGRE_VERSION VERSION_LESS 1.12.0)
   add_definitions(-DOGRE_VERSION_LT_1_12_0)

ogre/src/OgreGaussianNoisePass.cc

@@ -44,7 +44,7 @@ namespace ignition
       public: virtual void notifyMaterialRender(unsigned int _passId,
                                                 Ogre::MaterialPtr &_mat)
       {
-#if OGRE_VERSION_LT_1_10_1
+#if OGRE_VERSION_LT_1_11_0
         IGN_ASSERT(!_mat.isNull(), "Null OGRE material");
 #else
         IGN_ASSERT(_mat, "Null OGRE material");
@@ -68,7 +68,7 @@ namespace ignition
         IGN_ASSERT(pass, "Null OGRE material pass");
         Ogre::GpuProgramParametersSharedPtr params =
             pass->getFragmentProgramParameters();
-#if OGRE_VERSION_LT_1_10_1
+#if OGRE_VERSION_LT_1_11_0
         IGN_ASSERT(!params.isNull(), "Null OGRE material GPU parameters");
 #else
         IGN_ASSERT(params, "Null OGRE material GPU parameters");

ogre/src/OgreGpuRays.cc

@@ -415,7 +415,7 @@ void OgreGpuRays::CreateGpuRaysTextures()
       Ogre::TextureManager::getSingleton().createManual(
       texName.str(), "General", Ogre::TEX_TYPE_2D,
       this->dataPtr->w1st, this->dataPtr->h1st, 0,
-#if OGRE_VERSION_LT_1_10_1
+#if OGRE_VERSION_LT_1_11_0
       Ogre::PF_FLOAT32_RGB, Ogre::TU_RENDERTARGET).getPointer();
 #else
       Ogre::PF_FLOAT32_RGB, Ogre::TU_RENDERTARGET).get();
@@ -451,7 +451,7 @@ void OgreGpuRays::CreateGpuRaysTextures()
       Ogre::TEX_TYPE_2D,
       this->dataPtr->w2nd, this->dataPtr->h2nd, 0,
       Ogre::PF_FLOAT32_RGB,
-#if OGRE_VERSION_LT_1_10_1
+#if OGRE_VERSION_LT_1_11_0
       Ogre::TU_RENDERTARGET).getPointer();
 #else
       Ogre::TU_RENDERTARGET).get();

ogre/src/OgreMaterial.cc

@@ -46,7 +46,7 @@ void OgreMaterial::Destroy()
     return;
   std::string materialName;
   Ogre::MaterialManager &matManager = Ogre::MaterialManager::getSingleton();
-#if OGRE_VERSION_LT_1_10_1
+#if OGRE_VERSION_LT_1_11_0
   if (!this->ogreMaterial.isNull())
   {
     materialName = this->ogreMaterial->getName();
@@ -594,7 +594,7 @@ Ogre::TexturePtr OgreMaterial::CreateTexture(const std::string &_name)
 
   if (image.getWidth() == 0)
   {
-    #if OGRE_VERSION_LT_1_10_1
+    #if OGRE_VERSION_LT_1_11_0
     texture.setNull();
     #else
     texture.reset();

ogre/src/OgreMaterialSwitcher.cc

@@ -79,7 +79,7 @@ Ogre::Technique *OgreMaterialSwitcher::handleSchemeNotFound(
             Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
 
       // OGRE 1.9 changes the shared pointer definition
-      #if OGRE_VERSION_LT_1_10_1
+      #if OGRE_VERSION_LT_1_11_0
       Ogre::MaterialPtr plainMaterial = res.staticCast<Ogre::Material>();
       #else
       Ogre::MaterialPtr plainMaterial =

ogre/src/OgreRTShaderSystem.cc

@@ -81,7 +81,7 @@ OgreRTShaderSystem::OgreRTShaderSystem()
 {
   this->dataPtr->initialized = false;
   this->dataPtr->shadowsApplied = false;
-#if OGRE_VERSION_LT_1_10_1
+#if OGRE_VERSION_LT_1_11_0
   this->dataPtr->pssmSetup.setNull();
 #else
   this->dataPtr->pssmSetup.reset();
@@ -157,7 +157,7 @@ void OgreRTShaderSystem::Fini()
 #endif
     this->dataPtr->shaderGenerator = nullptr;
   }
-#if OGRE_VERSION_LT_1_10_1
+#if OGRE_VERSION_LT_1_11_0
   this->dataPtr->pssmSetup.setNull();
 #else
   this->dataPtr->pssmSetup.reset();
@@ -300,7 +300,7 @@ void OgreRTShaderSystem::RemoveShaders(OgreSubMesh *_subMesh)
 #ifdef OGRE_VERSION_LT_1_12_0
       this->dataPtr->shaderGenerator->removeShaderBasedTechnique(
           curMaterialName,
-      #ifndef OGRE_VERSION_LT_1_10_3
+      #ifndef OGRE_VERSION_LT_1_11_0
           curSubEntity->getMaterial()->getGroup(),
       #endif
           Ogre::MaterialManager::DEFAULT_SCHEME_NAME,
@@ -380,7 +380,7 @@ void OgreRTShaderSystem::GenerateShaders(OgreSubMesh *subMesh)
     try
     {
       success = this->dataPtr->shaderGenerator->createShaderBasedTechnique(
-#if OGRE_VERSION_LT_1_10_3
+#if OGRE_VERSION_LT_1_11_0
           curMaterialName,
 #else
           *material->Material(),
@@ -407,7 +407,7 @@ void OgreRTShaderSystem::GenerateShaders(OgreSubMesh *subMesh)
             this->dataPtr->scenes[s]->Name() +
             Ogre::RTShader::ShaderGenerator::DEFAULT_SCHEME_NAME,
             curMaterialName,
-#ifndef OGRE_VERSION_LT_1_10_3
+#ifndef OGRE_VERSION_LT_1_11_0
             material->Material()->getGroup(),
 #endif
             0);
@@ -590,7 +590,7 @@ void OgreRTShaderSystem::ApplyShadows(OgreScenePtr _scene)
   sceneMgr->setShadowTextureSelfShadow(false);
   sceneMgr->setShadowCasterRenderBackFaces(true);
 
-#if OGRE_VERSION_LT_1_10_1
+#if OGRE_VERSION_LT_1_11_0
   // Set up caster material - this is just a standard depth/shadow map caster
   sceneMgr->setShadowTextureCasterMaterial("PSSM/shadow_caster");
 #else
@@ -607,7 +607,7 @@ void OgreRTShaderSystem::ApplyShadows(OgreScenePtr _scene)
   // pssmCasterPass->setFog(true);
 
   // shadow camera setup
-#if OGRE_VERSION_LT_1_10_1
+#if OGRE_VERSION_LT_1_11_0
   if (this->dataPtr->pssmSetup.isNull())
 #else
   if (this->dataPtr->pssmSetup == nullptr)

ogre/src/OgreRenderEngine.cc

@@ -216,7 +216,7 @@ void OgreRenderEngine::AddResourcePath(const std::string &_uri)
                     fullPath);
 
               bool matPtrNotNull;
-#if OGRE_VERSION_LT_1_10_1
+#if OGRE_VERSION_LT_1_11_0
               matPtrNotNull = !matPtr.isNull();
 #else
               matPtrNotNull = matPtr != nullptr;
@@ -425,20 +425,17 @@ void OgreRenderEngine::LoadPlugins()
     std::vector<std::string>::iterator piter;
 
 #ifdef __APPLE__
-    std::string prefix = "lib";
     std::string extension = ".dylib";
 #elif _WIN32
-    std::string prefix = "";
     std::string extension = ".dll";
 #else
-    std::string prefix = "";
     std::string extension = ".so";
 #endif
 
-    plugins.push_back(path+"/"+prefix+"RenderSystem_GL");
-    plugins.push_back(path+"/"+prefix+"Plugin_ParticleFX");
-    plugins.push_back(path+"/"+prefix+"Plugin_BSPSceneManager");
-    plugins.push_back(path+"/"+prefix+"Plugin_OctreeSceneManager");
+    plugins.push_back(path+"/RenderSystem_GL");
+    plugins.push_back(path+"/Plugin_ParticleFX");
+    plugins.push_back(path+"/Plugin_BSPSceneManager");
+    plugins.push_back(path+"/Plugin_OctreeSceneManager");
 
 #ifdef HAVE_OCULUS
     plugins.push_back(path+"/Plugin_CgProgramManager");
@@ -728,7 +725,7 @@ void OgreRenderEngine::CheckCapabilities()
   bool hasVertexPrograms =
     capabilities->hasCapability(Ogre::RSC_VERTEX_PROGRAM);
 
-#if OGRE_VERSION_LT_1_10_1
+#if OGRE_VERSION_LT_1_11_0
   bool hasFBO =
     capabilities->hasCapability(Ogre::RSC_FBO);
 #else

ogre/src/OgreScene.cc

@@ -216,7 +216,7 @@ void OgreScene::SetGradientBackgroundColor(
     // Create background rectangle covering the whole screen
     rect = new ColoredRectangle2D();
     rect->setCorners(-1.0, 1.0, 1.0, -1.0);
-#if OGRE_VERSION_LT_1_10_1
+#if OGRE_VERSION_LT_1_11_0
     rect->setMaterial("Background");
 #else
     rect->setMaterial(material);