From c512cfae6f0c67e502cc16b2578d2565c087af1b Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@qt.io>
Date: Thu, 19 Mar 2020 11:01:56 +0100
Subject: [PATCH] Modernize the manual test version of principledmaterials
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The compressed texture based version was not following the recent API
changes. Do it now.

Change-Id: I630a2e16ec3742eb89d62138e3d7b9b7a5c05e44
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
---
 tests/manual/principledmaterial/main.cpp |  4 ++--
 tests/manual/principledmaterial/main.qml | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/manual/principledmaterial/main.cpp b/tests/manual/principledmaterial/main.cpp
index 8e886b611..923c0395a 100644
--- a/tests/manual/principledmaterial/main.cpp
+++ b/tests/manual/principledmaterial/main.cpp
@@ -52,7 +52,7 @@
 #include <QQmlApplicationEngine>
 
 #include <QtGui>
-#include <QtQuick3D/private/qquick3dviewport_p.h>
+#include <QtQuick3D/qquick3d.h>
 
 int main(int argc, char *argv[])
 {
@@ -60,7 +60,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/tests/manual/principledmaterial/main.qml b/tests/manual/principledmaterial/main.qml
index 308c29dad..96a57effe 100644
--- a/tests/manual/principledmaterial/main.qml
+++ b/tests/manual/principledmaterial/main.qml
@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.14
-import QtQuick.Window 2.14
+import QtQuick 2.15
+import QtQuick.Window 2.15
 import QtQuick3D 1.15
 
 Window {
@@ -58,6 +58,7 @@ Window {
     height: 720
     visible: true
     title: "Principled Materials Example"
+    color: "#848895"
 
     MaterialControl {
         id: materialCtrl
@@ -73,23 +74,22 @@ Window {
         //! [rotating light]
         // Rotate the light direction
         DirectionalLight {
-            rotation: Qt.vector3d(0, 100, 0)
+            eulerRotation.y: -100
             brightness: 100
-            SequentialAnimation on rotation {
+            SequentialAnimation on eulerRotation.y {
                 loops: Animation.Infinite
                 PropertyAnimation {
                     duration: 5000
-                    to: Qt.vector3d(0, 360, 0)
-                    from: Qt.vector3d(0, 0, 0)
+                    to: 360
+                    from: 0
                 }
             }
-        }
-        //! [rotating light]
+        }        //! [rotating light]
 
         //! [environment]
         environment: SceneEnvironment {
             probeBrightness: 250
-            clearColor: "#848895"
+            clearColor: window.color
 
             backgroundMode: SceneEnvironment.Color
             lightProbe: Texture {
@@ -100,7 +100,7 @@ Window {
 
         PerspectiveCamera {
             id: camera
-            position: Qt.vector3d(0, 0, -600)
+            position: Qt.vector3d(0, 0, 600)
         }
 
         //! [basic principled]
@@ -150,12 +150,12 @@ Window {
             ]
             //! [textured principled]
 
-            SequentialAnimation on rotation {
+            SequentialAnimation on eulerRotation {
                 loops: Animation.Infinite
                 PropertyAnimation {
                     duration: 5000
-                    to: Qt.vector3d(360, 360, 360)
                     from: Qt.vector3d(0, 0, 0)
+                    to: Qt.vector3d(360, 360, 360)
                 }
             }
         }
-- 
GitLab