diff options
| author | Jari Karppinen <jari.karppinen@qt.io> | 2019-06-27 08:04:50 +0300 |
|---|---|---|
| committer | Jari Karppinen <jari.karppinen@qt.io> | 2019-06-27 08:05:19 +0300 |
| commit | 427bf6fac383f066a1378679a88546b16f156c7e (patch) | |
| tree | b4159550ca38aa0fad1bf5f47ed12911e3be91fa /examples/studio3d/qmldatainput/qml/qmldatainput/main.qml | |
| parent | 1293f9cc04861e12f360af3c0c7ba94f0efc8dbb (diff) | |
Update qmldatainput example
Editor shows mismatched data type warning for colorInput, since colors are
Vector4 instead of Vector3 now. Suppress the warning by correcting the
data input type in .uia file. Furthermore the QML code is updated to use
Vector4 and PropertyAnimation instead of Vector3dAnimation to pass in the
values from QML.
Change-Id: I0e0370dab139a5ebea00404035774c99e3d8ea82
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'examples/studio3d/qmldatainput/qml/qmldatainput/main.qml')
| -rw-r--r-- | examples/studio3d/qmldatainput/qml/qmldatainput/main.qml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/studio3d/qmldatainput/qml/qmldatainput/main.qml b/examples/studio3d/qmldatainput/qml/qmldatainput/main.qml index ab50796..8267b01 100644 --- a/examples/studio3d/qmldatainput/qml/qmldatainput/main.qml +++ b/examples/studio3d/qmldatainput/qml/qmldatainput/main.qml @@ -107,7 +107,7 @@ Item { width: 1280 property real inputNumber: 0 - property vector3d inputColorVec3: Qt.vector3d(0, 0, 0) + property vector4d inputColorVec4: Qt.vector4d(0, 0, 0, 1) property vector3d inputCamRotVec3: Qt.vector3d(0, 0, 0) property vector3d inputScaleVec3: Qt.vector3d(0, 0, 0) property string inputString: "" @@ -136,12 +136,12 @@ Item { loops: Animation.Infinite running: true } - Vector3dAnimation { + PropertyAnimation { target: studio3D - property: "inputColorVec3" + property: "inputColorVec4" duration: 6000 - from: Qt.vector3d(0.1, 0.1, 0.3) - to: Qt.vector3d(1.0, 0.5, 1.0) + from: Qt.vector4d(0.1, 0.1, 0.3, 1.0) + to: Qt.vector4d(1.0, 0.5, 1.0, 1.0) loops: Animation.Infinite running: true } @@ -190,7 +190,7 @@ Item { } DataInput { name: "colorInput" - value: studio3D.inputColorVec3 + value: studio3D.inputColorVec4 } DataInput { name: "cameraRotInput" |