Differential D17945 Diff 52359 src/activities/planegame/Planegame.qml

Changeset View

Standalone View

View Options

src/activities/planegame/Planegame.qml

Show All 23 Lines
24 24​
25import "../../core" 25​import "../../core"
26import "planegame.js" as Activity 26​import "planegame.js" as Activity
27 27​
28ActivityBase { 28​ActivityBase {
29 id: activity 29​ id: activity
30 focus: true 30​ focus: true
31 31​
32 onStart: { focus = true; } 32​ onStart: { focus = true; }
jjazeixUnsubmitted
Not Done

why this change?

jjazeix: why this change?
33 onStop: { } 33​ onStop: { }
34 34​
35 Keys.onPressed: Activity.processPressedKey(event) 35​ Keys.onPressed: Activity.processPressedKey(event)
36 Keys.onReleased: Activity.processReleasedKey(event) 36​ Keys.onReleased: Activity.processReleasedKey(event)
37 37​
jjazeixUnsubmitted
Not Done

it should be on the pageComponent

jjazeix: it should be on the pageComponent
38 property var dataset 38​ property var dataset
39​ property var tutorialInstructions
40​ property bool showTutorial: false
39 41​
40 property int oldWidth: width 42​ property int oldWidth: width
jjazeixUnsubmitted
Not Done

you should avoir naming it the same as the image just above.
Where is it used?

jjazeix: you should avoir naming it the same as the image just above. Where is it used?
41 onWidthChanged: { 43​ onWidthChanged: {
42 // Reposition helico and clouds, same for height 44​ // Reposition helico and clouds, same for height
43 Activity.repositionObjectsOnWidthChanged(width / oldWidth) 45​ Activity.repositionObjectsOnWidthChanged(width / oldWidth)
44 oldWidth = width 46​ oldWidth = width
45 } 47​ }
46 48​
47 property int oldHeight: height 49​ property int oldHeight: height
48 onHeightChanged: { 50​ onHeightChanged: {
49 // Reposition helico and clouds, same for height 51​ // Reposition helico and clouds, same for height
50 Activity.repositionObjectsOnHeightChanged(height / oldHeight) 52​ Activity.repositionObjectsOnHeightChanged(height / oldHeight)
51 oldHeight = height 53​ oldHeight = height
52 } 54​ }
53 55​
54 pageComponent: Image { 56​ pageComponent: Image {
55 id: background 57​ id: background
56 anchors.fill: parent 58​ anchors.fill: parent
57 signal start 59​ signal start
58 signal stop 60​ signal stop
59 source: Activity.url + "../algorithm/resource/desert_scene.svg" 61​ source: Activity.url + "../algorithm/resource/desert_scene.svg"
60 sourceSize.width: parent.width 62​ sourceSize.width: parent.width
61 63​
62 Component.onCompleted: { 64​ Component.onCompleted: {
63 activity.start.connect(start) 65​ activity.start.connect(start)
64 activity.stop.connect(stop) 66​ activity.stop.connect(stop)
jjazeixUnsubmitted
Not Done

why this change?

jjazeix: why this change?
65 } 67​ }
68​
66 QtObject { 69​ QtObject {
67 id: items 70​ id: items
68 property alias background: background 71​ property alias background: background
69 property alias bar: bar 72​ property alias bar: bar
70 property alias bonus: bonus 73​ property alias bonus: bonus
71 property alias score: score 74​ property alias score: score
72 property alias plane: plane 75​ property alias plane: plane
73 property GCAudio audioVoices: activity.audioVoices 76​ property GCAudio audioVoices: activity.audioVoices
74 property GCSfx audioEffects: activity.audioEffects 77​ property GCSfx audioEffects: activity.audioEffects
75 property alias movePlaneTimer: movePlaneTimer 78​ property alias movePlaneTimer: movePlaneTimer
76 property alias cloudCreation: cloudCreation 79​ property alias cloudCreation: cloudCreation
80​ property alias tutorialSection: tutorialSection
81​ property alias tutorialImage: tutorialImage
amankumarguptaUnsubmitted
Not Done

Extra empty line

amankumargupta: Extra empty line
82​ }
83​
84​ onStart: { Activity.start(items, dataset) }
85​ onStop: { Activity.stop() }
86​
87​ // Tutorial section starts
amankumarguptaUnsubmitted
Not Done

space after ':'

amankumargupta: space after ':'
88​ Image {
89​ id: tutorialImage
90​ source: "../digital_electricity/resource/texture01.png"
91​ anchors.fill: parent
92​ fillMode: Image.Tile
93​ z: 5
94​ visible: showTutorial
95​ Tutorial {
96​ id: tutorialSection
97​ tutorialDetails: tutorialInstructions
98​ useImage: false
99​ onSkipPressed: {
100​ Activity.initLevel()
101​ tutorialImage.visible = false
102​ Activity.createCloud()
103​ cloudCreation.start()
104​ }
77 } 105​ }
78 onStart: Activity.start(items, dataset) 106​ }
79 onStop: Activity.stop(); 107​
108​ //Tutorial section ends
80 109​
81 MultiPointTouchArea { 110​ MultiPointTouchArea {
82 anchors.fill: parent 111​ anchors.fill: parent
83 touchPoints: [ TouchPoint { id: point1 } ] 112​ touchPoints: [ TouchPoint { id: point1 } ]
84 113​
85 onReleased: { 114​ onReleased: {
86 plane.x = point1.x - plane.width / 2 115​ plane.x = point1.x - plane.width / 2
87 plane.y = point1.y - plane.height / 2 116​ plane.y = point1.y - plane.height / 2
jjazeixUnsubmitted
Not Done

indentation

jjazeix: indentation
88 } 117​ }
89 } 118​ }
90 119​
91 DialogHelp { 120​ DialogHelp {
92 id: dialogHelp 121​ id: dialogHelp
93 onClose: home() 122​ onClose: home()
94 } 123​ }
95 124​
96 Bar { 125​ Bar {
97 id: bar 126​ id: bar
98 content: BarEnumContent { value: help | home | level } 127​ content: BarEnumContent { value: help | home | level }
99 onHelpClicked: displayDialog(dialogHelp) 128​ onHelpClicked: displayDialog(dialogHelp)
100 onPreviousLevelClicked: Activity.previousLevel() 129​ onPreviousLevelClicked: Activity.previousLevel()
101 onNextLevelClicked: Activity.nextLevel() 130​ onNextLevelClicked: Activity.nextLevel()
102 onHomeClicked: activity.home() 131​ onHomeClicked: activity.home()
103 } 132​ }
104 133​
105 Bonus { 134​ Bonus {
106 id: bonus 135​ id: bonus
107 Component.onCompleted: win.connect(Activity.nextLevel) 136​ Component.onCompleted: win.connect(Activity.nextLevel)
108 } 137​ }
109 138​
110 Score { 139​ Score {
111 id: score 140​ id: score
112 visible: false ​
113 fontSize: background.width >= background.height ? internalTextComponent.largeSize : internalTextComponent.mediumSize 141​ fontSize: background.width >= background.height ? internalTextComponent.largeSize : internalTextComponent.mediumSize
114 height: internalTextComponent.height + 10 142​ height: internalTextComponent.height + 10
115 anchors.bottom: bar.top 143​ anchors.bottom: bar.top
116 anchors.margins: 10 144​ anchors.margins: 10
145​ visible: !tutorialImage.visible
117 } 146​ }
118 147​
119 property int movePlaneTimerCounter: 0 148​ property int movePlaneTimerCounter: 0
120 Timer { 149​ Timer {
121 id: movePlaneTimer 150​ id: movePlaneTimer
122 running: false 151​ running: false
123 repeat: true 152​ repeat: true
124 onTriggered: { 153​ onTriggered: {
Show All 13 Lines165 Timer {
138 running: false 167​ running: false
139 repeat: true 168​ repeat: true
140 interval: 10200 - (bar.level * 200) 169​ interval: 10200 - (bar.level * 200)
141 onTriggered: Activity.createCloud() 170​ onTriggered: Activity.createCloud()
142 } 171​ }
143 172​
144 Plane { 173​ Plane {
145 id: plane 174​ id: plane
175​ visible: !tutorialImage.visible
146 background: background 176​ background: background
147 } 177​ }
148 178​
149 } 179​ }
150} 180​}