aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/particles/qsgcustomparticle.cpp
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2011-09-29 11:22:50 +1000
committerQt by Nokia <qt-info@nokia.com>2011-09-30 10:37:05 +0200
commit2bb6c25b231193c19e3b52275471f274624cb408 (patch)
tree77e754362f0cca7e7aa9bfe38691aa87b92d23bd /src/declarative/particles/qsgcustomparticle.cpp
parentd3ecdc4ba41bb099c5bab380304386e1a4bfdd31 (diff)
Refactor ParticleSystem members
Leave m_ for private members. Change-Id: Ia20565a7af6c5db45923eb349238b94b88472f7b Reviewed-on: http://codereview.qt-project.org/5762 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/declarative/particles/qsgcustomparticle.cpp')
-rw-r--r--src/declarative/particles/qsgcustomparticle.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/particles/qsgcustomparticle.cpp b/src/declarative/particles/qsgcustomparticle.cpp
index 5580a4858f..5aad023da4 100644
--- a/src/declarative/particles/qsgcustomparticle.cpp
+++ b/src/declarative/particles/qsgcustomparticle.cpp
@@ -477,8 +477,8 @@ QSGShaderEffectNode* QSGCustomParticle::buildCustomNodes()
s.vertexCode = qt_particles_template_vertex_code + s.vertexCode;
m_material->setProgramSource(s);
foreach (const QString &str, m_groups){
- int gIdx = m_system->m_groupIds[str];
- int count = m_system->m_groupData[gIdx]->size();
+ int gIdx = m_system->groupIds[str];
+ int count = m_system->groupData[gIdx]->size();
QSGShaderEffectNode* node = new QSGShaderEffectNode();
m_nodes.insert(gIdx, node);
@@ -566,7 +566,7 @@ void QSGCustomParticle::buildData()
void QSGCustomParticle::initialize(int gIdx, int pIdx)
{
- QSGParticleData* datum = m_system->m_groupData[gIdx]->data[pIdx];
+ QSGParticleData* datum = m_system->groupData[gIdx]->data[pIdx];
datum->r = rand()/(qreal)RAND_MAX;
}
@@ -575,7 +575,7 @@ void QSGCustomParticle::commit(int gIdx, int pIdx)
if (m_nodes[gIdx] == 0)
return;
- QSGParticleData* datum = m_system->m_groupData[gIdx]->data[pIdx];
+ QSGParticleData* datum = m_system->groupData[gIdx]->data[pIdx];
PlainVertices *particles = (PlainVertices *) m_nodes[gIdx]->geometry()->vertexData();
PlainVertex *vertices = (PlainVertex *)&particles[pIdx];
for (int i=0; i<4; ++i) {