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.

Sign up for GitHub

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

Jump to bottom

[macOS] add a QML version of simple_demo #373

Merged
merged 15 commits into from
Sep 13, 2021
Merged

[macOS] add a QML version of simple_demo #373

merged 15 commits into from
Sep 13, 2021

Commits on Sep 3, 2021

  1. [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]>
    @srmainwaring
    srmainwaring committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    81b12c3 View commit details
    Browse the repository at this point in the history

  2. [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]>
    @srmainwaring
    srmainwaring committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    8db598c View commit details
    Browse the repository at this point in the history

  3. [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]>
    @srmainwaring
    srmainwaring committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    ff528f2 View commit details
    Browse the repository at this point in the history

  4. [macOS] apply style guide to function and member variable names 

    Signed-off-by: Rhys Mainwaring <[email protected]>
    @srmainwaring
    srmainwaring committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    53fd60b View commit details
    Browse the repository at this point in the history

  5. [macOS] apply style guide to function parameters 

    Signed-off-by: Rhys Mainwaring <[email protected]>
    @srmainwaring
    srmainwaring committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    a75ac71 View commit details
    Browse the repository at this point in the history

  6. [macOS] cleanup comments and remove dead code 

    Signed-off-by: Rhys Mainwaring <[email protected]>
    @srmainwaring
    srmainwaring committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    bef0407 View commit details
    Browse the repository at this point in the history

  7. [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]>
    @srmainwaring
    srmainwaring committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    0009399 View commit details
    Browse the repository at this point in the history

  8. Apply suggestions from code review 

    Co-authored-by: Alejandro Hernández Cordero <[email protected]>

Signed-off-by: Rhys Mainwaring <[email protected]>
    @srmainwaring
    srmainwaring committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    aebda17 View commit details
    Browse the repository at this point in the history

  9. [macOS] apply code style guide formatting 

    Signed-off-by: Rhys Mainwaring <[email protected]>
    @srmainwaring
    srmainwaring committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    e1b10a4 View commit details
    Browse the repository at this point in the history

  10. [macOS] document the IgnitionRenderer class. 

    Signed-off-by: Rhys Mainwaring <[email protected]>
    @srmainwaring
    srmainwaring committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    40e34b4 View commit details
    Browse the repository at this point in the history

  11. [macOS] update the message on the QML overlay 

    Signed-off-by: Rhys Mainwaring <[email protected]>
    @srmainwaring
    srmainwaring committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    ec4648b View commit details
    Browse the repository at this point in the history

  12. [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]>
    @srmainwaring
    srmainwaring committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    34cb0ce View commit details
    Browse the repository at this point in the history

  13. [macOS] rollback changes to examples 

    - Roll back changes to other examples, keeping only simple_demo_qml.

Signed-off-by: Rhys Mainwaring <[email protected]>
    @srmainwaring
    srmainwaring committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    aef2d15 View commit details
    Browse the repository at this point in the history

  14. [macOS] remove additional plugin path for macOS 

    - Remove additional plugin path for macOS.

Signed-off-by: Rhys Mainwaring <[email protected]>
    @srmainwaring
    srmainwaring committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    96d2444 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2021

  1. Merge branch 'ign-rendering5' into feature/ir5-ogre2-1-macos

    @iche033
    iche033 authored Sep 11, 2021
    Configuration menu
    Copy the full SHA
    aacc5ec View commit details
    Browse the repository at this point in the history