5 -> 6 #406
Merged
5 -> 6 #406
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* [macOS] configure examples for use with ogre2 - Use ogre2 instead of ogre in examples that do not accept a command line argument - Enable logger to display additional Ogre information for debugging Signed-off-by: Rhys Mainwaring <[email protected]> * [macOS] configure examples for use with ogre2 and update plugin path - Prevent the Ogre2RenderEngine searching in /usr/local/opt/ogre2.1/lib/OGRE-2.1 for render system plugins Signed-off-by: Rhys Mainwaring <[email protected]> * [macOS] add a QML version of the simple_demo - This is a QML version of the simple_demo. It uses the same approach to rendering to QML as used in ignition-gui Scene3D. - For macOS there is an upstream dependency on a pending PR in Ogre2-1 for support of the `currentGLContext` flag. - The core application render thread is based on the Qt Toolkit example: - https://code.qt.io/cgit/qt/qtdeclarative.git/tree/examples/quick/scenegraph/textureinthread?h=5.15 Signed-off-by: Rhys Mainwaring <[email protected]> * [macOS] apply style guide to function and member variable names Signed-off-by: Rhys Mainwaring <[email protected]> * [macOS] apply style guide to function parameters Signed-off-by: Rhys Mainwaring <[email protected]> * [macOS] cleanup comments and remove dead code Signed-off-by: Rhys Mainwaring <[email protected]> * [macOS] incorporate review feedback in simple_demo_qml - Remove unused section from CMakeLists.txt - Move using namespace declarations to translation unit scope - Remove addition separator line - Use ignmsg instead of std::cout in ThreadRenderer - Roll back changes to example text_geom Signed-off-by: Rhys Mainwaring <[email protected]> * Apply suggestions from code review Co-authored-by: Alejandro Hernández Cordero <[email protected]> Signed-off-by: Rhys Mainwaring <[email protected]> * [macOS] apply code style guide formatting Signed-off-by: Rhys Mainwaring <[email protected]> * [macOS] document the IgnitionRenderer class. Signed-off-by: Rhys Mainwaring <[email protected]> * [macOS] update the message on the QML overlay Signed-off-by: Rhys Mainwaring <[email protected]> * [macOS] modify simple_demo_qml for qt5.12 - Remove QML_NAMED_ELEMENT from ThreadRenderer - Rename Renderer in QML to ThreadRenderer Signed-off-by: Rhys Mainwaring <[email protected]> * [macOS] rollback changes to examples - Roll back changes to other examples, keeping only simple_demo_qml. Signed-off-by: Rhys Mainwaring <[email protected]> * [macOS] remove additional plugin path for macOS - Remove additional plugin path for macOS. Signed-off-by: Rhys Mainwaring <[email protected]> Co-authored-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
* style changes Signed-off-by: Ian Chen <[email protected]> * rename files Signed-off-by: Ian Chen <[email protected]> * indentation Signed-off-by: Ian Chen <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #406 +/- ##
=======================================
Coverage 58.53% 58.54%
=======================================
Files 174 174
Lines 17345 17345
=======================================
+ Hits 10153 10154 +1
+ Misses 7192 7191 -1
Continue to review full report at Codecov.
|
ahcorde
approved these changes
Sep 15, 2021
chapulina
suggested changes
Sep 15, 2021
Signed-off-by: Ian Chen <[email protected]>
chapulina
approved these changes
Sep 15, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
➡️ Forward port
Port ign-rendering5 to main
Branch comparison: main...ign-rendering5
homebrew builds are failing after osrf/homebrew-simulation#1574. Testing to see if the Ogre2RenderEngine.cc changes would help fix the build.
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)