Override AutoParamDataSource so it can handle more than 8 shadow maps. #2967
Conversation
|
the Ubuntu and macOS CI jobs are using ogre 1.9.5 and look fine, while the windows CI is using ogre 1.10.12 and is currently failing as many of the methods that are |
|
nice, I extended |
gazebo/rendering/CMakeLists.txt
Outdated
| @@ -23,6 +23,7 @@ set (sources | |||
| COMVisual.cc | |||
| ContactVisual.cc | |||
| Conversions.cc | |||
| CustomAutoParamDataSource.cc | |||
There was a problem hiding this comment.
we can conditionally add the .cc file to sources and .hh file to headers based on the OGRE_VERSION like how the deferred_shading folder is handled later in this file
There was a problem hiding this comment.
thanks the windows build is fixed now
https://build.osrfoundation.org/job/gazebo-ci-pr_any-windows7-amd64/3169/
Added another demo world in my branch to show spot light rendering and shadows over a heightmap, 555ece4, credits go to @mogumbo for actually rendering the spot lights and getting rid of the unwanted shadow artifacts!
|
…1.9. Ogre 1.10 removed the ability to use it.
| @@ -134,6 +137,9 @@ set (headers | |||
| WrenchVisual.hh | |||
| ogre_gazebo.h | |||
| ) | |||
| if (${OGRE_VERSION} VERSION_LESS 1.10) | |||
| list(APPEND headers "CustomAutoParamDataSource.hh") | |||
There was a problem hiding this comment.
does gazebo/rendering/CustomSceneManager.hh need to be installed?
There was a problem hiding this comment.
It works without it, but it doesn't hurt to add it for completeness. Done.
|
from an external discussion, it sounds like you are building from Ogre from source, so this pull request isn't necessary. I'll close it for now, but we can revisit it in the future if there is interest |
Ogre will render more than 8 shadow maps (I do not know if there is a limit), but AutoParamDataSource will only deliver texture_viewproj_matrix uniforms to shaders for up to 8 shadow maps. I worked around this deficiency by overriding much of AutoParamDataSource and creating a custom SceneManager and associated factory that can be used to inject it into Gazebo.