Merge branch 'master' into alpha-kung

2019-03-03 00:27:35 +09:00
parent 53d5431da7 38a2765b10
commit 3792488372
53 changed files with 978 additions and 764 deletions
@@ -60,7 +60,7 @@ private:
    OverlayController* parent;
    QQuickWindow* widget;

-    int m_trackingUniverse = ( int ) vr::TrackingUniverseStanding;
+    int m_trackingUniverse = static_cast<int>( vr::TrackingUniverseStanding );
    float m_offsetX = 0.0f;
    float m_offsetY = 0.0f;
    float m_offsetZ = 0.0f;