From 781e17c3197c91712dbcd4328a2cbc8667d02065 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 11 Jul 2022 15:47:16 -0700 Subject: [PATCH 1/4] Move files Signed-off-by: methylDragon --- .../{IgnitionRenderer.cc => GzRenderer.cc} | 22 +++++++++---------- .../{IgnitionRenderer.hh => GzRenderer.hh} | 6 ++--- ...rendering.fontdef => gz-rendering.fontdef} | 0 .../Pbs/500.GzPbsStructs_piece_all.any} | 0 .../Pbs/800.GzPbsCode_piece_ps.any} | 0 .../Pbs/800.GzPbsCode_piece_vs.any} | 0 .../500.GzSolidColorStructs_piece_all.any} | 0 .../SolidColor/800.GzSolidColor_piece_ps.any} | 0 .../SolidColor/800.GzSolidColor_piece_vs.any} | 0 .../GzSphericalClipMinDistance_piece_vs.any} | 0 ...ericalClipMinDistanceStructs_piece_all.any | 0 .../100.gz_CustomVs_piece_vs.any} | 0 .../100.gz_CustomWeights_piece_ps.any} | 0 .../500.gz_Structs_piece_all.any} | 0 14 files changed, 14 insertions(+), 14 deletions(-) rename examples/simple_demo_qml/{IgnitionRenderer.cc => GzRenderer.cc} (94%) rename examples/simple_demo_qml/{IgnitionRenderer.hh => GzRenderer.hh} (96%) rename ogre/src/media/fonts/{ignition-rendering.fontdef => gz-rendering.fontdef} (100%) rename ogre2/src/media/Hlms/{Ignition/Pbs/500.IgnPbsStructs_piece_all.any => Gz/Pbs/500.GzPbsStructs_piece_all.any} (100%) rename ogre2/src/media/Hlms/{Ignition/Pbs/800.IgnPbsCode_piece_ps.any => Gz/Pbs/800.GzPbsCode_piece_ps.any} (100%) rename ogre2/src/media/Hlms/{Ignition/Pbs/800.IgnPbsCode_piece_vs.any => Gz/Pbs/800.GzPbsCode_piece_vs.any} (100%) rename ogre2/src/media/Hlms/{Ignition/SolidColor/500.IgnSolidColorStructs_piece_all.any => Gz/SolidColor/500.GzSolidColorStructs_piece_all.any} (100%) rename ogre2/src/media/Hlms/{Ignition/SolidColor/800.IgnSolidColor_piece_ps.any => Gz/SolidColor/800.GzSolidColor_piece_ps.any} (100%) rename ogre2/src/media/Hlms/{Ignition/SolidColor/800.IgnSolidColor_piece_vs.any => Gz/SolidColor/800.GzSolidColor_piece_vs.any} (100%) rename ogre2/src/media/Hlms/{Ignition/SphericalClipMinDistance/IgnSphericalClipMinDistance_piece_vs.any => Gz/SphericalClipMinDistance/GzSphericalClipMinDistance_piece_vs.any} (100%) rename ogre2/src/media/Hlms/{Ignition => Gz}/SphericalClipMinDistance/SphericalClipMinDistanceStructs_piece_all.any (100%) rename ogre2/src/media/Hlms/Terra/{ign/100.ign_CustomVs_piece_vs.any => gz/100.gz_CustomVs_piece_vs.any} (100%) rename ogre2/src/media/Hlms/Terra/{ign/100.ign_CustomWeights_piece_ps.any => gz/100.gz_CustomWeights_piece_ps.any} (100%) rename ogre2/src/media/Hlms/Terra/{ign/500.ign_Structs_piece_all.any => gz/500.gz_Structs_piece_all.any} (100%) diff --git a/examples/simple_demo_qml/IgnitionRenderer.cc b/examples/simple_demo_qml/GzRenderer.cc similarity index 94% rename from examples/simple_demo_qml/IgnitionRenderer.cc rename to examples/simple_demo_qml/GzRenderer.cc index b53394c82..4b4756d02 100644 --- a/examples/simple_demo_qml/IgnitionRenderer.cc +++ b/examples/simple_demo_qml/GzRenderer.cc @@ -18,7 +18,7 @@ // The functions BuildScene and createCamera are copied from the simple_demo // example. -#include "IgnitionRenderer.hh" +#include "GzRenderer.hh" #include #include @@ -194,23 +194,23 @@ gz::rendering::CameraPtr CreateCamera(const std::string &_engineName) } ////////////////////////////////////////////////// -IgnitionRenderer::~IgnitionRenderer() +GzRenderer::~GzRenderer() { } ////////////////////////////////////////////////// -IgnitionRenderer::IgnitionRenderer() +GzRenderer::GzRenderer() { } ////////////////////////////////////////////////// -void IgnitionRenderer::Initialise() +void GzRenderer::Initialise() { // no-op - all initialised on the main thread } ////////////////////////////////////////////////// -void IgnitionRenderer::InitialiseOnMainThread() +void GzRenderer::InitialiseOnMainThread() { if (!this->initialised) { @@ -220,7 +220,7 @@ void IgnitionRenderer::InitialiseOnMainThread() } ////////////////////////////////////////////////// -void IgnitionRenderer::Render() +void GzRenderer::Render() { // pre-render may regenerate textureId if the size changes this->camera->PreRender(); @@ -234,25 +234,25 @@ void IgnitionRenderer::Render() } ////////////////////////////////////////////////// -bool IgnitionRenderer::Initialised() const +bool GzRenderer::Initialised() const { return this->initialised; } ////////////////////////////////////////////////// -unsigned int IgnitionRenderer::TextureId() const +unsigned int GzRenderer::TextureId() const { return this->textureId; } ////////////////////////////////////////////////// -QSize IgnitionRenderer::TextureSize() const +QSize GzRenderer::TextureSize() const { return this->textureSize; } ////////////////////////////////////////////////// -void IgnitionRenderer::InitEngine() +void GzRenderer::InitEngine() { std::string engineName("ogre2"); @@ -283,7 +283,7 @@ void IgnitionRenderer::InitEngine() } ////////////////////////////////////////////////// -void IgnitionRenderer::UpdateCamera() +void GzRenderer::UpdateCamera() { double angle = this->cameraOffset / 2 * M_PI; double x = sin(angle) * 3.0 + 3.0; diff --git a/examples/simple_demo_qml/IgnitionRenderer.hh b/examples/simple_demo_qml/GzRenderer.hh similarity index 96% rename from examples/simple_demo_qml/IgnitionRenderer.hh rename to examples/simple_demo_qml/GzRenderer.hh index f7a757060..ddb3f2428 100644 --- a/examples/simple_demo_qml/IgnitionRenderer.hh +++ b/examples/simple_demo_qml/GzRenderer.hh @@ -26,13 +26,13 @@ /// and update of a 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 +class GzRenderer { /// \brief Destructor - public: virtual ~IgnitionRenderer(); + public: virtual ~GzRenderer(); /// \brief Constructor - public: IgnitionRenderer(); + public: GzRenderer(); /// \brief Render the next frame. May be called on a render thread. public: void Render(); diff --git a/ogre/src/media/fonts/ignition-rendering.fontdef b/ogre/src/media/fonts/gz-rendering.fontdef similarity index 100% rename from ogre/src/media/fonts/ignition-rendering.fontdef rename to ogre/src/media/fonts/gz-rendering.fontdef diff --git a/ogre2/src/media/Hlms/Ignition/Pbs/500.IgnPbsStructs_piece_all.any b/ogre2/src/media/Hlms/Gz/Pbs/500.GzPbsStructs_piece_all.any similarity index 100% rename from ogre2/src/media/Hlms/Ignition/Pbs/500.IgnPbsStructs_piece_all.any rename to ogre2/src/media/Hlms/Gz/Pbs/500.GzPbsStructs_piece_all.any diff --git a/ogre2/src/media/Hlms/Ignition/Pbs/800.IgnPbsCode_piece_ps.any b/ogre2/src/media/Hlms/Gz/Pbs/800.GzPbsCode_piece_ps.any similarity index 100% rename from ogre2/src/media/Hlms/Ignition/Pbs/800.IgnPbsCode_piece_ps.any rename to ogre2/src/media/Hlms/Gz/Pbs/800.GzPbsCode_piece_ps.any diff --git a/ogre2/src/media/Hlms/Ignition/Pbs/800.IgnPbsCode_piece_vs.any b/ogre2/src/media/Hlms/Gz/Pbs/800.GzPbsCode_piece_vs.any similarity index 100% rename from ogre2/src/media/Hlms/Ignition/Pbs/800.IgnPbsCode_piece_vs.any rename to ogre2/src/media/Hlms/Gz/Pbs/800.GzPbsCode_piece_vs.any diff --git a/ogre2/src/media/Hlms/Ignition/SolidColor/500.IgnSolidColorStructs_piece_all.any b/ogre2/src/media/Hlms/Gz/SolidColor/500.GzSolidColorStructs_piece_all.any similarity index 100% rename from ogre2/src/media/Hlms/Ignition/SolidColor/500.IgnSolidColorStructs_piece_all.any rename to ogre2/src/media/Hlms/Gz/SolidColor/500.GzSolidColorStructs_piece_all.any diff --git a/ogre2/src/media/Hlms/Ignition/SolidColor/800.IgnSolidColor_piece_ps.any b/ogre2/src/media/Hlms/Gz/SolidColor/800.GzSolidColor_piece_ps.any similarity index 100% rename from ogre2/src/media/Hlms/Ignition/SolidColor/800.IgnSolidColor_piece_ps.any rename to ogre2/src/media/Hlms/Gz/SolidColor/800.GzSolidColor_piece_ps.any diff --git a/ogre2/src/media/Hlms/Ignition/SolidColor/800.IgnSolidColor_piece_vs.any b/ogre2/src/media/Hlms/Gz/SolidColor/800.GzSolidColor_piece_vs.any similarity index 100% rename from ogre2/src/media/Hlms/Ignition/SolidColor/800.IgnSolidColor_piece_vs.any rename to ogre2/src/media/Hlms/Gz/SolidColor/800.GzSolidColor_piece_vs.any diff --git a/ogre2/src/media/Hlms/Ignition/SphericalClipMinDistance/IgnSphericalClipMinDistance_piece_vs.any b/ogre2/src/media/Hlms/Gz/SphericalClipMinDistance/GzSphericalClipMinDistance_piece_vs.any similarity index 100% rename from ogre2/src/media/Hlms/Ignition/SphericalClipMinDistance/IgnSphericalClipMinDistance_piece_vs.any rename to ogre2/src/media/Hlms/Gz/SphericalClipMinDistance/GzSphericalClipMinDistance_piece_vs.any diff --git a/ogre2/src/media/Hlms/Ignition/SphericalClipMinDistance/SphericalClipMinDistanceStructs_piece_all.any b/ogre2/src/media/Hlms/Gz/SphericalClipMinDistance/SphericalClipMinDistanceStructs_piece_all.any similarity index 100% rename from ogre2/src/media/Hlms/Ignition/SphericalClipMinDistance/SphericalClipMinDistanceStructs_piece_all.any rename to ogre2/src/media/Hlms/Gz/SphericalClipMinDistance/SphericalClipMinDistanceStructs_piece_all.any diff --git a/ogre2/src/media/Hlms/Terra/ign/100.ign_CustomVs_piece_vs.any b/ogre2/src/media/Hlms/Terra/gz/100.gz_CustomVs_piece_vs.any similarity index 100% rename from ogre2/src/media/Hlms/Terra/ign/100.ign_CustomVs_piece_vs.any rename to ogre2/src/media/Hlms/Terra/gz/100.gz_CustomVs_piece_vs.any diff --git a/ogre2/src/media/Hlms/Terra/ign/100.ign_CustomWeights_piece_ps.any b/ogre2/src/media/Hlms/Terra/gz/100.gz_CustomWeights_piece_ps.any similarity index 100% rename from ogre2/src/media/Hlms/Terra/ign/100.ign_CustomWeights_piece_ps.any rename to ogre2/src/media/Hlms/Terra/gz/100.gz_CustomWeights_piece_ps.any diff --git a/ogre2/src/media/Hlms/Terra/ign/500.ign_Structs_piece_all.any b/ogre2/src/media/Hlms/Terra/gz/500.gz_Structs_piece_all.any similarity index 100% rename from ogre2/src/media/Hlms/Terra/ign/500.ign_Structs_piece_all.any rename to ogre2/src/media/Hlms/Terra/gz/500.gz_Structs_piece_all.any From 6995c9a5fd29a74cf703f5a9f5f75d06c90e231c Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 11 Jul 2022 15:47:26 -0700 Subject: [PATCH 2/4] Support file migrations Signed-off-by: methylDragon --- examples/simple_demo_qml/CMakeLists.txt | 6 +++--- examples/simple_demo_qml/Main.cc | 2 +- examples/simple_demo_qml/Main.qml | 2 +- examples/simple_demo_qml/ThreadRenderer.cpp | 4 ++-- examples/simple_demo_qml/ThreadRenderer.h | 4 ++-- ogre/src/OgreText.cc | 2 +- ogre2/src/Ogre2GzHlmsPbsPrivate.cc | 6 +++--- ogre2/src/Ogre2GzHlmsPbsPrivate.hh | 2 +- ogre2/src/Ogre2GzHlmsSphericalClipMinDistance.hh | 2 +- ogre2/src/Ogre2GzHlmsTerraPrivate.cc | 6 +++--- ogre2/src/Ogre2GzHlmsTerraPrivate.hh | 2 +- ogre2/src/Ogre2GzHlmsUnlitPrivate.cc | 6 +++--- ogre2/src/Ogre2GzHlmsUnlitPrivate.hh | 2 +- ogre2/src/Ogre2Heightmap.cc | 2 +- ogre2/src/Ogre2RenderEngine.cc | 2 +- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/simple_demo_qml/CMakeLists.txt b/examples/simple_demo_qml/CMakeLists.txt index 8caa05420..971891e82 100644 --- a/examples/simple_demo_qml/CMakeLists.txt +++ b/examples/simple_demo_qml/CMakeLists.txt @@ -53,8 +53,8 @@ set(CMAKE_AUTOUIC ON) add_executable(simple_demo_qml Main.cc - IgnitionRenderer.hh - IgnitionRenderer.cc + GzRenderer.hh + GzRenderer.cc ThreadRenderer.h ThreadRenderer.cpp ${QT_RESOURCES} @@ -79,7 +79,7 @@ target_link_libraries(simple_demo_qml PUBLIC set_target_properties(simple_demo_qml PROPERTIES QT_QML_MODULE_VERSION 1.0 - QT_QML_MODULE_URI IgnitionRendering + QT_QML_MODULE_URI GzRendering ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} diff --git a/examples/simple_demo_qml/Main.cc b/examples/simple_demo_qml/Main.cc index 512b260da..984239a42 100644 --- a/examples/simple_demo_qml/Main.cc +++ b/examples/simple_demo_qml/Main.cc @@ -36,7 +36,7 @@ int main(int _argc, char** _argv) QSurfaceFormat::setDefaultFormat(format); RenderThread::Print(format); - qmlRegisterType("IgnitionRendering", 1, 0, + qmlRegisterType("GzRendering", 1, 0, "ThreadRenderer"); QGuiApplication app(_argc, _argv); diff --git a/examples/simple_demo_qml/Main.qml b/examples/simple_demo_qml/Main.qml index 437299a3e..65323febc 100644 --- a/examples/simple_demo_qml/Main.qml +++ b/examples/simple_demo_qml/Main.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import IgnitionRendering 1.0 +import GzRendering 1.0 Item { width: 800 diff --git a/examples/simple_demo_qml/ThreadRenderer.cpp b/examples/simple_demo_qml/ThreadRenderer.cpp index 0e59b015d..91731ef5f 100644 --- a/examples/simple_demo_qml/ThreadRenderer.cpp +++ b/examples/simple_demo_qml/ThreadRenderer.cpp @@ -69,7 +69,7 @@ ****************************************************************************/ #include "ThreadRenderer.h" -#include "IgnitionRenderer.hh" +#include "GzRenderer.hh" #include #include @@ -211,7 +211,7 @@ void RenderThread::InitialiseOnMainThread() Print(this->context->format()); // create renderer - this->renderer = new IgnitionRenderer(); + this->renderer = new GzRenderer(); this->renderer->InitialiseOnMainThread(); this->context->doneCurrent(); diff --git a/examples/simple_demo_qml/ThreadRenderer.h b/examples/simple_demo_qml/ThreadRenderer.h index 9ca73a15b..ed3fc23c6 100644 --- a/examples/simple_demo_qml/ThreadRenderer.h +++ b/examples/simple_demo_qml/ThreadRenderer.h @@ -71,7 +71,7 @@ #ifndef GZ_RENDERING_EXAMPLES_SIMPLE_DEMO_QML_THREAD_RENDERER_HH_ #define GZ_RENDERING_EXAMPLES_SIMPLE_DEMO_QML_THREAD_RENDERER_HH_ -#include "IgnitionRenderer.hh" +#include "GzRenderer.hh" #include #include @@ -109,7 +109,7 @@ public slots: void TextureReady(int _id, const QSize &_size); private: - IgnitionRenderer *renderer = nullptr; + GzRenderer *renderer = nullptr; QSize size; /// \brief reference to the render window item diff --git a/ogre/src/OgreText.cc b/ogre/src/OgreText.cc index b0179669e..b1bf435d0 100644 --- a/ogre/src/OgreText.cc +++ b/ogre/src/OgreText.cc @@ -40,7 +40,7 @@ class gz::rendering::OgreMovableText public: virtual ~OgreMovableText(); /// \brief Set the font. Valid fonts are defined in - /// media/fonts/ignition-rendering.fontdef + /// media/fonts/gz-rendering.fontdef /// \param[in] _font Name of the font public: void SetFontName(const std::string &_font); diff --git a/ogre2/src/Ogre2GzHlmsPbsPrivate.cc b/ogre2/src/Ogre2GzHlmsPbsPrivate.cc index dc74f36db..7710b6210 100644 --- a/ogre2/src/Ogre2GzHlmsPbsPrivate.cc +++ b/ogre2/src/Ogre2GzHlmsPbsPrivate.cc @@ -280,10 +280,10 @@ namespace Ogre HlmsPbs::getDefaultPaths(_outDataFolderPath, _outLibraryFoldersPaths); _outLibraryFoldersPaths.push_back( - common::joinPaths("Hlms", "Ignition", "SolidColor")); + common::joinPaths("Hlms", "Gz", "SolidColor")); _outLibraryFoldersPaths.push_back( - common::joinPaths("Hlms", "Ignition", "SphericalClipMinDistance")); + common::joinPaths("Hlms", "Gz", "SphericalClipMinDistance")); _outLibraryFoldersPaths.push_back( - common::joinPaths("Hlms", "Ignition", "Pbs")); + common::joinPaths("Hlms", "Gz", "Pbs")); } } // namespace Ogre diff --git a/ogre2/src/Ogre2GzHlmsPbsPrivate.hh b/ogre2/src/Ogre2GzHlmsPbsPrivate.hh index 80e24ba4c..c3e07e14b 100644 --- a/ogre2/src/Ogre2GzHlmsPbsPrivate.hh +++ b/ogre2/src/Ogre2GzHlmsPbsPrivate.hh @@ -44,7 +44,7 @@ namespace Ogre /// - Sends relevant data to the GPU buffers for shaders to use /// /// This listener requires Hlms to have been created with the piece data - /// files in ogre2/src/media/Hlms/Ignition registered + /// files in ogre2/src/media/Hlms/Gz registered /// /// We need to derive from HlmsPbs/HlmsUnlit (rather than just using /// HlmsListener) when we need to use code that sends data diff --git a/ogre2/src/Ogre2GzHlmsSphericalClipMinDistance.hh b/ogre2/src/Ogre2GzHlmsSphericalClipMinDistance.hh index b32313691..99f6c1b25 100644 --- a/ogre2/src/Ogre2GzHlmsSphericalClipMinDistance.hh +++ b/ogre2/src/Ogre2GzHlmsSphericalClipMinDistance.hh @@ -41,7 +41,7 @@ namespace gz /// - Sends relevant data to the GPU buffers for shaders to use /// /// This listener requires Hlms to have been created with the piece data - /// files in ogre2/src/media/Hlms/Ignition registered + /// files in ogre2/src/media/Hlms/Gz registered /// /// \internal /// \remark Public variables take effect immediately (i.e. for the diff --git a/ogre2/src/Ogre2GzHlmsTerraPrivate.cc b/ogre2/src/Ogre2GzHlmsTerraPrivate.cc index 563729e79..1fe0bbc42 100644 --- a/ogre2/src/Ogre2GzHlmsTerraPrivate.cc +++ b/ogre2/src/Ogre2GzHlmsTerraPrivate.cc @@ -300,12 +300,12 @@ namespace Ogre HlmsTerra::getDefaultPaths(_outDataFolderPath, _outLibraryFoldersPaths); _outLibraryFoldersPaths.push_back( - common::joinPaths("Hlms", "Ignition", "SolidColor")); + common::joinPaths("Hlms", "Gz", "SolidColor")); _outLibraryFoldersPaths.push_back( - common::joinPaths("Hlms", "Ignition", "SphericalClipMinDistance")); + common::joinPaths("Hlms", "Gz", "SphericalClipMinDistance")); _outLibraryFoldersPaths.push_back( common::joinPaths("Hlms", "Terra", "ign")); _outLibraryFoldersPaths.push_back( - common::joinPaths("Hlms", "Ignition", "Pbs")); + common::joinPaths("Hlms", "Gz", "Pbs")); } } // namespace Ogre diff --git a/ogre2/src/Ogre2GzHlmsTerraPrivate.hh b/ogre2/src/Ogre2GzHlmsTerraPrivate.hh index 8f1ec65ee..a0abadd57 100644 --- a/ogre2/src/Ogre2GzHlmsTerraPrivate.hh +++ b/ogre2/src/Ogre2GzHlmsTerraPrivate.hh @@ -42,7 +42,7 @@ namespace Ogre /// - Sends relevant data to the GPU buffers for shaders to use /// /// This listener requires Hlms to have been created with the piece data - /// files in ogre2/src/media/Hlms/Ignition registered + /// files in ogre2/src/media/Hlms/Gz registered /// /// We need to derive from HlmsTerra (rather than just using /// HlmsListener) when we need to use code that sends data diff --git a/ogre2/src/Ogre2GzHlmsUnlitPrivate.cc b/ogre2/src/Ogre2GzHlmsUnlitPrivate.cc index 21057b145..157a5019b 100644 --- a/ogre2/src/Ogre2GzHlmsUnlitPrivate.cc +++ b/ogre2/src/Ogre2GzHlmsUnlitPrivate.cc @@ -234,10 +234,10 @@ namespace Ogre HlmsUnlit::getDefaultPaths(_outDataFolderPath, _outLibraryFoldersPaths); _outLibraryFoldersPaths.push_back( - common::joinPaths("Hlms", "Ignition", "SolidColor")); + common::joinPaths("Hlms", "Gz", "SolidColor")); _outLibraryFoldersPaths.push_back( - common::joinPaths("Hlms", "Ignition", "SphericalClipMinDistance")); + common::joinPaths("Hlms", "Gz", "SphericalClipMinDistance")); _outLibraryFoldersPaths.push_back( - common::joinPaths("Hlms", "Ignition", "Pbs")); + common::joinPaths("Hlms", "Gz", "Pbs")); } } // namespace Ogre diff --git a/ogre2/src/Ogre2GzHlmsUnlitPrivate.hh b/ogre2/src/Ogre2GzHlmsUnlitPrivate.hh index 967a90aad..62de717c9 100644 --- a/ogre2/src/Ogre2GzHlmsUnlitPrivate.hh +++ b/ogre2/src/Ogre2GzHlmsUnlitPrivate.hh @@ -42,7 +42,7 @@ namespace Ogre /// - Sends relevant data to the GPU buffers for shaders to use /// /// This listener requires Hlms to have been created with the piece data - /// files in ogre2/src/media/Hlms/Ignition registered + /// files in ogre2/src/media/Hlms/Gz registered /// /// We need to derive from HlmsUnlit/HlmsUnlit (rather than just using /// HlmsListener) when we need to use code that sends data diff --git a/ogre2/src/Ogre2Heightmap.cc b/ogre2/src/Ogre2Heightmap.cc index 9ef68af74..1899220bb 100644 --- a/ogre2/src/Ogre2Heightmap.cc +++ b/ogre2/src/Ogre2Heightmap.cc @@ -255,7 +255,7 @@ void Ogre2Heightmap::Init() "HlmsTerra incorrectly setup, memory corrupted, or " "HlmsTerra::getType changed while this code is out of sync"); - Ogre::String datablockName = "IGN Terra " + this->name; + Ogre::String datablockName = "GZ Terra " + this->name; Ogre::HlmsDatablock *datablockBase = hlmsTerra->createDatablock( datablockName, datablockName, Ogre::HlmsMacroblock(), diff --git a/ogre2/src/Ogre2RenderEngine.cc b/ogre2/src/Ogre2RenderEngine.cc index decfa6190..798adfc66 100644 --- a/ogre2/src/Ogre2RenderEngine.cc +++ b/ogre2/src/Ogre2RenderEngine.cc @@ -753,7 +753,7 @@ void Ogre2RenderEngine::RegisterHlms() Ogre::ArchiveManager &archiveManager = Ogre::ArchiveManager::getSingleton(); Ogre::Archive *customizationsArchiveLibrary = - archiveManager.load(common::joinPaths(rootHlmsFolder, "Hlms", "Ignition"), + archiveManager.load(common::joinPaths(rootHlmsFolder, "Hlms", "Gz"), "FileSystem", true); { From 65f830b8aceef1b615eb661220ca023a03081fc0 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 11 Jul 2022 15:47:42 -0700 Subject: [PATCH 3/4] Partial source and cmake migrations Signed-off-by: methylDragon --- .github/ci/packages.apt | 12 +++++------ .github/workflows/ci.yml | 4 ++-- .github/workflows/pr-collection-labeler.yml | 2 +- CMakeLists.txt | 16 +++++++-------- api.md.in | 4 ++-- doc/CMakeLists.txt | 6 +++--- include/CMakeLists.txt | 2 +- include/gz/rendering/base/base.hh.in | 2 +- include/gz/rendering/rendering.hh.in | 2 +- ogre/include/CMakeLists.txt | 2 +- ogre/include/gz/rendering/ogre/ogre.hh.in | 2 +- ogre2/include/CMakeLists.txt | 2 +- ogre2/include/gz/rendering/ogre2/ogre2.hh.in | 2 +- .../Terra/Any/800.PixelShader_piece_ps.any | 12 +++++------ ogre2/src/terrain/Terra/CMakeLists.txt | 2 +- .../include/Terra/Hlms/OgreHlmsJsonTerra.h | 2 +- .../Terra/include/Terra/Hlms/OgreHlmsTerra.h | 2 +- .../Terra/Hlms/OgreHlmsTerraDatablock.h | 8 ++++---- ogre2/src/terrain/Terra/include/Terra/Terra.h | 8 ++++---- .../Terra/src/Hlms/OgreHlmsJsonTerra.cpp | 2 +- .../terrain/Terra/src/Hlms/OgreHlmsTerra.cpp | 14 ++++++------- .../Terra/src/Hlms/OgreHlmsTerraDatablock.cpp | 20 +++++++++---------- .../PbsListener/OgreHlmsPbsTerraShadows.cpp | 6 +++--- ogre2/src/terrain/Terra/src/Terra.cpp | 8 ++++---- optix/include/CMakeLists.txt | 2 +- optix/include/gz/rendering/optix/optix.hh.in | 2 +- .../all_symbols_have_version.bash.in | 6 +++--- tutorials.md.in | 4 ++-- tutorials/02_install.md | 18 ++++++++--------- 29 files changed, 87 insertions(+), 87 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 5eddfa162..3465e8dd8 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,12 +1,12 @@ freeglut3-dev libfreeimage-dev libglew-dev -libignition-cmake3-dev -libignition-common5-dev -libignition-math7-dev -libignition-math7-eigen3-dev -libignition-plugin2-dev -libignition-utils2-dev +libgz-cmake3-dev +libgz-common5-dev +libgz-math7-dev +libgz-math7-eigen3-dev +libgz-plugin2-dev +libgz-utils2-dev libogre-1.9-dev libxi-dev libxmu-dev diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4b8a356b..54d4e3ab4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: uses: actions/checkout@v2 - name: Compile and test id: ci - uses: ignition-tooling/action-ignition-ci@focal + uses: gazebo-tooling/action-gz-ci@focal with: codecov-enabled: true cppcheck-enabled: true @@ -25,4 +25,4 @@ jobs: uses: actions/checkout@v2 - name: Compile and test id: ci - uses: ignition-tooling/action-ignition-ci@jammy + uses: gazebo-tooling/action-gz-ci@jammy diff --git a/.github/workflows/pr-collection-labeler.yml b/.github/workflows/pr-collection-labeler.yml index 7d7b4e179..38c4fc13b 100644 --- a/.github/workflows/pr-collection-labeler.yml +++ b/.github/workflows/pr-collection-labeler.yml @@ -8,6 +8,6 @@ jobs: steps: - name: Add collection labels if: github.event.action == 'opened' - uses: ignition-tooling/pr-collection-labeler@v1 + uses: gazebo-tooling/pr-collection-labeler@v1 with: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 615dfabde..eb252cd40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) gz_configure_project( - REPLACE_IGNITION_INCLUDE_PATH gz/rendering + REPLACE_GZ_INCLUDE_PATH gz/rendering VERSION_SUFFIX pre1) #============================================================================ @@ -77,7 +77,7 @@ endif() # Find OGRE list(APPEND gz_ogre_components "RTShaderSystem" "Terrain" "Overlay" "Paging") -gz_find_package(IgnOGRE VERSION 1.9.0 +gz_find_package(GzOGRE VERSION 1.9.0 COMPONENTS ${gz_ogre_components} REQUIRED_BY ogre PRIVATE_FOR ogre) @@ -87,7 +87,7 @@ gz_find_package(IgnOGRE VERSION 1.9.0 # USE_UNOFFICIAL_OGRE_VERSIONS flag if (NOT USE_UNOFFICIAL_OGRE_VERSIONS) if (${OGRE_VERSION} VERSION_GREATER_EQUAL 1.10.0) - IGN_BUILD_WARNING("Ogre 1.x versions greater than 1.9 are not officially supported." + GZ_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") endif() @@ -107,14 +107,14 @@ endif() # Find OGRE2: first try to find OGRE2 built with PlanarReflections support and # fallback to look for OGRE2 without it. Both seems to works for ign-rendering. # See https://github.com/gazebosim/gz-rendering/issues/597 -gz_find_package(IgnOGRE2 VERSION 2.2.0 +gz_find_package(GzOGRE2 VERSION 2.2.0 COMPONENTS HlmsPbs HlmsUnlit Overlay PlanarReflections PRIVATE_FOR ogre2 QUIET) if ("${OGRE2-PlanarReflections}" STREQUAL "OGRE2-PlanarReflections-NOTFOUND") message(STATUS "PlanarReflections component was not found. Try looking without it:") - gz_find_package(IgnOGRE2 VERSION 2.2.0 + gz_find_package(GzOGRE2 VERSION 2.2.0 COMPONENTS HlmsPbs HlmsUnlit Overlay REQUIRED_BY ogre2 PRIVATE_FOR ogre2) @@ -126,7 +126,7 @@ endif() # Plugin install dirs set(GZ_RENDERING_ENGINE_INSTALL_DIR - ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/gz-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/engine-plugins + ${CMAKE_INSTALL_PREFIX}/${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/engine-plugins ) #-------------------------------------- @@ -155,7 +155,7 @@ else() set(GZ_RENDERING_PLUGIN_PATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) endif() -set(GZ_RENDERING_RESOURCE_PATH ${CMAKE_INSTALL_PREFIX}/${IGN_DATA_INSTALL_DIR}) +set(GZ_RENDERING_RESOURCE_PATH ${CMAKE_INSTALL_PREFIX}/${GZ_DATA_INSTALL_DIR}) #============================================================================ # Configure the build @@ -180,7 +180,7 @@ gz_configure_build(QUIT_IF_BUILD_ERRORS if (HAVE_OGRE2) # Must be done after gz_configure_build or else Terra - # won't see IGN_ADD_fPIC_TO_LIBRARIES + # won't see GZ_ADD_fPIC_TO_LIBRARIES add_subdirectory(ogre2/src/terrain/Terra) endif() diff --git a/api.md.in b/api.md.in index 076d03826..50360ff6e 100644 --- a/api.md.in +++ b/api.md.in @@ -1,6 +1,6 @@ -## Gazebo @IGN_DESIGNATION_CAP@ +## Gazebo @GZ_DESIGNATION_CAP@ -Gazebo @IGN_DESIGNATION_CAP@ is a component in Gazebo, a set of libraries +Gazebo @GZ_DESIGNATION_CAP@ is a component in Gazebo, a set of libraries designed to rapidly develop robot and simulation applications. ## License diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index f9968f12c..b6abfef55 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,13 +1,13 @@ find_package(Doxygen) -set(IGNITION_DOXYGEN_TAGFILES +set(GZ_DOXYGEN_TAGFILES "\"${CMAKE_BINARY_DIR}/doc/ogre_1-9.tag.xml=https://www.ogre3d.org/docs/api/1.9/\"") if (DOXYGEN_FOUND) - configure_file(${IGNITION_CMAKE_DOXYGEN_DIR}/api.in + configure_file(${GZ_CMAKE_DOXYGEN_DIR}/api.in ${CMAKE_BINARY_DIR}/api.dox @ONLY) - configure_file(${IGNITION_CMAKE_DOXYGEN_DIR}/tutorials.in + configure_file(${GZ_CMAKE_DOXYGEN_DIR}/tutorials.in ${CMAKE_BINARY_DIR}/tutorials.dox @ONLY) # Find tar diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 4b2bdd7bb..992a1312e 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,2 +1,2 @@ add_subdirectory(gz) -install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) +install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/include/gz/rendering/base/base.hh.in b/include/gz/rendering/base/base.hh.in index c4092f0cd..4ffcf3d38 100644 --- a/include/gz/rendering/base/base.hh.in +++ b/include/gz/rendering/base/base.hh.in @@ -1,3 +1,3 @@ // Automatically generated -#include +#include ${ign_headers} diff --git a/include/gz/rendering/rendering.hh.in b/include/gz/rendering/rendering.hh.in index 2602ad19b..9bd7cdda0 100644 --- a/include/gz/rendering/rendering.hh.in +++ b/include/gz/rendering/rendering.hh.in @@ -1,3 +1,3 @@ // Automatically generated -//#include +//#include ${ign_headers} diff --git a/ogre/include/CMakeLists.txt b/ogre/include/CMakeLists.txt index 4b2bdd7bb..992a1312e 100644 --- a/ogre/include/CMakeLists.txt +++ b/ogre/include/CMakeLists.txt @@ -1,2 +1,2 @@ add_subdirectory(gz) -install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) +install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/ogre/include/gz/rendering/ogre/ogre.hh.in b/ogre/include/gz/rendering/ogre/ogre.hh.in index c4092f0cd..4ffcf3d38 100644 --- a/ogre/include/gz/rendering/ogre/ogre.hh.in +++ b/ogre/include/gz/rendering/ogre/ogre.hh.in @@ -1,3 +1,3 @@ // Automatically generated -#include +#include ${ign_headers} diff --git a/ogre2/include/CMakeLists.txt b/ogre2/include/CMakeLists.txt index 4b2bdd7bb..992a1312e 100644 --- a/ogre2/include/CMakeLists.txt +++ b/ogre2/include/CMakeLists.txt @@ -1,2 +1,2 @@ add_subdirectory(gz) -install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) +install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/ogre2/include/gz/rendering/ogre2/ogre2.hh.in b/ogre2/include/gz/rendering/ogre2/ogre2.hh.in index c4092f0cd..4ffcf3d38 100644 --- a/ogre2/include/gz/rendering/ogre2/ogre2.hh.in +++ b/ogre2/include/gz/rendering/ogre2/ogre2.hh.in @@ -1,3 +1,3 @@ // Automatically generated -#include +#include ${ign_headers} diff --git a/ogre2/src/media/Hlms/Terra/Any/800.PixelShader_piece_ps.any b/ogre2/src/media/Hlms/Terra/Any/800.PixelShader_piece_ps.any index 1e3272840..2abb60a4e 100644 --- a/ogre2/src/media/Hlms/Terra/Any/800.PixelShader_piece_ps.any +++ b/ogre2/src/media/Hlms/Terra/Any/800.PixelShader_piece_ps.any @@ -102,11 +102,11 @@ float4 detailWeights = float4( 0.25f, 0.25f, 0.25f, 0.25f ); @insertpiece( ign_weights ) @else - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN //pixelData.diffuse.xyz *= (detailCol0.xyz * detailWeights.x + detailCol1.xyz * detailWeights.y) + // (detailCol2.xyz * detailWeights.z + detailCol3.xyz * detailWeights.w); @insertpiece( ign_weights ) - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END @end /// Apply the material's diffuse over the textures @@ -130,7 +130,7 @@ pixelData.specular.xyz = float3( 1.0f, 1.0f, 1.0f ); - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN // float metalness = (metalness0 * detailWeights.x * material.metalness.x + // metalness1 * detailWeights.y * material.metalness.y) + // (metalness2 * detailWeights.z * material.metalness.z + @@ -140,7 +140,7 @@ metalness = lerp( metalness, metalness1, detailWeights.y ); metalness = lerp( metalness, metalness2, detailWeights.z ); metalness = lerp( metalness, metalness3, detailWeights.w ); - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END pixelData.F0 = lerp( float3( 0.03f, 0.03f, 0.03f ), pixelData.diffuse.xyz * 3.14159f, metalness ); pixelData.diffuse.xyz = pixelData.diffuse.xyz - pixelData.diffuse.xyz * metalness; @@ -161,7 +161,7 @@ @end @end - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN // pixelData.roughness = (roughness0 * detailWeights.x * material.roughness.x + // roughness1 * detailWeights.y * material.roughness.y) + // (roughness2 * detailWeights.z * material.roughness.z + @@ -171,7 +171,7 @@ roughness = lerp( roughness, roughness1, detailWeights.y ); roughness = lerp( roughness, roughness2, detailWeights.z ); roughness = lerp( roughness, roughness3, detailWeights.w ); - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END pixelData.roughness = max( pixelData.roughness, 0.001f ); @end diff --git a/ogre2/src/terrain/Terra/CMakeLists.txt b/ogre2/src/terrain/Terra/CMakeLists.txt index 7b56a69ed..cfb7ad520 100644 --- a/ogre2/src/terrain/Terra/CMakeLists.txt +++ b/ogre2/src/terrain/Terra/CMakeLists.txt @@ -8,7 +8,7 @@ file( GLOB_RECURSE TERRA_SOURCES add_library(${PROJECT_NAME} STATIC ${TERRA_SOURCES}) -if(IGN_ADD_fPIC_TO_LIBRARIES AND NOT _gz_add_library_INTERFACE) +if(GZ_ADD_fPIC_TO_LIBRARIES AND NOT _gz_add_library_INTERFACE) target_compile_options(${PROJECT_NAME} PRIVATE -fPIC) endif() diff --git a/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsJsonTerra.h b/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsJsonTerra.h index 7158ee7af..2a122dd3c 100644 --- a/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsJsonTerra.h +++ b/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsJsonTerra.h @@ -26,7 +26,7 @@ THE SOFTWARE. ----------------------------------------------------------------------------- */ -#if !OGRE_NO_JSON && defined( IGN_TERRA_JSON_ENABLED ) +#if !OGRE_NO_JSON && defined( GZ_TERRA_JSON_ENABLED ) #ifndef _OgreHlmsJsonTerra_H_ #define _OgreHlmsJsonTerra_H_ diff --git a/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsTerra.h b/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsTerra.h index d4b2ceb40..60666b4ae 100644 --- a/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsTerra.h +++ b/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsTerra.h @@ -110,7 +110,7 @@ namespace Ogre static void getDefaultPaths( String& outDataFolderPath, StringVector& outLibraryFoldersPaths ); -#if !OGRE_NO_JSON && defined( IGN_TERRA_JSON_ENABLED ) +#if !OGRE_NO_JSON && defined( GZ_TERRA_JSON_ENABLED ) /// @copydoc Hlms::_loadJson virtual void _loadJson( const rapidjson::Value &jsonValue, const HlmsJson::NamedBlocks &blocks, HlmsDatablock *datablock, const String &resourceGroup, diff --git a/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsTerraDatablock.h b/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsTerraDatablock.h index 27c3a2d5c..bdfb1e8df 100644 --- a/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsTerraDatablock.h +++ b/ogre2/src/terrain/Terra/include/Terra/Hlms/OgreHlmsTerraDatablock.h @@ -178,10 +178,10 @@ namespace Ogre Vector4 mDetailsOffsetScale[4]; //uint16 mTexIndices[NUM_TERRA_TEXTURE_TYPES]; - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN float mIgnWeightsMinHeight[4]; float mIgnWeightsMaxHeight[4]; - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END /// @see TerraBrdf::TerraBrdf uint32 mBrdf; @@ -243,13 +243,13 @@ namespace Ogre void setBrdf( TerraBrdf::TerraBrdf brdf ); uint32 getBrdf(void) const; - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN void setIgnWeightsHeights( const Vector4 &ignWeightsMinHeight, const Vector4 &ignWeightsMaxHeight ); using HlmsTerraBaseTextureDatablock::setTexture; void setTexture( TerraTextureTypes texUnit, const String &name, const HlmsSamplerblock *refParams ); - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END /** Suggests the TextureMapType (aka texture category) for each type of texture (i.e. normals should load from TEXTURE_TYPE_NORMALS). diff --git a/ogre2/src/terrain/Terra/include/Terra/Terra.h b/ogre2/src/terrain/Terra/include/Terra/Terra.h index 45bbf9db8..5680cccb3 100644 --- a/ogre2/src/terrain/Terra/include/Terra/Terra.h +++ b/ogre2/src/terrain/Terra/include/Terra/Terra.h @@ -107,12 +107,12 @@ namespace Ogre CompositorManager2 *m_compositorManager; Camera const *m_camera; - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN /// See IORM_SOLID_COLOR and IORM_SOLID_THERMAL_COLOR_TEXTURED Vector4 mSolidColor[2]; /// See IORM_SOLID_COLOR and IORM_SOLID_THERMAL_COLOR_TEXTURED bool mSolidColorSet[2]; - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END /// Converts value from Y-up to whatever the user up vector is (see m_zUp) inline Vector3 fromYUp( Vector3 value ) const; @@ -177,7 +177,7 @@ namespace Ogre void setCustomSkirtMinHeight( const float skirtMinHeight ) { m_skirtSize = skirtMinHeight; } float getCustomSkirtMinHeight( void ) const { return m_skirtSize; } - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN /// \brief See IORM_SOLID_COLOR and IORM_SOLID_THERMAL_COLOR_TEXTURED /// Replaces renderable->setCustomRenderable(...) because /// a Terrain may have many renderables but the color is the same @@ -202,7 +202,7 @@ namespace Ogre /// Marks all SetSolidColor as unset so that SolidColor throws /// if used again without setting. void UnsetSolidColors(); - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END /** Must be called every frame so we can check the camera's position (passed in the constructor) and update our visible batches (and LODs) diff --git a/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsJsonTerra.cpp b/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsJsonTerra.cpp index 541807eb1..521622eaf 100644 --- a/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsJsonTerra.cpp +++ b/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsJsonTerra.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. #include "OgreBuildSettings.h" -#if !OGRE_NO_JSON && defined( IGN_TERRA_JSON_ENABLED ) +#if !OGRE_NO_JSON && defined( GZ_TERRA_JSON_ENABLED ) #include "Terra/Hlms/OgreHlmsJsonTerra.h" #include "OgreHlmsManager.h" diff --git a/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsTerra.cpp b/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsTerra.cpp index 949c5c604..1b5ba8bd4 100644 --- a/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsTerra.cpp +++ b/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsTerra.cpp @@ -32,7 +32,7 @@ THE SOFTWARE. #include "OgreHlmsListener.h" #include "OgreLwString.h" -#if !OGRE_NO_JSON && defined( IGN_TERRA_JSON_ENABLED ) +#if !OGRE_NO_JSON && defined( GZ_TERRA_JSON_ENABLED ) #include "Terra/Hlms/OgreHlmsJsonTerra.h" #endif @@ -377,7 +377,7 @@ namespace Ogre // } } - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN for( size_t i = 0u; i < 4u; ++i ) { const IdString c_ignWeightProperties[4] = { @@ -390,7 +390,7 @@ namespace Ogre fabsf( datablock->mIgnWeightsMinHeight[i] - datablock->mIgnWeightsMaxHeight[i] ) >= 1e-6f ); } - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END #ifdef OGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS if( mPlanarReflections && mPlanarReflections->hasPlanarReflections( renderable ) ) @@ -627,9 +627,9 @@ namespace Ogre // mRenderSystem->_executeResourceTransition( &resourceTransition ); // mRenderSystem->_resourceTransitionDestroyed( &resourceTransition ); - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN // Barriers dealt with in Ogre2Scene::UpdateAllHeightmaps - #ifdef IGN_DISABLED + #ifdef GZ_DISABLED TextureGpu *terraShadowText = terraObj->_getShadowMapTex(); const CompositorTextureVec &compositorTextures = queuedRenderable.movableObject-> _getManager()->getCompositorTextures(); @@ -645,7 +645,7 @@ namespace Ogre " to the compositor pass so Ogre can place the proper Barriers" && false ); } #endif - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END #endif mLastMovableObject = queuedRenderable.movableObject; @@ -750,7 +750,7 @@ namespace Ogre //Fill the data folder path outDataFolderPath = "Hlms/Terra/" + shaderSyntax; } -#if !OGRE_NO_JSON && defined( IGN_TERRA_JSON_ENABLED ) +#if !OGRE_NO_JSON && defined( GZ_TERRA_JSON_ENABLED ) //----------------------------------------------------------------------------------- void HlmsTerra::_loadJson( const rapidjson::Value &jsonValue, const HlmsJson::NamedBlocks &blocks, HlmsDatablock *datablock, const String &resourceGroup, diff --git a/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsTerraDatablock.cpp b/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsTerraDatablock.cpp index 2de6429ed..19355c902 100644 --- a/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsTerraDatablock.cpp +++ b/ogre2/src/terrain/Terra/src/Hlms/OgreHlmsTerraDatablock.cpp @@ -50,9 +50,9 @@ THE SOFTWARE. namespace Ogre { - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN const size_t HlmsTerraDatablock::MaterialSizeInGpu = 4 * 12 * 4; - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END const size_t HlmsTerraDatablock::MaterialSizeInGpuAligned = alignToNextMultiple( HlmsTerraDatablock::MaterialSizeInGpu, 4 * 4 ); @@ -65,10 +65,10 @@ namespace Ogre HlmsTerraBaseTextureDatablock( name, creator, macroblock, blendblock, params ), mkDr( 0.318309886f ), mkDg( 0.318309886f ), mkDb( 0.318309886f ), //Max Diffuse = 1 / PI mShadowConstantBiasGpu( 0.0f ), - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN mIgnWeightsMinHeight{ 0.0f, 0.0f, 0.0f, 0.0f }, mIgnWeightsMaxHeight{ 0.0f, 0.0f, 0.0f, 0.0f }, - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END mBrdf( TerraBrdf::Default ) { mShadowConstantBiasGpu = mShadowConstantBias = 0.0f; @@ -163,7 +163,7 @@ namespace Ogre for( size_t i = 0u; i < numOffsetScale; ++i ) detailsOffsetScale[i] = mDetailsOffsetScale[i]; - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN const size_t sizeOfIgnData = sizeof( mIgnWeightsMinHeight ) + sizeof( mIgnWeightsMinHeight ); memcpy( dstPtr, &mkDr, @@ -171,7 +171,7 @@ namespace Ogre sizeOfIgnData ); dstPtr += MaterialSizeInGpu - numOffsetScale * sizeof( float4 ) - sizeof( mTexIndices ) - sizeOfIgnData; - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END memcpy( dstPtr, &detailsOffsetScale, numOffsetScale * sizeof( float4 ) ); dstPtr += numOffsetScale * sizeof( float4 ); @@ -179,10 +179,10 @@ namespace Ogre memcpy( dstPtr, texIndices, sizeof( texIndices ) ); dstPtr += sizeof( texIndices ); - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN memcpy( dstPtr, mIgnWeightsMinHeight, sizeOfIgnData ); dstPtr += sizeOfIgnData; - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END } //----------------------------------------------------------------------------------- void HlmsTerraDatablock::setDiffuse( const Vector3 &diffuseColour ) @@ -278,7 +278,7 @@ namespace Ogre return mBrdf; } //----------------------------------------------------------------------------------- - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN void HlmsTerraDatablock::setIgnWeightsHeights( const Vector4 &ignWeightsMinHeight, const Vector4 &ignWeightsMaxHeight ) { @@ -327,7 +327,7 @@ namespace Ogre } setTexture( texUnit, texture, refParams ); } - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END //----------------------------------------------------------------------------------- bool HlmsTerraDatablock::suggestUsingSRGB( TerraTextureTypes type ) const { diff --git a/ogre2/src/terrain/Terra/src/Hlms/PbsListener/OgreHlmsPbsTerraShadows.cpp b/ogre2/src/terrain/Terra/src/Hlms/PbsListener/OgreHlmsPbsTerraShadows.cpp index f2a13c0de..7410dfef4 100644 --- a/ogre2/src/terrain/Terra/src/Hlms/PbsListener/OgreHlmsPbsTerraShadows.cpp +++ b/ogre2/src/terrain/Terra/src/Hlms/PbsListener/OgreHlmsPbsTerraShadows.cpp @@ -163,9 +163,9 @@ namespace Ogre mTerraSamplerblock ); #if OGRE_DEBUG_MODE - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN // Barriers dealt with in Ogre2Scene::UpdateAllHeightmaps - #ifdef IGN_DISABLED + #ifdef GZ_DISABLED const CompositorTextureVec &compositorTextures = mSceneManager->getCompositorTextures(); CompositorTextureVec::const_iterator itor = compositorTextures.begin(); CompositorTextureVec::const_iterator end = compositorTextures.end(); @@ -179,7 +179,7 @@ namespace Ogre " to the compositor pass so Ogre can place the proper Barriers" && false ); } #endif - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END #endif } } diff --git a/ogre2/src/terrain/Terra/src/Terra.cpp b/ogre2/src/terrain/Terra/src/Terra.cpp index a97e0a669..09242221a 100644 --- a/ogre2/src/terrain/Terra/src/Terra.cpp +++ b/ogre2/src/terrain/Terra/src/Terra.cpp @@ -94,13 +94,13 @@ namespace Ogre m_camera( camera ), mHlmsTerraIndex( std::numeric_limits::max() ) { - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN for(int i = 0; i < 2; ++i) { mSolidColor[i] = Vector4::ZERO; mSolidColorSet[i] = false; } - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END } //----------------------------------------------------------------------------------- Terra::~Terra() @@ -530,7 +530,7 @@ namespace Ogre m_collectedCells[0].clear(); } //----------------------------------------------------------------------------------- - // IGN CUSTOMIZE BEGIN + // GZ CUSTOMIZE BEGIN void Terra::SetSolidColor(size_t _idx, const Vector4 solidColor) { assert(_idx > 0u && _idx < 3u); @@ -565,7 +565,7 @@ namespace Ogre mSolidColorSet[0] = false; mSolidColorSet[1] = false; } - // IGN CUSTOMIZE END + // GZ CUSTOMIZE END //----------------------------------------------------------------------------------- void Terra::update( const Vector3 &lightDir, float lightEpsilon ) { diff --git a/optix/include/CMakeLists.txt b/optix/include/CMakeLists.txt index 4b2bdd7bb..992a1312e 100644 --- a/optix/include/CMakeLists.txt +++ b/optix/include/CMakeLists.txt @@ -1,2 +1,2 @@ add_subdirectory(gz) -install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) +install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/optix/include/gz/rendering/optix/optix.hh.in b/optix/include/gz/rendering/optix/optix.hh.in index c4092f0cd..4ffcf3d38 100644 --- a/optix/include/gz/rendering/optix/optix.hh.in +++ b/optix/include/gz/rendering/optix/optix.hh.in @@ -1,3 +1,3 @@ // Automatically generated -#include +#include ${ign_headers} diff --git a/test/integration/all_symbols_have_version.bash.in b/test/integration/all_symbols_have_version.bash.in index f95072554..0809555fb 100644 --- a/test/integration/all_symbols_have_version.bash.in +++ b/test/integration/all_symbols_have_version.bash.in @@ -2,10 +2,10 @@ LIBPATH=$1 VERSIONED_NS=v@PROJECT_VERSION_MAJOR@ -IGN_PROJECT=@IGN_DESIGNATION@ +GZ_PROJECT=@GZ_DESIGNATION@ # Sanity check - there should be at least one symbol -NUM_SYMBOLS=$(nm $LIBPATH | grep -e "gz.*$IGN_PROJECT" | wc -l) +NUM_SYMBOLS=$(nm $LIBPATH | grep -e "gz.*$GZ_PROJECT" | wc -l) if [ $NUM_SYMBOLS -eq 0 ] then @@ -14,7 +14,7 @@ then fi # There must be no unversioned symbols -UNVERSIONED_SYMBOLS=$(nm $LIBPATH | grep -e "gz.*$IGN_PROJECT" | grep -e "$VERSIONED_NS" -v) +UNVERSIONED_SYMBOLS=$(nm $LIBPATH | grep -e "gz.*$GZ_PROJECT" | grep -e "$VERSIONED_NS" -v) UNVERSIONED_SYMBOL_CHARS=$(printf "$UNVERSIONED_SYMBOLS" | wc -m) if [ $UNVERSIONED_SYMBOL_CHARS -ne 0 ] diff --git a/tutorials.md.in b/tutorials.md.in index 450265038..1a3229941 100644 --- a/tutorials.md.in +++ b/tutorials.md.in @@ -1,8 +1,8 @@ \page tutorials Tutorials -Welcome to the Gazebo @IGN_DESIGNATION_CAP@ tutorials. These tutorials +Welcome to the Gazebo @GZ_DESIGNATION_CAP@ tutorials. These tutorials will guide you through the process of understanding the capabilities of the -Gazebo @IGN_DESIGNATION_CAP@ library and how to use the library effectively. +Gazebo @GZ_DESIGNATION_CAP@ library and how to use the library effectively. **The tutorials** diff --git a/tutorials/02_install.md b/tutorials/02_install.md index b7b55d71c..b208f1cad 100644 --- a/tutorials/02_install.md +++ b/tutorials/02_install.md @@ -31,7 +31,7 @@ wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add - Install: ``` sudo apt-get update -sudo apt-get install libignition-rendering<#>-dev +sudo apt-get install libgz-rendering<#>-dev ``` Be sure to replace `<#>` with a number value, such as `1` or `2`, depending on which version you need. @@ -57,10 +57,10 @@ sudo apt install -y \ freeglut3-dev \ libxmu-dev \ libxi-dev \ - libignition-cmake3-dev \ - libignition-math7-dev \ - libignition-common5-dev \ - libignition-plugin2-dev + libgz-cmake3-dev \ + libgz-math7-dev \ + libgz-common5-dev \ + libgz-plugin2-dev ``` ### Supported Rendering Engines @@ -151,7 +151,7 @@ conda activate gz-ws ## Binary Installation -`libignition-rendering<#>` Conda feedstock is not yet available, pending [conda-forge/staged-recipes#13551](https://github.com/conda-forge/staged-recipes/issues/13551). +`libgz-rendering<#>` Conda feedstock is not yet available, pending [conda-forge/staged-recipes#13551](https://github.com/conda-forge/staged-recipes/issues/13551). ## Source Installation @@ -166,12 +166,12 @@ This assumes you have created and activated a Conda environment while installing You can view available versions and their dependencies: ``` - conda search libignition-rendering* --channel conda-forge --info + conda search libgz-rendering* --channel conda-forge --info ``` Install dependencies, replacing `<#>` with the desired versions: ``` - conda install libignition-cmake<#> libignition-common<#> libignition-math<#> libignition-plugin<#> --channel conda-forge + conda install libgz-cmake<#> libgz-common<#> libgz-math<#> libgz-plugin<#> --channel conda-forge ``` 3. Navigate to where you would like to build the library, and clone the repository. @@ -206,7 +206,7 @@ On macOS, add OSRF packages: Install Gazebo Rendering: ``` - brew install ignition-rendering<#> + brew install gz-rendering<#> ``` Be sure to replace `<#>` with a number value, such as 5 or 6, depending on From 84580595371b3c0c6ec6b2d2d770ad34628a4522 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 11 Jul 2022 16:57:35 -0700 Subject: [PATCH 4/4] Greedy ign- migrations Signed-off-by: methylDragon --- CMakeLists.txt | 4 +-- Migration.md | 2 +- README.md | 3 +- examples/depth_camera/GlutWindow.cc | 6 ++-- examples/ogre2_demo/Main.cc | 2 +- examples/waves/media/GerstnerWaves_fs.metal | 2 +- .../waves/media/GerstnerWaves_fs_330.glsl | 2 +- include/gz/rendering/RenderEngineManager.hh | 2 +- .../gz/rendering/ogre/OgreConversions.hh | 28 +++++++++---------- .../include/gz/rendering/ogre/OgreMaterial.hh | 2 +- ogre/src/OgreHeightmap.cc | 4 +-- ogre/src/OgreMaterialSwitcher.cc | 2 +- ogre/src/OgreSelectionBuffer.cc | 2 +- .../media/materials/scripts/picker.material | 2 +- .../gz/rendering/ogre2/Ogre2Conversions.hh | 28 +++++++++---------- .../gz/rendering/ogre2/Ogre2Material.hh | 2 +- .../gz/rendering/ogre2/Ogre2RenderPass.hh | 2 +- ogre2/src/Ogre2Heightmap.cc | 4 +-- .../media/materials/scripts/picker.material | 2 +- .../gz/rendering/optix/OptixConversions.hh | 4 +-- src/RenderEngineManager.cc | 2 +- test/integration/depth_camera.cc | 4 +-- test/integration/render_pass.cc | 2 +- test/integration/segmentation_camera.cc | 2 +- test/integration/thermal_camera.cc | 6 ++-- test/integration/wide_angle_camera.cc | 2 +- tutorials/02_install.md | 6 ++-- tutorials/10_actor_animation_tutorial.md | 2 +- tutorials/15_custom_shaders_tutorial.md | 2 +- 29 files changed, 66 insertions(+), 67 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb252cd40..d8df2da14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) gz_configure_project( - REPLACE_GZ_INCLUDE_PATH gz/rendering + REPLACE_INCLUDE_PATH gz/rendering VERSION_SUFFIX pre1) #============================================================================ @@ -105,7 +105,7 @@ endif() #-------------------------------------- # Find OGRE2: first try to find OGRE2 built with PlanarReflections support and -# fallback to look for OGRE2 without it. Both seems to works for ign-rendering. +# fallback to look for OGRE2 without it. Both seems to works for gz-rendering. # See https://github.com/gazebosim/gz-rendering/issues/597 gz_find_package(GzOGRE2 VERSION 2.2.0 COMPONENTS HlmsPbs HlmsUnlit Overlay PlanarReflections diff --git a/Migration.md b/Migration.md index 516e303ff..a68fc17f6 100644 --- a/Migration.md +++ b/Migration.md @@ -74,7 +74,7 @@ release will remove the deprecated code. *Note*: Calling instead `Camera::Update` for each camera is a waste of CPU resources. + It is invalid to modify the scene between `Scene::PreRender` and `Scene::PostRender` (e.g. add/remove objects, lights, etc) + Added `Scene::SetCameraPassCountPerGpuFlush`. Setting this value to 0 forces legacy behavior which eases porting. - + Systems that rely on Graphics components like particle FXs and postprocessing are explicitly affected by Scene's Pre/PostRender. Once `Scene::PostRender` is called, the particle FXs' simulation is moved forward, as well as time values sent to postprocessing shaders. In previous ign-rendering versions each `Camera::Render` call would move the particle simulation forward, which could cause subtle bugs or inconsistencies when Cameras were rendering the same frame from different angles. Setting SetCameraPassCountPerGpuFlush to 0 will also cause these subtle bugs to reappear. + + Systems that rely on Graphics components like particle FXs and postprocessing are explicitly affected by Scene's Pre/PostRender. Once `Scene::PostRender` is called, the particle FXs' simulation is moved forward, as well as time values sent to postprocessing shaders. In previous gz-rendering versions each `Camera::Render` call would move the particle simulation forward, which could cause subtle bugs or inconsistencies when Cameras were rendering the same frame from different angles. Setting SetCameraPassCountPerGpuFlush to 0 will also cause these subtle bugs to reappear. 1. **Visual.hh** and **Node.hh** + `*UserData` methods and the `Variant` type alias have been moved from the `Visual` class to the `Node` class. diff --git a/README.md b/README.md index 73004a750..3198d04f5 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ See the [installation tutorial](https://gazebosim.org/api/rendering/5.0/installa # Usage -The Ign Rendering API can be found in the documentation. See the +The Gazebo Rendering API can be found in the documentation. See the [installation tutorial](https://gazebosim.org/api/rendering/5.0/installation.html) on how to build the documentation files using Doxygen. @@ -95,4 +95,3 @@ This library uses [Semantic Versioning](https://semver.org/). Additionally, this # License This library is licensed under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0). See also the [LICENSE](https://github.com/gazebosim/gz-rendering/blob/main/LICENSE) file. - diff --git a/examples/depth_camera/GlutWindow.cc b/examples/depth_camera/GlutWindow.cc index ee5b147c7..4c1c2b0ac 100644 --- a/examples/depth_camera/GlutWindow.cc +++ b/examples/depth_camera/GlutWindow.cc @@ -218,7 +218,7 @@ void handleMouse() } ////////////////////////////////////////////////// -// From ign-sensors/src/DepthCameraSensor.cc +// From gz-sensors/src/DepthCameraSensor.cc //! [convert depth to image] void ConvertDepthToImage( const float *_data, @@ -295,7 +295,7 @@ void keyboardCB(unsigned char _key, int, int) } ////////////////////////////////////////////////// -// See ign-sensors/src/DepthCameraSensor.cc +// See gz-sensors/src/DepthCameraSensor.cc //! [depth frame callback] void OnNewDepthFrame(const float *_scan, unsigned int _width, unsigned int _height, @@ -314,7 +314,7 @@ void initCamera(ir::CameraPtr _camera) g_camera = _camera; imgw = g_camera->ImageWidth(); imgh = g_camera->ImageHeight(); - ir::Image image = g_camera->CreateImage(); + ir::Image image = g_camera->CreateImage(); g_image = std::make_shared(image); ir::DepthCameraPtr depthCamera = std::dynamic_pointer_cast( diff --git a/examples/ogre2_demo/Main.cc b/examples/ogre2_demo/Main.cc index f14e849bb..337cf1d12 100644 --- a/examples/ogre2_demo/Main.cc +++ b/examples/ogre2_demo/Main.cc @@ -161,7 +161,7 @@ void buildScene(ScenePtr _scene) // create a backpack // backpack mesh is mirrored and requires texture addressing mode to be - // set to 'wrap', which is the default in ign-rendering-ogre2 + // set to 'wrap', which is the default in gz-rendering-ogre2 VisualPtr backpack = _scene->CreateVisual("backpack"); backpack->SetLocalPosition(2.5, -1, 0); backpack->SetLocalRotation(0, 0, -1.57); diff --git a/examples/waves/media/GerstnerWaves_fs.metal b/examples/waves/media/GerstnerWaves_fs.metal index 0aff1235b..da73b57a1 100644 --- a/examples/waves/media/GerstnerWaves_fs.metal +++ b/examples/waves/media/GerstnerWaves_fs.metal @@ -56,7 +56,7 @@ fragment float4 main_metal float3 E = normalize(inPs.eyeVec); float3 R = reflect(E, N); - // Negate z for use with the skybox texture that comes with ign-rendering + // Negate z for use with the skybox texture that comes with gz-rendering R = float3(R.x, R.y, -R.z); // uncomment this line if using other textures that are Y up diff --git a/examples/waves/media/GerstnerWaves_fs_330.glsl b/examples/waves/media/GerstnerWaves_fs_330.glsl index 9709de8a3..640380356 100644 --- a/examples/waves/media/GerstnerWaves_fs_330.glsl +++ b/examples/waves/media/GerstnerWaves_fs_330.glsl @@ -46,7 +46,7 @@ void main() vec3 E = normalize(inPs.eyeVec); vec3 R = reflect(E, N); - // negate z for use with the skybox texture that comes with ign-rendering + // negate z for use with the skybox texture that comes with gz-rendering R = vec3(R.x, R.y, -R.z); // uncomment this line if using other textures that are Y up diff --git a/include/gz/rendering/RenderEngineManager.hh b/include/gz/rendering/RenderEngineManager.hh index d12a73289..584fd9a7a 100644 --- a/include/gz/rendering/RenderEngineManager.hh +++ b/include/gz/rendering/RenderEngineManager.hh @@ -57,7 +57,7 @@ namespace gz public: unsigned int EngineCount() const; /// \brief Determine if a render-engine with the given name is avaiable. - /// It also checks the list of default engines supplied by ign-rendering. + /// It also checks the list of default engines supplied by gz-rendering. /// \param[in] _name Name of the desired render-engine /// \return True if the specified render-engine is available public: bool HasEngine(const std::string &_name) const; diff --git a/ogre/include/gz/rendering/ogre/OgreConversions.hh b/ogre/include/gz/rendering/ogre/OgreConversions.hh index d4402da60..a3f3b0067 100644 --- a/ogre/include/gz/rendering/ogre/OgreConversions.hh +++ b/ogre/include/gz/rendering/ogre/OgreConversions.hh @@ -41,45 +41,45 @@ namespace gz class GZ_RENDERING_OGRE_VISIBLE OgreConversions { /// \brief Return the equivalent ogre color - /// \param[in] _color ign-math color to convert + /// \param[in] _color gz-math color to convert /// \return Ogre color value public: static Ogre::ColourValue Convert( const math::Color &_color); - /// \brief Return the equivalent ign-math color + /// \brief Return the equivalent gz-math color /// \param[in] _color Ogre color to convert - /// \return ign-math color value + /// \return gz-math color value public: static math::Color Convert( const Ogre::ColourValue &_color); - /// \brief return Ogre Vector from ign-math Vector3 - /// \param[in] _vector ign-math vector + /// \brief return Ogre Vector from gz-math Vector3 + /// \param[in] _vector gz-math vector /// \return Ogre vector public: static Ogre::Vector3 Convert(const math::Vector3d &_vector); - /// \brief return ign-math Vector from ogre Vector3 + /// \brief return gz-math Vector from ogre Vector3 /// \param[in] _vector Ogre vector - /// \return ign-math vector + /// \return gz-math vector public: static math::Vector3d Convert(const Ogre::Vector3 &_vector); /// \brief gz-math quaternion to Ogre quaternion - /// \param[in] _quat ign-math quaternion + /// \param[in] _quat gz-math quaternion /// \return Ogre quaternion public: static Ogre::Quaternion Convert(const math::Quaterniond &_quat); - /// \brief Ogre quaternion to ign-math quaternion + /// \brief Ogre quaternion to gz-math quaternion /// \param[in] _quat Ogre quaternion - /// return ign-math quaternion + /// return gz-math quaternion public: static math::Quaterniond Convert(const Ogre::Quaternion &_quat); /// \brief gz-math angle to Ogre angle - /// \param[in] _angle ign-math angle + /// \param[in] _angle gz-math angle /// \return Ogre angle public: static Ogre::Radian Convert(const math::Angle &_angle); - /// \brief Ogre angle to ign-math angle + /// \brief Ogre angle to gz-math angle /// \param[in] _angle Ogre angle - /// return Ign-math angle + /// return gz-math angle public: static math::Angle Convert(const Ogre::Radian &_angle); /// \brief Ogre Matrix4 to Gazebo Math Matrix4d @@ -93,7 +93,7 @@ namespace gz public: static Ogre::Matrix4 Convert(const math::Matrix4d &_m); /// \brief gz-rendering PixelFormat to Ogre PixelFormat - /// \param[in] _format Ign-rendering PixelFormat + /// \param[in] _format gz-rendering PixelFormat /// return Ogre PixelFormat public: static Ogre::PixelFormat Convert(PixelFormat _format); diff --git a/ogre/include/gz/rendering/ogre/OgreMaterial.hh b/ogre/include/gz/rendering/ogre/OgreMaterial.hh index 3efd6a586..501307cd2 100644 --- a/ogre/include/gz/rendering/ogre/OgreMaterial.hh +++ b/ogre/include/gz/rendering/ogre/OgreMaterial.hh @@ -197,7 +197,7 @@ namespace gz /// \brief bind shader parameters that have changed protected: void UpdateShaderParams(); - /// \brief Transfer params from ign-rendering type to ogre type + /// \brief Transfer params from gz-rendering type to ogre type /// \param[in] _params Gazebo Rendering params /// \param[out] _ogreParams ogre type for holding params protected: void UpdateShaderParams(ConstShaderParamsPtr _params, diff --git a/ogre/src/OgreHeightmap.cc b/ogre/src/OgreHeightmap.cc index bdbfccc83..90dd3b526 100644 --- a/ogre/src/OgreHeightmap.cc +++ b/ogre/src/OgreHeightmap.cc @@ -465,7 +465,7 @@ void OgreHeightmap::Init() // \todo These parameters shouldn't be hardcoded, and instead parametrized so // that they can be made consistent across different libraries (like - // ign-physics) + // gz-physics) bool flipY = false; // sampling size along image width and height unsigned int vertSize = (this->descriptor.Data()->Width() * @@ -490,7 +490,7 @@ void OgreHeightmap::Init() { int index = (vertSize - y - 1) * vertSize + x; - // Sanity check in case we get NaNs from ign-common, this prevents a crash + // Sanity check in case we get NaNs from gz-common, this prevents a crash // in Ogre auto value = lookup[index]; if (!std::isfinite(value)) diff --git a/ogre/src/OgreMaterialSwitcher.cc b/ogre/src/OgreMaterialSwitcher.cc index dfde297fd..7adac3688 100644 --- a/ogre/src/OgreMaterialSwitcher.cc +++ b/ogre/src/OgreMaterialSwitcher.cc @@ -75,7 +75,7 @@ Ogre::Technique *OgreMaterialSwitcher::handleSchemeNotFound( { // plain opaque material Ogre::ResourcePtr res = - Ogre::MaterialManager::getSingleton().load("ign-rendering/plain_color", + Ogre::MaterialManager::getSingleton().load("gz-rendering/plain_color", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); // OGRE 1.9 changes the shared pointer definition diff --git a/ogre/src/OgreSelectionBuffer.cc b/ogre/src/OgreSelectionBuffer.cc index 61a0144a7..2b031152d 100644 --- a/ogre/src/OgreSelectionBuffer.cc +++ b/ogre/src/OgreSelectionBuffer.cc @@ -290,7 +290,7 @@ void OgreSelectionBuffer::CreateRTTOverlays() else { gzlog << "Unable to create selection buffer overlay. " - "This will not effect ignition-rendering unless you're trying to debug " + "This will not effect gz-rendering unless you're trying to debug " "the selection buffer.\n"; } } diff --git a/ogre/src/media/materials/scripts/picker.material b/ogre/src/media/materials/scripts/picker.material index 5bf67970e..d37fb85b1 100644 --- a/ogre/src/media/materials/scripts/picker.material +++ b/ogre/src/media/materials/scripts/picker.material @@ -18,7 +18,7 @@ fragment_program plaincolor_fs glsl } } -material ign-rendering/plain_color +material gz-rendering/plain_color { // Material has one technique technique diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh index a68c8823d..bfcf87199 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Conversions.hh @@ -53,45 +53,45 @@ namespace gz class GZ_RENDERING_OGRE2_VISIBLE Ogre2Conversions { /// \brief Return the equivalent ogre color - /// \param[in] _color ign-math color to convert + /// \param[in] _color gz-math color to convert /// \return Ogre color value public: static Ogre::ColourValue Convert( const math::Color &_color); - /// \brief Return the equivalent ign-math color + /// \brief Return the equivalent gz-math color /// \param[in] _color Ogre color to convert - /// \return ign-math color value + /// \return gz-math color value public: static math::Color Convert( const Ogre::ColourValue &_color); - /// \brief return Ogre Vector from ign-math Vector3 - /// \param[in] _vector ign-math vector + /// \brief return Ogre Vector from gz-math Vector3 + /// \param[in] _vector gz-math vector /// \return Ogre vector public: static Ogre::Vector3 Convert(const math::Vector3d &_vector); - /// \brief return ign-math Vector from ogre Vector3 + /// \brief return gz-math Vector from ogre Vector3 /// \param[in] _vector Ogre vector - /// \return ign-math vector + /// \return gz-math vector public: static math::Vector3d Convert(const Ogre::Vector3 &_vector); /// \brief gz-math quaternion to Ogre quaternion - /// \param[in] _quat ign-math quaternion + /// \param[in] _quat gz-math quaternion /// \return Ogre quaternion public: static Ogre::Quaternion Convert(const math::Quaterniond &_quat); - /// \brief Ogre quaternion to ign-math quaternion + /// \brief Ogre quaternion to gz-math quaternion /// \param[in] _quat Ogre quaternion - /// return ign-math quaternion + /// return gz-math quaternion public: static math::Quaterniond Convert(const Ogre::Quaternion &_quat); /// \brief gz-math angle to Ogre angle - /// \param[in] _angle ign-math angle + /// \param[in] _angle gz-math angle /// \return Ogre angle public: static Ogre::Radian Convert(const math::Angle &_angle); - /// \brief Ogre angle to ign-math angle + /// \brief Ogre angle to gz-math angle /// \param[in] _angle Ogre angle - /// return Ign-math angle + /// return gz-math angle public: static math::Angle Convert(const Ogre::Radian &_angle); /// \brief Ogre Matrix4 to Gazebo Math Matrix4d @@ -105,7 +105,7 @@ namespace gz public: static Ogre::Matrix4 Convert(const math::Matrix4d &_m); /// \brief gz-rendering PixelFormat to Ogre PixelFormat - /// \param[in] _format Ign-rendering PixelFormat + /// \param[in] _format gz-rendering PixelFormat /// return Ogre PixelFormat public: static Ogre::PixelFormatGpu Convert(PixelFormat _format); diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2Material.hh b/ogre2/include/gz/rendering/ogre2/Ogre2Material.hh index cda523366..1021ef705 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2Material.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2Material.hh @@ -288,7 +288,7 @@ namespace gz /// \brief bind shader parameters that have changed protected: void UpdateShaderParams(); - /// \brief Transfer params from ign-rendering type to ogre type + /// \brief Transfer params from gz-rendering type to ogre type /// \param[in] _params Gazebo Rendering params /// \param[out] _ogreParams ogre type for holding params protected: void UpdateShaderParams(ConstShaderParamsPtr _params, diff --git a/ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh b/ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh index 741419b28..e0126d96e 100644 --- a/ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh +++ b/ogre2/include/gz/rendering/ogre2/Ogre2RenderPass.hh @@ -38,7 +38,7 @@ namespace gz */ /// \brief Ogre2 Implementation of a render pass. /// - /// The ogre2 compositor chain in ign-rendering is set up as follows: + /// The ogre2 compositor chain in gz-rendering is set up as follows: /// * Base scene pass -> [0..N] RenderPass'es -> Final compositor pass. /// This is set up by Ogre2RenderTarget which loads the compositor workspace /// definiton from script. The base scene pass node is responsible for diff --git a/ogre2/src/Ogre2Heightmap.cc b/ogre2/src/Ogre2Heightmap.cc index 1899220bb..866e82f70 100644 --- a/ogre2/src/Ogre2Heightmap.cc +++ b/ogre2/src/Ogre2Heightmap.cc @@ -102,7 +102,7 @@ void Ogre2Heightmap::Init() // \todo These parameters shouldn't be hardcoded, and instead parametrized so // that they can be made consistent across different libraries (like - // ign-physics) + // gz-physics) bool flipY = false; // sampling size along image width and height const bool needsOgre1Compat = @@ -168,7 +168,7 @@ void Ogre2Heightmap::Init() const size_t index = y * srcWidth + x; float heightVal = lookup[index]; - // Sanity check in case we get NaNs from ign-common, this prevents a crash + // Sanity check in case we get NaNs from gz-common, this prevents a crash // in Ogre if (!std::isfinite(heightVal)) heightVal = minElevation; diff --git a/ogre2/src/media/materials/scripts/picker.material b/ogre2/src/media/materials/scripts/picker.material index 44cc1ef81..fdc4d4bc1 100644 --- a/ogre2/src/media/materials/scripts/picker.material +++ b/ogre2/src/media/materials/scripts/picker.material @@ -33,7 +33,7 @@ vertex_program plaincolor_vs unified delegate plaincolor_vs_Metal } -material ign-rendering/plain_color +material gz-rendering/plain_color { // Material has one technique technique diff --git a/optix/include/gz/rendering/optix/OptixConversions.hh b/optix/include/gz/rendering/optix/OptixConversions.hh index 0d7122292..f2e777708 100644 --- a/optix/include/gz/rendering/optix/OptixConversions.hh +++ b/optix/include/gz/rendering/optix/OptixConversions.hh @@ -44,7 +44,7 @@ namespace gz /// \return Optix color value public: static float4 ConvertColor(const math::Color &_color); - /// \brief Return the equivalent ign-math color + /// \brief Return the equivalent gz-math color /// \param[in] _color Optix color to convert /// \return Gazebo color value public: static math::Color ConvertColor(const float4 &_color); @@ -54,7 +54,7 @@ namespace gz /// \return Optix vector public: static float3 ConvertVector(const math::Vector3d &_vector); - /// \brief return ign-math Vector from optix Vector3 + /// \brief return gz-math Vector from optix Vector3 /// \param[in] _vector Optix vector /// \return Gazebo vector public: static math::Vector3d ConvertVector(const float3 &_vector); diff --git a/src/RenderEngineManager.cc b/src/RenderEngineManager.cc index c38916db7..a09672b94 100644 --- a/src/RenderEngineManager.cc +++ b/src/RenderEngineManager.cc @@ -61,7 +61,7 @@ class gz::rendering::RenderEngineManagerPrivate /// \return True if the engine is unloaded public: bool UnloadEngine(EngineIter _iter); - /// \brief Register default engines supplied by ign-rendering + /// \brief Register default engines supplied by gz-rendering public: void RegisterDefaultEngines(); /// \brief Unregister an engine using an EngineMap iterator. diff --git a/test/integration/depth_camera.cc b/test/integration/depth_camera.cc index e92523b20..f5c36e008 100644 --- a/test/integration/depth_camera.cc +++ b/test/integration/depth_camera.cc @@ -86,7 +86,7 @@ void DepthCameraTest::DepthCameraBoxes( return; } - // Setup ign-rendering with an empty scene + // Setup gz-rendering with an empty scene auto *engine = gz::rendering::engine(_renderEngine); if (!engine) { @@ -501,7 +501,7 @@ void DepthCameraTest::DepthCameraParticles( return; } - // Setup ign-rendering with an empty scene + // Setup gz-rendering with an empty scene auto *engine = gz::rendering::engine(_renderEngine); if (!engine) { diff --git a/test/integration/render_pass.cc b/test/integration/render_pass.cc index 639f7a6a0..8f9183db2 100644 --- a/test/integration/render_pass.cc +++ b/test/integration/render_pass.cc @@ -197,7 +197,7 @@ void RenderPassTest::DepthGaussianNoise(const std::string &_renderEngine) return; } - // Setup ign-rendering with an empty scene + // Setup gz-rendering with an empty scene auto *engine = gz::rendering::engine(_renderEngine); if (!engine) { diff --git a/test/integration/segmentation_camera.cc b/test/integration/segmentation_camera.cc index 16c3aff6e..3f2d6bd32 100644 --- a/test/integration/segmentation_camera.cc +++ b/test/integration/segmentation_camera.cc @@ -125,7 +125,7 @@ void SegmentationCameraTest::SegmentationCameraBoxes( return; } - // Setup ign-rendering with an empty scene + // Setup gz-rendering with an empty scene auto *engine = gz::rendering::engine(_renderEngine); if (!engine) { diff --git a/test/integration/thermal_camera.cc b/test/integration/thermal_camera.cc index 72577f29b..9d3986eec 100644 --- a/test/integration/thermal_camera.cc +++ b/test/integration/thermal_camera.cc @@ -107,7 +107,7 @@ void ThermalCameraTest::ThermalCameraBoxes( return; } - // Setup ign-rendering with an empty scene + // Setup gz-rendering with an empty scene auto *engine = gz::rendering::engine(_renderEngine); if (!engine) { @@ -288,7 +288,7 @@ void ThermalCameraTest::ThermalCameraBoxes8Bit( return; } - // Setup ign-rendering with an empty scene + // Setup gz-rendering with an empty scene auto *engine = gz::rendering::engine(_renderEngine); if (!engine) { @@ -476,7 +476,7 @@ void ThermalCameraTest::ThermalCameraParticles( return; } - // Setup ign-rendering with an empty scene + // Setup gz-rendering with an empty scene auto *engine = gz::rendering::engine(_renderEngine); if (!engine) { diff --git a/test/integration/wide_angle_camera.cc b/test/integration/wide_angle_camera.cc index 759adde32..b5a35559e 100644 --- a/test/integration/wide_angle_camera.cc +++ b/test/integration/wide_angle_camera.cc @@ -241,7 +241,7 @@ void WideAngleCameraTest::Projection(const std::string &_renderEngine) return; } - // Setup ign-rendering with an empty scene + // Setup gz-rendering with an empty scene auto *engine = gz::rendering::engine(_renderEngine); if (!engine) { diff --git a/tutorials/02_install.md b/tutorials/02_install.md index b208f1cad..411ab425f 100644 --- a/tutorials/02_install.md +++ b/tutorials/02_install.md @@ -98,14 +98,14 @@ CUDA: http://docs.nvidia.com/cuda OptiX: https://developer.nvidia.com/optix Update `LD_LIBRARY_PATH` and add an `OPTIX_INSTALL_DIR` environment variables -so that ign-rendering can find Optix, e.g. if you installed version 4.0.2 in HOME/optix: +so that gz-rendering can find Optix, e.g. if you installed version 4.0.2 in HOME/optix: ``` export LD_LIBRARY_PATH=${HOME}/optix/NVIDIA-OptiX-SDK-4.0.2-linux64/lib64:${LD_LIBRARY_PATH} export OPTIX_INSTALL_DIR=${HOME}/optix/NVIDIA-OptiX-SDK-4.0.2-linux64 ``` Note: If you encounter errors about different exception specifiers in optix math -when building Ign Rendering OptiX plugin, edit +when building Gazebo Rendering OptiX plugin, edit `[optix_install_dir]/include/optixu/optixu_math_namespace.h` and comment out the section that defines `fminf`, fmaxf, and `copysignf` (for optix sdk 4.0.2, comment out lines 167-206). @@ -223,7 +223,7 @@ which version you need. 2. Install dependencies ``` - brew install --only-dependencies ignition-rendering<#> + brew install --only-dependencies gz-rendering<#> ``` Be sure to replace `<#>` with a number value, such as 5 or 6, depending on which version you need. diff --git a/tutorials/10_actor_animation_tutorial.md b/tutorials/10_actor_animation_tutorial.md index a8728449d..43ab8a992 100644 --- a/tutorials/10_actor_animation_tutorial.md +++ b/tutorials/10_actor_animation_tutorial.md @@ -45,7 +45,7 @@ Create a `Visual` pointer with the scene manager and set the position and rotati \snippet examples/actor_animation/Main.cc create a visual for the actor -Create the mesh in ign-rendering - this loads the animations into the render engine +Create the mesh in gz-rendering - this loads the animations into the render engine \snippet examples/actor_animation/Main.cc create mesh diff --git a/tutorials/15_custom_shaders_tutorial.md b/tutorials/15_custom_shaders_tutorial.md index 817da8150..6d7e98c95 100644 --- a/tutorials/15_custom_shaders_tutorial.md +++ b/tutorials/15_custom_shaders_tutorial.md @@ -1,6 +1,6 @@ \page custom_shaders Custom shaders -This example shows how use custom shaders in ign-rendering to change the appearance of objects in the scene. It demonstrates two uses of shaders: The first is setting shaders for a camera and the other is setting shaders for an object in the scene. +This example shows how use custom shaders in gz-rendering to change the appearance of objects in the scene. It demonstrates two uses of shaders: The first is setting shaders for a camera and the other is setting shaders for an object in the scene. ## Compile and run the example