Bump in edifice: ign-common4

.github/ci/packages.apt

@@ -2,7 +2,7 @@ freeglut3-dev
 libfreeimage-dev
 libglew-dev
 libignition-cmake2-dev
-libignition-common3-dev
+libignition-common4-dev
 libignition-math6-dev
 libignition-plugin-dev
 libogre-1.9-dev

CMakeLists.txt

@@ -34,10 +34,9 @@ set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-common
-ign_find_package(ignition-common3 REQUIRED
-  COMPONENTS graphics events
-  VERSION 3.10)
-set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR})
+ign_find_package(ignition-common4 REQUIRED
+  COMPONENTS graphics events)
+set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-plugin

bitbucket-pipelines.yml

@@ -20,12 +20,12 @@ pipelines:
             libignition-cmake2-dev
             libignition-math6-dev
             libignition-plugin-dev
-          #  libignition-common3-dev
+          #  libignition-common4-dev
           # Ignition common (uncomment if a specific branch is needed)
           - apt-get -y install
             libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev
             libfreeimage-dev libgts-dev libswscale-dev libtinyxml2-dev
-          - git clone http://github.com/ignitionrobotics/ign-common -b ign-common3
+          - git clone http://github.com/ignitionrobotics/ign-common -b main
           - cd ign-common
           - mkdir build
           - cd build

tutorials/02_install.md

@@ -60,7 +60,7 @@ sudo apt install -y \
     libxi-dev \
     libignition-cmake2-dev \
     libignition-math6-dev \
-    libignition-common3-dev \
+    libignition-common4-dev \
     libignition-plugin-dev
 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 --slave /usr/bin/gcov gcov /usr/bin/gcov-8
 ```

tutorials/03_rendering_plugins.md

@@ -11,18 +11,18 @@ It is also possible to integrate your own selected rendering engine by writing a
 
 #### How to Write Your Own Rendering Engine Plugin
 
-A mocked example of a custom rendering engine plugin can be found [here](https://github.com/ignitionrobotics/ign-rendering/tree/ign-rendering4/examples/hello_world_plugin).  In order
+A mocked example of a custom rendering engine plugin can be found [here](https://github.com/ignitionrobotics/ign-rendering/tree/main/examples/hello_world_plugin).  In order
 to make your own custom rendering engine, this example is a good starting point.  There are a few key things which will need to be done in order for a custom rendering engine to function:
 
  * A singleton Render Engine class which implements the pure virtual functions in [`ignition::rendering::BaseRenderEngine`](https://github.com/ignitionrobotics/ign-rendering/blob/main/include/ignition/rendering/base/BaseRenderEngine.hh).
  * A plugin class which implements the pure virtual functions in [`ignition::rendering::RenderEnginePlugin`](https://github.com/ignitionrobotics/ign-rendering/blob/main/include/ignition/rendering/RenderEnginePlugin.hh)
- * Registering the plugin, this line can be seen at the bottom of the [`HelloWorldPlugin`](https://github.com/ignitionrobotics/ign-rendering/tree/ign-rendering4/examples/hello_world_plugin/HelloWorldPlugin.cc) example
+ * Registering the plugin, this line can be seen at the bottom of the [`HelloWorldPlugin`](https://github.com/ignitionrobotics/ign-rendering/tree/main/examples/hello_world_plugin/HelloWorldPlugin.cc) example
 
-Finally, for your custom rendering engine to actually have any functionality and at minimum, display something in a window, you will need to implement your own `Scene` and `Camera` classes, which inherit from and implement the pure virtual functions of [`ignition::rendering::Scene`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering4/include/ignition/rendering/Scene.hh) and  [`ignition::rendering::Camera`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering4/include/ignition/rendering/Camera.hh), respectively.  The mocked example simply returns `nullptr` for its `CreateSceneImpl(...)` function, so it may be useful to look at the current `Scene` implementations for the other rendering engines within `ignition::rendering` such as [`OGRE`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering4/ogre/src/OgreScene.cc) or [`OGRE2`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering4/ogre2/src/Ogre2Scene.cc).  Likewise, it may be helpful to look at the `Camera` implementations from [`OGRE`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering4/ogre/src/OgreCamera.cc) and [`OGRE2`](https://github.com/ignitionrobotics/ign-rendering/blob/ign-rendering4/ogre2/src/Ogre2Camera.cc)
+Finally, for your custom rendering engine to actually have any functionality and at minimum, display something in a window, you will need to implement your own `Scene` and `Camera` classes, which inherit from and implement the pure virtual functions of [`ignition::rendering::Scene`](https://github.com/ignitionrobotics/ign-rendering/blob/main/include/ignition/rendering/Scene.hh) and  [`ignition::rendering::Camera`](https://github.com/ignitionrobotics/ign-rendering/blob/main/include/ignition/rendering/Camera.hh), respectively.  The mocked example simply returns `nullptr` for its `CreateSceneImpl(...)` function, so it may be useful to look at the current `Scene` implementations for the other rendering engines within `ignition::rendering` such as [`OGRE`](https://github.com/ignitionrobotics/ign-rendering/blob/main/ogre/src/OgreScene.cc) or [`OGRE2`](https://github.com/ignitionrobotics/ign-rendering/blob/main/ogre2/src/Ogre2Scene.cc).  Likewise, it may be helpful to look at the `Camera` implementations from [`OGRE`](https://github.com/ignitionrobotics/ign-rendering/blob/main/ogre/src/OgreCamera.cc) and [`OGRE2`](https://github.com/ignitionrobotics/ign-rendering/blob/main/ogre2/src/Ogre2Camera.cc)
 
 #### Building and Running Your Rendering Engine Plugin with Ignition Gazebo
 
-Once you have your own rendering plugin written, you can build it similarly to how the example is built.  It may be helpful to look at the [`CMakeLists.txt`](https://github.com/ignitionrobotics/ign-rendering/tree/ign-rendering4/examples/hello_world_plugin) from the example as it contains the boilerplate code needed to get a custom rendering engine plugin built.
+Once you have your own rendering plugin written, you can build it similarly to how the example is built.  It may be helpful to look at the [`CMakeLists.txt`](https://github.com/ignitionrobotics/ign-rendering/tree/main/examples/hello_world_plugin) from the example as it contains the boilerplate code needed to get a custom rendering engine plugin built.
 
 After you have your plugin built, you will need to set the `IGN_GAZEBO_RENDER_ENGINE_PATH` environment variable to the path in which your built shared library resides.  Note that you will need to do this for every command line instance unless you add the line to your startup shell script (`.bashrc`, `.zshrc`, etc.).