Merge branch 'gz-rendering7' into capsule_desc

rubenanapu · Jun 6, 2023 · 5056784 · 5056784
2 parents 2d7f1e6 + e39e10f
commit 5056784
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 14 deletions.
diff --git a/include/gz/rendering/GraphicsAPI.hh b/include/gz/rendering/GraphicsAPI.hh
@@ -18,6 +18,7 @@
 #define GZ_RENDERING_GRAPHICSAPI_HH_
 
 #include <string>
+#include <cstdint>
 #include "gz/rendering/config.hh"
 #include "gz/rendering/Export.hh"
 

diff --git a/ogre/src/OgreNode.cc b/ogre/src/OgreNode.cc
@@ -106,8 +106,8 @@ void OgreNode::SetRawLocalPosition(const math::Vector3d &_position)
   // the length of the position vector.
   if (dynamic_cast<OgreCamera *>(this) && _position.Length() > 1e8)
   {
-    ignerr << "Unable to set camera node position to a distance larger than "
-           << "1e8 from origin" << std::endl;
+    gzerr << "Unable to set camera node position to a distance larger than "
+          << "1e8 from origin" << std::endl;
     return;
   }
   this->ogreNode->setPosition(OgreConversions::Convert(_position));

diff --git a/ogre/src/OgreProjector.cc b/ogre/src/OgreProjector.cc
@@ -444,7 +444,7 @@ std::unordered_set<std::string> OgreProjectorListener::FindVisibleMaterials()
 /////////////////////////////////////////////////
 void OgreProjectorListener::AddDecalToVisibleMaterials()
 {
-  auto newVisibleMaterials = std::move(this->FindVisibleMaterials());
+  auto newVisibleMaterials = this->FindVisibleMaterials();
 
   this->AddDecalToMaterials(newVisibleMaterials);
 }
@@ -652,8 +652,7 @@ void OgreProjectorListener::SetVisibilityFlags(uint32_t _flags)
 /////////////////////////////////////////////////
 void OgreProjectorListener::UpdateVisibleMaterials()
 {
-  this->visibleMaterials =
-      std::move(this->FindVisibleMaterials());
+  this->visibleMaterials = this->FindVisibleMaterials();
 }
 
 /////////////////////////////////////////////////

diff --git a/ogre/src/OgreRenderEngine.cc b/ogre/src/OgreRenderEngine.cc
@@ -843,5 +843,5 @@ OgreRenderEngine *OgreRenderEngine::Instance()
 }
 
 // Register this plugin
-GZ_ADD_PLUGIN(OgreRenderEnginePlugin,
+GZ_ADD_PLUGIN(rendering::OgreRenderEnginePlugin,
               rendering::RenderEnginePlugin)
diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Projector.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Projector.hh
@@ -23,7 +23,7 @@
 #include "gz/rendering/config.hh"
 
 #include "gz/rendering/base/BaseProjector.hh"
-#include "gz/rendering/ogre/Export.hh"
+#include "gz/rendering/ogre2/Export.hh"
 #include "gz/rendering/ogre2/Ogre2Visual.hh"
 
 namespace gz
@@ -33,7 +33,7 @@ namespace gz
     inline namespace GZ_RENDERING_VERSION_NAMESPACE {
 
     /// \brief Ogre 2.x implementation of a Projector class.
-    class GZ_RENDERING_OGRE_VISIBLE Ogre2Projector :
+    class GZ_RENDERING_OGRE2_VISIBLE Ogre2Projector :
       public BaseProjector<Ogre2Visual>
     {
       /// \brief Constructor.

diff --git a/ogre2/src/Ogre2Node.cc b/ogre2/src/Ogre2Node.cc
@@ -116,8 +116,8 @@ void Ogre2Node::SetRawLocalPosition(const math::Vector3d &_position)
   // the length of the position vector.
   if (dynamic_cast<Ogre2Camera *>(this) && _position.Length() > 1e9)
   {
-    ignerr << "Unable to set camera node position to a distance larger than "
-           << "1e9 from origin" << std::endl;
+    gzerr << "Unable to set camera node position to a distance larger than "
+          << "1e9 from origin" << std::endl;
     return;
   }
   this->ogreNode->setPosition(Ogre2Conversions::Convert(_position));

diff --git a/ogre2/src/Ogre2RayQuery.cc b/ogre2/src/Ogre2RayQuery.cc
@@ -128,8 +128,6 @@ void Ogre2RayQuery::SetFromCamera(const CameraPtr &_camera,
 //////////////////////////////////////////////////
 RayQueryResult Ogre2RayQuery::ClosestPoint(bool _forceSceneUpdate)
 {
-  RayQueryResult result;
-
   if (!this->dataPtr->camera ||
       !this->dataPtr->camera->Parent() ||
       std::this_thread::get_id() != this->dataPtr->threadId)

diff --git a/ogre2/src/media/2.0/scripts/materials/Common/GLSL/GaussianBlurBase_cs.glsl b/ogre2/src/media/2.0/scripts/materials/Common/GLSL/GaussianBlurBase_cs.glsl
@@ -1,5 +1,11 @@
 @property( syntax != glslvk )
-	#version 430
+	@property( GL3+ >= 430 )
+		#version 430
+	@else
+		#version 420
+		#extension GL_ARB_arrays_of_arrays: enable
+		#extension GL_ARB_compute_shader: enable
+	@end
 @else
 	#version 450
 @end

diff --git a/ogre2/src/media/2.0/scripts/materials/Terra/GLSL/TerraShadowGenerator.glsl b/ogre2/src/media/2.0/scripts/materials/Terra/GLSL/TerraShadowGenerator.glsl
@@ -1,5 +1,10 @@
 @property( syntax != glslvk )
-	#version 430
+	@property( GL3+ >= 430 )
+		#version 430
+	@else
+		#version 420
+		#extension GL_ARB_compute_shader: enable
+	@end
 	#define ogre_B0 binding = 0
 	#define ogre_B1 binding = 1
 @else

diff --git a/ogre2/src/media/Hlms/Common/GLSL/CrossPlatformSettings_piece_all.glsl b/ogre2/src/media/Hlms/Common/GLSL/CrossPlatformSettings_piece_all.glsl
@@ -6,6 +6,10 @@
 		#version 430 core
 	@else
 		#version 330 core
+
+		@property( !hlms_readonly_is_tex )
+			#extension GL_ARB_shader_storage_buffer_object: require
+		@end
 	@end
 @end
 

diff --git a/ogre2/src/terrain/Terra/src/Terra.cpp b/ogre2/src/terrain/Terra/src/Terra.cpp
@@ -30,6 +30,7 @@ THE SOFTWARE.
 
 #include "Terra/TerraShadowMapper.h"
 #include "Terra/Hlms/OgreHlmsTerra.h"
+#include "Terra/Hlms/OgreHlmsTerraDatablock.h"
 
 #include "OgreImage2.h"
 

diff --git a/src/CameraLens.cc b/src/CameraLens.cc
@@ -15,6 +15,7 @@
  *
 */
 
+#include <functional>
 #include <map>
 #include <string>
 #include <tuple>