diff options
author | Pasi Keränen <pasi.keranen@digia.com> | 2015-05-27 09:52:42 +0300 |
---|---|---|
committer | Pasi Keränen <pasi.keranen@digia.com> | 2015-05-27 07:29:50 +0000 |
commit | 9634dc62651202c2588ff7f531883bbde0ce8992 (patch) | |
tree | 84d98690204765a20637f8901e937d95bdb3cee0 /examples | |
parent | 7bb25fb70636cf40b783dfeb04fc94441ff665d2 (diff) |
Renaming properties in OneQt example.
Change-Id: I4bc2add33b39ea562d0ecbccbc4badb026037a51
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/canvas3d/canvas3d/threejs/oneqt/ImageCube.qml | 122 | ||||
-rw-r--r-- | examples/canvas3d/canvas3d/threejs/oneqt/imagecube.js | 12 | ||||
-rw-r--r-- | examples/canvas3d/canvas3d/threejs/oneqt/oneqt.qml | 134 |
3 files changed, 134 insertions, 134 deletions
diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/ImageCube.qml b/examples/canvas3d/canvas3d/threejs/oneqt/ImageCube.qml index 267996e..cc2ab0b 100644 --- a/examples/canvas3d/canvas3d/threejs/oneqt/ImageCube.qml +++ b/examples/canvas3d/canvas3d/threejs/oneqt/ImageCube.qml @@ -47,52 +47,52 @@ Canvas3D { property real xRotation: 0 property real yRotation: 0 property real zRotation: 0 - property string page1: "" + property string image1: "" //! [0] - property string page2: "" - property string page3: "" - property string page4: "" - property string page5: "" - property string page6: "" - state: "page6" + property string image2: "" + property string image3: "" + property string image4: "" + property string image5: "" + property string image6: "" + state: "image6" onBackgroundColorChanged: { GLCode.setBackgroundColor(cube.backgroundColor); } //! [1] states: [ State { - name: "page1" + name: "image1" PropertyChanges { target: cube; xRotation: 0; } PropertyChanges { target: cube; yRotation: 180 * 1.5 + angleOffset; } PropertyChanges { target: cube; zRotation: 0 } }, //! [1] State { - name: "page2" + name: "image2" PropertyChanges { target: cube; xRotation: 0; } PropertyChanges { target: cube; yRotation: 180 * 1.0 + angleOffset; } PropertyChanges { target: cube; zRotation: 0 } }, State { - name: "page3" + name: "image3" PropertyChanges { target: cube; xRotation: 0; } PropertyChanges { target: cube; yRotation: 180 * 0.5 + angleOffset; } PropertyChanges { target: cube; zRotation: 0 } }, State { - name: "page4" + name: "image4" PropertyChanges { target: cube; xRotation: 0; } PropertyChanges { target: cube; yRotation: 0 + angleOffset; } PropertyChanges { target: cube; zRotation: 0 } }, State { - name: "page5" + name: "image5" PropertyChanges { target: cube; xRotation: 180 / 2.0; } PropertyChanges { target: cube; yRotation: 0; } PropertyChanges { target: cube; zRotation: -angleOffset; } }, State { - name: "page6" + name: "image6" PropertyChanges { target: cube; xRotation: -180 / 2.0; } PropertyChanges { target: cube; yRotation: 0; } PropertyChanges { target: cube; zRotation: angleOffset; } @@ -134,63 +134,63 @@ Canvas3D { anchors.fill: parent onSwipeRight: { - if (cube.state === "page1") - cube.state = "page4"; - else if (cube.state == "page2") - cube.state = "page1"; - else if (cube.state == "page3") - cube.state = "page2"; - else if (cube.state == "page4") - cube.state = "page3"; - else if (cube.state == "page5") - cube.state = "page3"; - else if (cube.state == "page6") - cube.state = "page3"; + if (cube.state === "image1") + cube.state = "image4"; + else if (cube.state == "image2") + cube.state = "image1"; + else if (cube.state == "image3") + cube.state = "image2"; + else if (cube.state == "image4") + cube.state = "image3"; + else if (cube.state == "image5") + cube.state = "image3"; + else if (cube.state == "image6") + cube.state = "image3"; } onSwipeLeft: { - if (cube.state === "page1") - cube.state = "page2"; - else if (cube.state == "page2") - cube.state = "page3"; - else if (cube.state == "page3") - cube.state = "page4"; - else if (cube.state == "page4") - cube.state = "page1"; - else if (cube.state == "page5") - cube.state = "page1"; - else if (cube.state == "page6") - cube.state = "page1"; + if (cube.state === "image1") + cube.state = "image2"; + else if (cube.state == "image2") + cube.state = "image3"; + else if (cube.state == "image3") + cube.state = "image4"; + else if (cube.state == "image4") + cube.state = "image1"; + else if (cube.state == "image5") + cube.state = "image1"; + else if (cube.state == "image6") + cube.state = "image1"; } onSwipeUp: { - if (cube.state === "page1") - cube.state = "page6"; - else if (cube.state == "page2") - cube.state = "page6"; - else if (cube.state == "page3") - cube.state = "page6"; - else if (cube.state == "page4") - cube.state = "page6"; - else if (cube.state == "page5") - cube.state = "page4"; - else if (cube.state == "page6") - cube.state = "page2"; + if (cube.state === "image1") + cube.state = "image6"; + else if (cube.state == "image2") + cube.state = "image6"; + else if (cube.state == "image3") + cube.state = "image6"; + else if (cube.state == "image4") + cube.state = "image6"; + else if (cube.state == "image5") + cube.state = "image4"; + else if (cube.state == "image6") + cube.state = "image2"; } onSwipeDown: { - if (cube.state === "page1") - cube.state = "page5"; - else if (cube.state == "page2") - cube.state = "page5"; - else if (cube.state == "page3") - cube.state = "page5"; - else if (cube.state == "page4") - cube.state = "page5"; - else if (cube.state == "page5") - cube.state = "page2"; - else if (cube.state == "page6") - cube.state = "page4"; + if (cube.state === "image1") + cube.state = "image5"; + else if (cube.state == "image2") + cube.state = "image5"; + else if (cube.state == "image3") + cube.state = "image5"; + else if (cube.state == "image4") + cube.state = "image5"; + else if (cube.state == "image5") + cube.state = "image2"; + else if (cube.state == "image6") + cube.state = "image4"; } } diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/imagecube.js b/examples/canvas3d/canvas3d/threejs/oneqt/imagecube.js index 47fd7ec..8d482f2 100644 --- a/examples/canvas3d/canvas3d/threejs/oneqt/imagecube.js +++ b/examples/canvas3d/canvas3d/threejs/oneqt/imagecube.js @@ -51,12 +51,12 @@ function initializeGL(canvas) { //! [1] // Load textures - var textureCase1 = THREE.ImageUtils.loadTexture(canvas.page1); - var textureCase2 = THREE.ImageUtils.loadTexture(canvas.page2); - var textureCase3 = THREE.ImageUtils.loadTexture(canvas.page3); - var textureCase4 = THREE.ImageUtils.loadTexture(canvas.page4); - var textureCase5 = THREE.ImageUtils.loadTexture(canvas.page5); - var textureCase6 = THREE.ImageUtils.loadTexture(canvas.page6); + var textureCase1 = THREE.ImageUtils.loadTexture(canvas.image1); + var textureCase2 = THREE.ImageUtils.loadTexture(canvas.image2); + var textureCase3 = THREE.ImageUtils.loadTexture(canvas.image3); + var textureCase4 = THREE.ImageUtils.loadTexture(canvas.image4); + var textureCase5 = THREE.ImageUtils.loadTexture(canvas.image5); + var textureCase6 = THREE.ImageUtils.loadTexture(canvas.image6); // Materials var materials = []; diff --git a/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.qml b/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.qml index 0c8f57d..20e30f5 100644 --- a/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.qml +++ b/examples/canvas3d/canvas3d/threejs/oneqt/oneqt.qml @@ -47,12 +47,12 @@ Rectangle { color: "#FCFCFC" Keys.onPressed: { - if (event.key === Qt.Key_1) imageCube.state = 'page1'; - else if (event.key === Qt.Key_2) imageCube.state = 'page2'; - else if (event.key === Qt.Key_3) imageCube.state = 'page3'; - else if (event.key === Qt.Key_4) imageCube.state = 'page4'; - else if (event.key === Qt.Key_5) imageCube.state = 'page5'; - else if (event.key === Qt.Key_6) imageCube.state = 'page6'; + if (event.key === Qt.Key_1) imageCube.state = 'image1'; + else if (event.key === Qt.Key_2) imageCube.state = 'image2'; + else if (event.key === Qt.Key_3) imageCube.state = 'image3'; + else if (event.key === Qt.Key_4) imageCube.state = 'image4'; + else if (event.key === Qt.Key_5) imageCube.state = 'image5'; + else if (event.key === Qt.Key_6) imageCube.state = 'image6'; } //! [0] @@ -64,93 +64,93 @@ Rectangle { anchors.right: parent.right backgroundColor: "#FCFCFC" - state: "page6" - page1: "qrc:/textures/devices.png" - page2: "qrc:/textures/iot.png" - page3: "qrc:/textures/embedded.png" - page4: "qrc:/textures/dataviz.jpg" - page5: "qrc:/textures/multiscreen.png" - page6: "qrc:/textures/puzzle-pieces.png" + state: "image6" + image1: "qrc:/textures/devices.png" + image2: "qrc:/textures/iot.png" + image3: "qrc:/textures/embedded.png" + image4: "qrc:/textures/dataviz.jpg" + image5: "qrc:/textures/multiscreen.png" + image6: "qrc:/textures/puzzle-pieces.png" onStateChanged: { - if (imageCube.state == "page1") { + if (imageCube.state == "image1") { page1Button.selected = true; page2Button.selected = false; page3Button.selected = false; page4Button.selected = false; page5Button.selected = false; page6Button.selected = false; - page1.visible = true; - page2.visible = false; - page4.visible = false; - page3.visible = false; - page5.visible = false; - page6.visible = false; - } else if (imageCube.state == "page2") { + info1.visible = true; + info2.visible = false; + info4.visible = false; + info3.visible = false; + info5.visible = false; + info6.visible = false; + } else if (imageCube.state == "image2") { page1Button.selected = false; page2Button.selected = true; page3Button.selected = false; page4Button.selected = false; page5Button.selected = false; page6Button.selected = false; - page1.visible = false; - page2.visible = true; - page4.visible = false; - page3.visible = false; - page5.visible = false; - page6.visible = false; - } else if (imageCube.state == "page3") { + info1.visible = false; + info2.visible = true; + info4.visible = false; + info3.visible = false; + info5.visible = false; + info6.visible = false; + } else if (imageCube.state == "image3") { page1Button.selected = false; page2Button.selected = false; page3Button.selected = true; page4Button.selected = false; page5Button.selected = false; page6Button.selected = false; - page1.visible = false; - page2.visible = false; - page3.visible = true; - page4.visible = false; - page5.visible = false; - page6.visible = false; - } else if (imageCube.state == "page4") { + info1.visible = false; + info2.visible = false; + info3.visible = true; + info4.visible = false; + info5.visible = false; + info6.visible = false; + } else if (imageCube.state == "image4") { page1Button.selected = false; page2Button.selected = false; page3Button.selected = false; page4Button.selected = true; page5Button.selected = false; page6Button.selected = false; - page1.visible = false; - page2.visible = false; - page3.visible = false; - page4.visible = true; - page5.visible = false; - page6.visible = false; - } else if (imageCube.state == "page5") { + info1.visible = false; + info2.visible = false; + info3.visible = false; + info4.visible = true; + info5.visible = false; + info6.visible = false; + } else if (imageCube.state == "image5") { page1Button.selected = false; page2Button.selected = false; page3Button.selected = false; page4Button.selected = false; page5Button.selected = true; page6Button.selected = false; - page1.visible = false; - page2.visible = false; - page3.visible = false; - page4.visible = false; - page5.visible = true; - page6.visible = false; - } else if (imageCube.state == "page6") { + info1.visible = false; + info2.visible = false; + info3.visible = false; + info4.visible = false; + info5.visible = true; + info6.visible = false; + } else if (imageCube.state == "image6") { page1Button.selected = false; page2Button.selected = false; page3Button.selected = false; page4Button.selected = false; page5Button.selected = false; page6Button.selected = true; - page1.visible = false; - page2.visible = false; - page3.visible = false; - page4.visible = false; - page5.visible = false; - page6.visible = true; + info1.visible = false; + info2.visible = false; + info3.visible = false; + info4.visible = false; + info5.visible = false; + info6.visible = true; } } } @@ -180,7 +180,7 @@ Rectangle { id: page1Button text: "Device Creation" stateTarget: imageCube - stateSelect: "page1" + stateSelect: "image1" Layout.minimumHeight:52 Layout.preferredHeight: 52 Layout.maximumHeight: 52 @@ -190,7 +190,7 @@ Rectangle { id: page2Button text: "IoT" stateTarget: imageCube - stateSelect: "page2" + stateSelect: "image2" Layout.minimumHeight:52 Layout.preferredHeight: 52 Layout.maximumHeight: 52 @@ -200,7 +200,7 @@ Rectangle { id: page3Button text: "Rapid Development" stateTarget: imageCube - stateSelect: "page3" + stateSelect: "image3" Layout.minimumHeight:52 Layout.preferredHeight: 52 Layout.maximumHeight: 52 @@ -210,7 +210,7 @@ Rectangle { id: page4Button text: "Modern UX" stateTarget: imageCube - stateSelect: "page4" + stateSelect: "image4" Layout.minimumHeight:52 Layout.preferredHeight: 52 Layout.maximumHeight: 52 @@ -220,7 +220,7 @@ Rectangle { id: page5Button text: "Cross Platform" stateTarget: imageCube - stateSelect: "page5" + stateSelect: "image5" Layout.minimumHeight:52 Layout.preferredHeight: 52 Layout.maximumHeight: 52 @@ -230,7 +230,7 @@ Rectangle { id: page6Button text: "In the Box" stateTarget: imageCube - stateSelect: "page6" + stateSelect: "image6" Layout.minimumHeight:52 Layout.preferredHeight: 52 Layout.maximumHeight: 52 @@ -247,7 +247,7 @@ Rectangle { } InfoSheet { - id: page1 + id: info1 width: parent.width anchors.top: separator.bottom anchors.left: parent.left @@ -262,7 +262,7 @@ Rectangle { } InfoSheet { - id: page2 + id: info2 visible: false width: parent.width anchors.top: separator.bottom @@ -279,7 +279,7 @@ Rectangle { } InfoSheet { - id: page3 + id: info3 visible: false width: parent.width anchors.top: separator.bottom @@ -296,7 +296,7 @@ Rectangle { } InfoSheet { - id: page4 + id: info4 visible: false width: parent.width anchors.top: separator.bottom @@ -312,7 +312,7 @@ Rectangle { } InfoSheet { - id: page5 + id: info5 visible: false width: parent.width anchors.top: separator.bottom @@ -329,7 +329,7 @@ Rectangle { } InfoSheet { - id: page6 + id: info6 visible: false width: parent.width anchors.top: separator.bottom |