diff options
Diffstat (limited to 'examples/particles/affectors')
9 files changed, 25 insertions, 25 deletions
diff --git a/examples/particles/affectors/content/age.qml b/examples/particles/affectors/content/age.qml index ba52ce25ec..bcc35a3880 100644 --- a/examples/particles/affectors/content/age.qml +++ b/examples/particles/affectors/content/age.qml @@ -64,7 +64,7 @@ Rectangle { system: particles emitRate: 20 lifeSpan: 8000 - speed: PointDirection { y:80; yVariation: 40; } + velocity: PointDirection { y:80; yVariation: 40; } acceleration: PointDirection { y: 4 } size: 36 endSize: 12 diff --git a/examples/particles/affectors/content/attractor.qml b/examples/particles/affectors/content/attractor.qml index 16a553faeb..71e66a046e 100644 --- a/examples/particles/affectors/content/attractor.qml +++ b/examples/particles/affectors/content/attractor.qml @@ -58,7 +58,7 @@ Rectangle { enabled: true size: 30 sizeVariation: 10 - speed: PointDirection { x: 220; xVariation: 40 } + velocity: PointDirection { x: 220; xVariation: 40 } height: parent.height } Emitter { @@ -69,7 +69,7 @@ Rectangle { enabled: true size: 30 sizeVariation: 10 - speed: PointDirection { x: 220; xVariation: 40 } + velocity: PointDirection { x: 220; xVariation: 40 } height: parent.height } ParticleSystem { @@ -178,7 +178,7 @@ Rectangle { size: 10 endSize: 4 sizeVariation: 4 - speed: PointDirection { x: -128; xVariation: 32 } + velocity: PointDirection { x: -128; xVariation: 32 } height: ship.height y: ship.y x: ship.x @@ -191,7 +191,7 @@ Rectangle { lifeSpan: 1000 enabled: true size: 40 - speed: PointDirection { x: 256; } + velocity: PointDirection { x: 256; } x: ship.x + ship.width y: ship.y + ship.height/2 } diff --git a/examples/particles/affectors/content/customaffector.qml b/examples/particles/affectors/content/customaffector.qml index 2abb72dc16..8f634fbea3 100644 --- a/examples/particles/affectors/content/customaffector.qml +++ b/examples/particles/affectors/content/customaffector.qml @@ -58,7 +58,7 @@ Item { emitRate: 4 lifeSpan: 14000 size: 80 - speed: PointDirection { y: 60 } + velocity: PointDirection { y: 60 } } Wander { system: sys @@ -72,7 +72,7 @@ Item { Affector { system: sys property real coefficient: 0.1 - property real speed: 1.5 + property real velocity: 1.5 width: parent.width height: parent.height - 100 onAffectParticles: { @@ -80,11 +80,11 @@ Item { if (particle.r == 0) { particle.r = Math.random() > 0.5 ? -1 : 1; }else if (particle.r == 1) { - particle.rotation += speed * dt; + particle.rotation += velocity * dt; if(particle.rotation >= maxAngle) particle.r = -1; }else if (particle.r == -1) { - particle.rotation -= speed * dt; + particle.rotation -= velocity * dt; if(particle.rotation <= -1 * maxAngle) particle.r = 1; } @@ -95,7 +95,7 @@ Item { if (particle.r == 0.0) { particle.r = Math.random() + 0.01; } - particle.rotation += speed * particle.r * dt; + particle.rotation += velocity * particle.r * dt; particle.r -= particle.rotation * coefficient; if (particle.r == 0.0) particle.r -= particle.rotation * 0.000001; diff --git a/examples/particles/affectors/content/friction.qml b/examples/particles/affectors/content/friction.qml index 951ffae2d3..bed1cf2a33 100644 --- a/examples/particles/affectors/content/friction.qml +++ b/examples/particles/affectors/content/friction.qml @@ -56,7 +56,7 @@ Item { emitRate: 4 lifeSpan: 14000 size: 80 - speed: PointDirection { y: 160; yVariation: 80; xVariation: 20 } + velocity: PointDirection { y: 160; yVariation: 80; xVariation: 20 } } ImageParticle { diff --git a/examples/particles/affectors/content/groupgoal.qml b/examples/particles/affectors/content/groupgoal.qml index e874c78d89..977097dc29 100644 --- a/examples/particles/affectors/content/groupgoal.qml +++ b/examples/particles/affectors/content/groupgoal.qml @@ -111,7 +111,7 @@ Rectangle { emitWidth: 16 emitHeight: 16 - speed: PointDirection {yVariation: 16; xVariation: 16} + velocity: PointDirection {yVariation: 16; xVariation: 16} acceleration: PointDirection {y: -16} size: 24 @@ -152,7 +152,7 @@ Rectangle { lifeSpan: 4000//TODO: Infinite & kill zone size: 24 sizeVariation: 4 - speed: PointDirection {x:120; xVariation: 80; yVariation: 50} + velocity: PointDirection {x:120; xVariation: 80; yVariation: 50} acceleration: PointDirection {y:120} group: "unlit" } @@ -167,7 +167,7 @@ Rectangle { size: 24 sizeVariation: 2 endSize: 0 - speed: PointDirection { y:-100; yVariation: 4; xVariation: 4 } + velocity: PointDirection { y:-100; yVariation: 4; xVariation: 4 } // ![groupgoal-pilot] GroupGoal { groups: ["unlit"] diff --git a/examples/particles/affectors/content/move.qml b/examples/particles/affectors/content/move.qml index 8ffe8e2d8b..d50def5cea 100644 --- a/examples/particles/affectors/content/move.qml +++ b/examples/particles/affectors/content/move.qml @@ -61,7 +61,7 @@ Rectangle { lifeSpan: 2800 size: 32 sizeVariation: 8 - speed: PointDirection{ x: 66; xVariation: 20 } + velocity: PointDirection{ x: 66; xVariation: 20 } width: 80 height: 80 } @@ -91,7 +91,7 @@ Rectangle { lifeSpan: 2800 size: 32 sizeVariation: 8 - speed: PointDirection{ x: 240; xVariation: 60 } + velocity: PointDirection{ x: 240; xVariation: 60 } y: 260 width: 10 height: 10 @@ -105,7 +105,7 @@ Rectangle { width: 80 height: 80 once: true - speed: AngleDirection { angleVariation:360; magnitude: 72 } + velocity: AngleDirection { angleVariation:360; magnitude: 72 } } //! [B] @@ -124,7 +124,7 @@ Rectangle { lifeSpan: 2800 size: 32 sizeVariation: 8 - speed: PointDirection{ x: 80; xVariation: 10 } + velocity: PointDirection{ x: 80; xVariation: 10 } acceleration: PointDirection { y: 10; x: 20; } width: 80 height: 80 diff --git a/examples/particles/affectors/content/spritegoal.qml b/examples/particles/affectors/content/spritegoal.qml index 21aa859dac..0e5d94c515 100644 --- a/examples/particles/affectors/content/spritegoal.qml +++ b/examples/particles/affectors/content/spritegoal.qml @@ -81,7 +81,7 @@ Item { anchors.centerIn: parent - //acceleration: AngledDirection {angleVariation: 360; magnitude: 200}//Is this a better effect, more consistent speed? + //acceleration: AngledDirection {angleVariation: 360; magnitude: 200}//Is this a better effect, more consistent velocity? acceleration: PointDirection { xVariation: 200; yVariation: 200; } size: 0 @@ -203,8 +203,8 @@ Item { y: holder.y x: holder.x - speed: PointDirection { xVariation: 40; yVariation: 40; } - speedFromMovement: 16 + velocity: PointDirection { xVariation: 40; yVariation: 40; } + velocityFromMovement: 16 acceleration: PointDirection { xVariation: 10; yVariation: 10; } diff --git a/examples/particles/affectors/content/turbulence.qml b/examples/particles/affectors/content/turbulence.qml index 823a37e547..62231e12ad 100644 --- a/examples/particles/affectors/content/turbulence.qml +++ b/examples/particles/affectors/content/turbulence.qml @@ -100,7 +100,7 @@ Rectangle { endSize: 10 sizeVariation: 10 acceleration: PointDirection { y: -40 } - speed: AngleDirection { angle: 270; magnitude: 20; angleVariation: 22; magnitudeVariation: 5 } + velocity: AngleDirection { angle: 270; magnitude: 20; angleVariation: 22; magnitudeVariation: 5 } } TrailEmitter { id: smoke1 @@ -117,7 +117,7 @@ Rectangle { endSize: 8 sizeVariation: 8 acceleration: PointDirection { y: -40 } - speed: AngleDirection { angle: 270; magnitude: 40; angleVariation: 22; magnitudeVariation: 5 } + velocity: AngleDirection { angle: 270; magnitude: 40; angleVariation: 22; magnitudeVariation: 5 } } TrailEmitter { id: smoke2 @@ -133,6 +133,6 @@ Rectangle { endSize: 24 sizeVariation: 12 acceleration: PointDirection { y: -40 } - speed: AngleDirection { angle: 270; magnitude: 40; angleVariation: 22; magnitudeVariation: 5 } + velocity: AngleDirection { angle: 270; magnitude: 40; angleVariation: 22; magnitudeVariation: 5 } } } diff --git a/examples/particles/affectors/content/wander.qml b/examples/particles/affectors/content/wander.qml index 649bfc06bb..931f3ab8d9 100644 --- a/examples/particles/affectors/content/wander.qml +++ b/examples/particles/affectors/content/wander.qml @@ -71,7 +71,7 @@ Rectangle { system: particles emitRate: 20 lifeSpan: 7000 - speed: PointDirection { y:80; yVariation: 40; } + velocity: PointDirection { y:80; yVariation: 40; } acceleration: PointDirection { y: 4 } size: 20 sizeVariation: 10 |