diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2011-06-08 17:55:41 +1000 |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2011-06-08 18:03:39 +1000 |
commit | c8a5c00ec1c06f7c00070d55cd61cb8d52dc67cf (patch) | |
tree | 95caddcee9dd998e128e22d64c4ba23dfab747b6 /demos/declarative/plasmapatrol | |
parent | 1f88f2ceedf00f96e2491ecdd1c655b0f12f3632 (diff) |
Immense Particles Refactor Part D
Changed the names of several properties:
FollowEmitter:
emissionShape->emitShape
emissionHeight->emitHeight
emissionWidth->emitWidth
Emitter:
particlesPerSecond->emitRate
particleDuration->lifeSpan
particleDurationVariation->lifeSpanVariation
maxParticles->emitCap
particleSize->size
particleEndSize->endSize
particleSizeVariation->sizeVariation
ImageParticle:
image->source
And stopped being silly in the example launcher.
Diffstat (limited to 'demos/declarative/plasmapatrol')
8 files changed, 77 insertions, 77 deletions
diff --git a/demos/declarative/plasmapatrol/content/BlasterHardpoint.qml b/demos/declarative/plasmapatrol/content/BlasterHardpoint.qml index fb30cd008b..1242a85149 100644 --- a/demos/declarative/plasmapatrol/content/BlasterHardpoint.qml +++ b/demos/declarative/plasmapatrol/content/BlasterHardpoint.qml @@ -61,12 +61,12 @@ Item { anchors.fill: parent shape: EllipseShape{} speed: TargetedDirection{ targetX: width/2; targetY: width/2; magnitude: -1; proportionalMagnitude: true} - particleDuration: 1000 - particlesPerSecond: 64 + lifeSpan: 1000 + emitRate: 64 - particleSize: 24 - particleSizeVariation: 24 - particleEndSize: 0 + size: 24 + sizeVariation: 24 + endSize: 0 } property int blastsLeft: 0 @@ -119,12 +119,12 @@ Item { system: container.system anchors.centerIn: parent - particleDuration: 1000 - particlesPerSecond: 16 - maxParticles: blasts - particleSize: 24 - particleEndSize:16 - particleSizeVariation: 8 + lifeSpan: 1000 + emitRate: 16 + emitCap: blasts + size: 24 + endSize:16 + sizeVariation: 8 speed: TargetedDirection{ id: blastVector targetX: target.x; targetY: target.y; magnitude: 1.1; proportionalMagnitude: true diff --git a/demos/declarative/plasmapatrol/content/CannonHardpoint.qml b/demos/declarative/plasmapatrol/content/CannonHardpoint.qml index fd49e4dd6d..b7572ef5c4 100644 --- a/demos/declarative/plasmapatrol/content/CannonHardpoint.qml +++ b/demos/declarative/plasmapatrol/content/CannonHardpoint.qml @@ -55,11 +55,11 @@ Item { emitting: container.show system: container.system anchors.centerIn: parent - particleDuration: 2000 - particlesPerSecond: 1 + lifeSpan: 2000 + emitRate: 1 - particleSize: 4 - particleEndSize: 0 + size: 4 + endSize: 0 } function fireAt(targetArg, hardpoint){ @@ -85,10 +85,10 @@ Item { system: container.system anchors.centerIn: parent - particleDuration: 1000 - particlesPerSecond: 1 - particleSize: 8 - particleEndSize: 4 + lifeSpan: 1000 + emitRate: 1 + size: 8 + endSize: 4 speed: TargetedDirection{ id: blastVector targetX: target.x; targetY: target.y; magnitude: 1.1; proportionalMagnitude: true diff --git a/demos/declarative/plasmapatrol/content/Cruiser.qml b/demos/declarative/plasmapatrol/content/Cruiser.qml index 71af0abffa..a844fa1bb8 100644 --- a/demos/declarative/plasmapatrol/content/Cruiser.qml +++ b/demos/declarative/plasmapatrol/content/Cruiser.qml @@ -64,13 +64,13 @@ Item { height: 64 shape: EllipseShape{} - particlesPerSecond: hp > 0 ? hp * 1 + 20 : 0 - particleDuration: 2400 - maxParticles: (maxHP * 1 + 20)*2.4 + emitRate: hp > 0 ? hp * 1 + 20 : 0 + lifeSpan: 2400 + emitCap: (maxHP * 1 + 20)*2.4 - particleSize: 48 - particleSizeVariation: 16 - particleEndSize: 16 + size: 48 + sizeVariation: 16 + endSize: 16 speed: AngledDirection{angleVariation:360; magnitudeVariation: 32} } @@ -81,11 +81,11 @@ Item { shape: EllipseShape{ fill: false } emitting: hp>0 - particlesPerSecond: 16 - particleDuration: 2000 + emitRate: 16 + lifeSpan: 2000 - particleSize: 48 - particleSizeVariation: 24 + size: 48 + sizeVariation: 24 SpriteGoal{ id: destructor diff --git a/demos/declarative/plasmapatrol/content/Frigate.qml b/demos/declarative/plasmapatrol/content/Frigate.qml index f18de0154a..d31405250e 100644 --- a/demos/declarative/plasmapatrol/content/Frigate.qml +++ b/demos/declarative/plasmapatrol/content/Frigate.qml @@ -58,9 +58,9 @@ Item { system: container.system particle: "frigateShield" anchors.centerIn: parent - particleSize: 92 - particlesPerSecond: 1 - particleDuration: 4800 + size: 92 + emitRate: 1 + lifeSpan: 4800 emitting: hp > 0 } Emitter{ @@ -71,12 +71,12 @@ Item { height: 16 shape: EllipseShape{} - particleSize: 16 - particleSizeVariation: 8 - particleEndSize: 8 - particlesPerSecond: hp > 0 ? hp * 1 + 20 : 0 - particleDuration: 1200 - maxParticles: (maxHP * 1 + 20)*2 + size: 16 + sizeVariation: 8 + endSize: 8 + emitRate: hp > 0 ? hp * 1 + 20 : 0 + lifeSpan: 1200 + emitCap: (maxHP * 1 + 20)*2 } Timer{ id: fireControl diff --git a/demos/declarative/plasmapatrol/content/LaserHardpoint.qml b/demos/declarative/plasmapatrol/content/LaserHardpoint.qml index 3705d29287..e99424856c 100644 --- a/demos/declarative/plasmapatrol/content/LaserHardpoint.qml +++ b/demos/declarative/plasmapatrol/content/LaserHardpoint.qml @@ -57,12 +57,12 @@ Item { emitting: container.show shape: EllipseShape{} speed: TargetedDirection{ targetX: width/2; targetY: width/2; magnitude: -1; proportionalMagnitude: true } - particleDuration: 1000 - particlesPerSecond: 64 + lifeSpan: 1000 + emitRate: 64 - particleSize: 24 - particleSizeVariation: 8 - particleEndSize: 8 + size: 24 + sizeVariation: 8 + endSize: 8 } function fireAt(targetArg, hardpoint){ @@ -97,11 +97,11 @@ Item { mirrored: (emitter.y < 0 || emitter.x < 0) && !(emitter.y < 0 && emitter.x < 0 )//I just want XOR } - particleDuration: 1000 - particlesPerSecond: 8000 - maxParticles: 800 - particleSize: 16 - particleEndSize: 0 + lifeSpan: 1000 + emitRate: 8000 + emitCap: 800 + size: 16 + endSize: 0 speed: PointDirection{xVariation: 4; yVariation: 4} } diff --git a/demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml b/demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml index 26d5f21359..b65686e59e 100644 --- a/demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml +++ b/demos/declarative/plasmapatrol/content/PlasmaPatrolParticles.qml @@ -46,7 +46,7 @@ Item{ ImageParticle{ system: sys particles: ["default"] - image: "pics/blur-circle3.png" + source: "pics/blur-circle3.png" color: "#003A3A3A" colorVariation: 0.1 z: 0 @@ -54,7 +54,7 @@ Item{ ImageParticle{ system: sys particles: ["redTeam"] - image: "pics/blur-circle3.png" + source: "pics/blur-circle3.png" color: "#0028060A" colorVariation: 0.1 z: 0 @@ -62,7 +62,7 @@ Item{ ImageParticle{ system: sys particles: ["greenTeam"] - image: "pics/blur-circle3.png" + source: "pics/blur-circle3.png" color: "#0006280A" colorVariation: 0.1 z: 0 @@ -70,7 +70,7 @@ Item{ ImageParticle{ system: sys particles: ["blaster"] - image: "pics/star2.png" + source: "pics/star2.png" //color: "#0F282406" color: "#0F484416" colorVariation: 0.2 @@ -79,7 +79,7 @@ Item{ ImageParticle{ system: sys particles: ["laser"] - image: "pics/star3.png" + source: "pics/star3.png" //color: "#00123F68" color: "#00428FF8" colorVariation: 0.2 @@ -88,7 +88,7 @@ Item{ ImageParticle{ system: sys particles: ["cannon"] - image: "pics/particle.png" + source: "pics/particle.png" color: "#80FFAAFF" colorVariation: 0.1 z: 2 @@ -96,7 +96,7 @@ Item{ ImageParticle{ system: sys particles: ["cannonCore"] - image: "pics/particle.png" + source: "pics/particle.png" color: "#00666666" colorVariation: 0.8 z: 1 @@ -104,7 +104,7 @@ Item{ ImageParticle{ system: sys particles: ["cannonWake"] - image: "pics/star.png" + source: "pics/star.png" color: "#00CCCCCC" colorVariation: 0.2 z: 1 @@ -112,7 +112,7 @@ Item{ ImageParticle{ system: sys particles: ["frigateShield"] - image: "pics/blur-circle2.png" + source: "pics/blur-circle2.png" color: "#00000000" colorVariation: 0.05 blueVariation: 0.5 @@ -148,12 +148,12 @@ Item{ system: sys particle: "cannonWake" follow: "cannon" - particlesPerParticlePerSecond: 64 - particleDuration: 600 + emitRatePerParticle: 64 + lifeSpan: 600 speed: AngledDirection{ angleVariation: 360; magnitude: 48} - particleSize: 16 - particleEndSize: 8 - particleSizeVariation: 2 + size: 16 + endSize: 8 + sizeVariation: 2 emitting: true width: 1000//XXX: Terrible hack height: 1000 @@ -162,10 +162,10 @@ Item{ system: sys particle: "cannonCore" follow: "cannon" - particlesPerParticlePerSecond: 256 - particleDuration: 128 - particleSize: 24 - particleEndSize: 8 + emitRatePerParticle: 256 + lifeSpan: 128 + size: 24 + endSize: 8 emitting: true width: 1000//XXX: Terrible hack height: 1000 diff --git a/demos/declarative/plasmapatrol/content/Sloop.qml b/demos/declarative/plasmapatrol/content/Sloop.qml index 20b60c5621..1a6f3a9620 100644 --- a/demos/declarative/plasmapatrol/content/Sloop.qml +++ b/demos/declarative/plasmapatrol/content/Sloop.qml @@ -63,15 +63,15 @@ Item { particle: container.shipParticle shape: EllipseShape{} - particlesPerSecond: hp > 0 ? hp + 20 : 0 - particleDuration: blinkInterval - maxParticles: (maxHP + 20) + emitRate: hp > 0 ? hp + 20 : 0 + lifeSpan: blinkInterval + emitCap: (maxHP + 20) acceleration: AngledDirection{angleVariation: 360; magnitude: 8} - particleSize: 24 - particleEndSize: 4 - particleSizeVariation: 8 + size: 24 + endSize: 4 + sizeVariation: 8 width: 16 height: 16 x: 64 diff --git a/demos/declarative/plasmapatrol/plasmapatrol.qml b/demos/declarative/plasmapatrol/plasmapatrol.qml index c490dfd322..dfc36ded01 100644 --- a/demos/declarative/plasmapatrol/plasmapatrol.qml +++ b/demos/declarative/plasmapatrol/plasmapatrol.qml @@ -98,12 +98,12 @@ Rectangle { system: particles emitting: true particle: "default" - particlesPerSecond: 1200 - particleDuration: 1200 + emitRate: 1200 + lifeSpan: 1200 shape: MaskShape{source:"content/pics/TitleText.png"} - particleSize: 16 - particleEndSize: 0 - particleSizeVariation: 8 + size: 16 + endSize: 0 + sizeVariation: 8 speed: AngledDirection{angleVariation:360; magnitudeVariation: 6} } } |