Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5 -> 6 #406

Merged
merged 7 commits into from
Sep 16, 2021
Merged

5 -> 6 #406

merged 7 commits into from
Sep 16, 2021

Commits on Sep 13, 2021

  1. [macOS] add a QML version of simple_demo (#373)

    * [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]>
    srmainwaring and iche033 authored Sep 13, 2021
    Configuration menu
    Copy the full SHA
    74f88b7 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2021

  1. Configuration menu
    Copy the full SHA
    49e7a06 View commit details
    Browse the repository at this point in the history
  2. Update simple_demo_qml coding style (#404)

    * 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]>
    iche033 authored Sep 14, 2021
    Configuration menu
    Copy the full SHA
    f83dc91 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2021

  1. Configuration menu
    Copy the full SHA
    17b1471 View commit details
    Browse the repository at this point in the history
  2. fix example version

    Signed-off-by: Ian Chen <[email protected]>
    iche033 committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    1d63b26 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3e5eddd View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3f3aa81 View commit details
    Browse the repository at this point in the history