diff --git a/XaxisCluster/AdasView.qml b/XaxisCluster/AdasView.qml index d9630883e1240169b8ad9ccc70c45f4b45c766e2..953b10d0d7110bf9e266e9baa77b7e1d6e389e82 100644 --- a/XaxisCluster/AdasView.qml +++ b/XaxisCluster/AdasView.qml @@ -1,5 +1,5 @@ -import QtQuick3D 1.12 -import QtQuick3D.Materials 1.12 +import QtQuick3D 1.15 +import QtQuick3D.Materials 1.15 import QtQuick 2.12 import QtQuick.Timeline 1.0 @@ -38,10 +38,10 @@ Item { PerspectiveCamera { id: camera_u623 position.y: cameraYPosition - position.z: -800 + position.z: 800 position.x: ownCar.xPos - rotation.x: cameraRotation - rotation.z: cameraZRotation + eulerRotation.x: cameraRotation + eulerRotation.z: cameraZRotation clipNear: 1 clipFar: 1200 fieldOfView: 45 @@ -54,12 +54,10 @@ Item { id: sphere_u23107 position.y: -235 position.z: 0 - rotation.x: -90 + eulerRotation.x: -90 scale.x: 1850 scale.y: 1950 scale.z: 950 - rotationOrder: Node.XYZr - orientation: Node.RightHanded source: "qrc:/models/ADASglobe/meshes/Sphere.mesh" CustomMaterial { @@ -127,7 +125,7 @@ Item { Node { position.y: 770 - position.z: -600 + position.z: 600 MainCar { id: ownCar @@ -206,7 +204,7 @@ Item { scale.y: 3 scale.x: 12 position.y: 800 - position.z: 375 + position.z: -375 source: "#Rectangle" materials: [ DefaultMaterial { diff --git a/XaxisCluster/HighPolyVan.qml b/XaxisCluster/HighPolyVan.qml index 41b40d8a4f3a4e51eab22e25e4c84415e6c71262..2f5824b7fc6390b7726b46ab7d143a8b27ec980a 100644 --- a/XaxisCluster/HighPolyVan.qml +++ b/XaxisCluster/HighPolyVan.qml @@ -1,12 +1,10 @@ -import QtQuick3D 1.12 +import QtQuick3D 1.15 import QtQuick 2.12 Model { property alias matOpacity: defaultMaterial_material.opacity id: body_24 - rotation.y: 180 - rotationOrder: Node.XYZr - orientation: Node.RightHanded + eulerRotation.y: 180 source: "meshes/HighPolyVan.mesh" DefaultMaterial { diff --git a/XaxisCluster/LowPolySUV.qml b/XaxisCluster/LowPolySUV.qml index 3d9896b83be0fc4375103b1d8f245bb4bd865d7b..8a52a1dab311c763aedc37ef53d79a91bebc0ccd 100644 --- a/XaxisCluster/LowPolySUV.qml +++ b/XaxisCluster/LowPolySUV.qml @@ -1,11 +1,9 @@ -import QtQuick3D 1.12 +import QtQuick3D 1.15 import QtQuick 2.12 Model { id: lowpolyCar - rotation.x: -90 - rotationOrder: Node.XYZr - orientation: Node.RightHanded + eulerRotation.x: -90 source: "qrc:/meshes/LowPolySUV.mesh" DefaultMaterial { diff --git a/XaxisCluster/LowPolySUVGray.qml b/XaxisCluster/LowPolySUVGray.qml index 87aa68fa084e0d6138f381e966894c1b0a03d6b0..038c8cfc911e008474a40d237b1e520101dc9395 100644 --- a/XaxisCluster/LowPolySUVGray.qml +++ b/XaxisCluster/LowPolySUVGray.qml @@ -1,12 +1,10 @@ -import QtQuick3D 1.12 +import QtQuick3D 1.15 import QtQuick 2.12 Model { property alias matOpacity: phong1SG_material.opacity id: lowpolyCar - rotation.x: -90 - rotationOrder: Node.XYZr - orientation: Node.RightHanded + eulerRotation.x: -90 source: "qrc:/meshes/LowPolySUV.mesh" DefaultMaterial { diff --git a/XaxisCluster/MainCar.qml b/XaxisCluster/MainCar.qml index c0de2dba4d2180e5559c673987cc3df6b443d647..77fea69d7aa46a66941f1f53731cfdf6fe0c8a74 100644 --- a/XaxisCluster/MainCar.qml +++ b/XaxisCluster/MainCar.qml @@ -1,11 +1,9 @@ -import QtQuick3D 1.12 +import QtQuick3D 1.15 import QtQuick 2.12 Model { - rotation.x: -90 - rotation.y: 90 - rotationOrder: Node.XYZr - orientation: Node.RightHanded + eulerRotation.x: -90 + eulerRotation.y: 90 source: "meshes/MainCar.mesh" DefaultMaterial { diff --git a/XaxisCluster/SuvOther.qml b/XaxisCluster/SuvOther.qml index 97786c7d96f377c156b6d3c7d0a298ea1281cd8e..1b747f2ff1f4b6c7c2110684f4998ab97d0679cd 100644 --- a/XaxisCluster/SuvOther.qml +++ b/XaxisCluster/SuvOther.qml @@ -1,12 +1,10 @@ -import QtQuick3D 1.12 +import QtQuick3D 1.15 import QtQuick 2.12 Model { property alias matOpacity: suvOtherMaterial.opacity - rotation.x: -90 - rotation.y: 90 - rotationOrder: Node.XYZr - orientation: Node.RightHanded + eulerRotation.x: -90 + eulerRotation.y: 90 source: "meshes/SuvOther.mesh" DefaultMaterial { diff --git a/XaxisCluster/SuvOwn.qml b/XaxisCluster/SuvOwn.qml index 65f6f63c341e80c3266e2238b2a92ae68e827c50..f881131b61be3f080bd159665237a39a16efec2e 100644 --- a/XaxisCluster/SuvOwn.qml +++ b/XaxisCluster/SuvOwn.qml @@ -1,11 +1,9 @@ -import QtQuick3D 1.12 +import QtQuick3D 1.15 import QtQuick 2.12 Model { - rotation.x: -90 - rotation.y: 90 - rotationOrder: Node.XYZr - orientation: Node.RightHanded + eulerRotation.x: -90 + eulerRotation.y: 90 source: "meshes/SuvOwn.mesh" DefaultMaterial { diff --git a/XaxisCluster/Van.qml b/XaxisCluster/Van.qml index a4dc5067a054349d8924061b65dffe9ce91abcc6..a1dd519af612933150d418a397873f8f238d5e8e 100644 --- a/XaxisCluster/Van.qml +++ b/XaxisCluster/Van.qml @@ -1,12 +1,10 @@ -import QtQuick3D 1.12 +import QtQuick3D 1.15 import QtQuick 2.12 Model { property alias matOpacity: vanMaterial.opacity - rotation.x: -90 - rotation.y: 90 - rotationOrder: Node.XYZr - orientation: Node.RightHanded + eulerRotation.x: -90 + eulerRotation.y: 90 source: "meshes/Van.mesh" DefaultMaterial { diff --git a/XaxisCluster/XaxisCluster.pro b/XaxisCluster/XaxisCluster.pro index 99af6df178c814192b44945a8fe5d331ff715643..c2984e334ffa9f9f7709b989764b3460fb09cf9d 100644 --- a/XaxisCluster/XaxisCluster.pro +++ b/XaxisCluster/XaxisCluster.pro @@ -1,4 +1,4 @@ -QT += quick quick3d-private +QT += quick quick3d CONFIG += c++11 # The following define makes your compiler emit warnings if you use diff --git a/XaxisCluster/main.cpp b/XaxisCluster/main.cpp index 71956929fe06b0fc7ee77d0f0e8c1cfb8c6bd386..f52a03388b6bf8be3a2f2835e11b49b1bdc48bc5 100644 --- a/XaxisCluster/main.cpp +++ b/XaxisCluster/main.cpp @@ -1,6 +1,6 @@ #include <QGuiApplication> #include <QQmlApplicationEngine> -#include <QtQuick3D/private/qquick3dviewport_p.h> +#include <QtQuick3D/qquick3d.h> int main(int argc, char *argv[]) { @@ -32,7 +32,7 @@ int main(int argc, char *argv[]) QGuiApplication app(argc, argv); - QSurfaceFormat::setDefaultFormat(QQuick3DViewport::idealSurfaceFormat()); + QSurfaceFormat::setDefaultFormat(QQuick3D::idealSurfaceFormat()); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/XaxisCluster/main.qml b/XaxisCluster/main.qml index 7614455e15d52465da2c40c504c3b61c6f331826..21775918f7c0802521b80c8510d4118f6b34a869 100644 --- a/XaxisCluster/main.qml +++ b/XaxisCluster/main.qml @@ -1,6 +1,6 @@ import QtQuick 2.12 import QtQuick.Window 2.12 -import QtQuick3D.Helpers 1.12 +import QtQuick3D.Helpers 1.15 // // Note: Font sizes are adjusted for target HW (R-Car D3 with 1920x720 display). They will look @@ -394,7 +394,7 @@ Window { property: "cameraRotation" duration: 3000 from: 0.0 - to: 35 + to: -35 easing.type: Easing.InOutCubic; } // All done @@ -459,7 +459,7 @@ Window { target: adasview property: "cameraRotation" duration: 5000 - from: 35 + from: -35 to: 0 easing.type: Easing.InOutCubic; } @@ -469,7 +469,7 @@ Window { property: "cameraRotation" duration: 5000 from: 0 - to: 35 + to: -35 easing.type: Easing.InOutCubic; } }