diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2011-07-22 17:45:59 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-28 11:27:26 +0200 |
commit | e57189d3bbac058a3ddea567a6e487be65cdde5a (patch) | |
tree | f3019565789a11704b6644f3c7ab912fe9343efe /src/declarative/particles/qsgimageparticle.cpp | |
parent | 0511dfc0b8851baf84df73780e770f1025261068 (diff) |
Add some more properties to JS particle type
Adds the current position, velocity and acceleration.
While we're at it, renaming the velocity vars from sx,sy to vx,vy
Change-Id: I87f582169c7873c45a6fd453052b25c4dc940f3e
Reviewed-on: http://codereview.qt.nokia.com/2021
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/particles/qsgimageparticle.cpp')
-rw-r--r-- | src/declarative/particles/qsgimageparticle.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/particles/qsgimageparticle.cpp b/src/declarative/particles/qsgimageparticle.cpp index e4ba67f6e7..52e94b169a 100644 --- a/src/declarative/particles/qsgimageparticle.cpp +++ b/src/declarative/particles/qsgimageparticle.cpp @@ -985,8 +985,8 @@ void QSGImageParticle::commit(int gIdx, int pIdx) ultraVertices[i].lifeSpan = datum->lifeSpan; ultraVertices[i].size = datum->size; ultraVertices[i].endSize = datum->endSize; - ultraVertices[i].sx = datum->sx; - ultraVertices[i].sy = datum->sy; + ultraVertices[i].vx = datum->vx; + ultraVertices[i].vy = datum->vy; ultraVertices[i].ax = datum->ax; ultraVertices[i].ay = datum->ay; ultraVertices[i].xx = datum->xx; @@ -1018,8 +1018,8 @@ void QSGImageParticle::commit(int gIdx, int pIdx) simpleVertices[i].lifeSpan = datum->lifeSpan; simpleVertices[i].size = datum->size; simpleVertices[i].endSize = datum->endSize; - simpleVertices[i].sx = datum->sx; - simpleVertices[i].sy = datum->sy; + simpleVertices[i].vx = datum->vx; + simpleVertices[i].vy = datum->vy; simpleVertices[i].ax = datum->ax; simpleVertices[i].ay = datum->ay; } |