From 7ab1f9834ff38fffae8e87b87684b00b0509a21a Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Wed, 11 May 2011 12:56:51 +0200 Subject: Documentation and API cleanup of QSGMaterial --- src/imports/particles/coloredparticle.cpp | 26 ++++++++++++------------ src/imports/particles/deformableparticle.cpp | 14 ++++++------- src/imports/particles/spriteimage.cpp | 30 ++++++++++++++-------------- src/imports/particles/spriteparticle.cpp | 22 ++++++++++---------- 4 files changed, 46 insertions(+), 46 deletions(-) (limited to 'src/imports/particles') diff --git a/src/imports/particles/coloredparticle.cpp b/src/imports/particles/coloredparticle.cpp index 449c6b24fc..22ef2d2eba 100644 --- a/src/imports/particles/coloredparticle.cpp +++ b/src/imports/particles/coloredparticle.cpp @@ -100,7 +100,7 @@ public: QSGMaterialShader::deactivate(); for (int i=0; i<8; ++i) { - m_program.setAttributeArray(i, GL_FLOAT, chunkOfBytes, 1, 0); + program()->setAttributeArray(i, GL_FLOAT, chunkOfBytes, 1, 0); } } @@ -110,17 +110,17 @@ public: state.context()->functions()->glActiveTexture(GL_TEXTURE0); m->texture->bind(); - m_program.setUniformValue(m_opacity_id, state.opacity()); - m_program.setUniformValue(m_timestamp_id, (float) m->timestamp); + program()->setUniformValue(m_opacity_id, state.opacity()); + program()->setUniformValue(m_timestamp_id, (float) m->timestamp); if (state.isMatrixDirty()) - m_program.setUniformValue(m_matrix_id, state.combinedMatrix()); + program()->setUniformValue(m_matrix_id, state.combinedMatrix()); } virtual void initialize() { - m_matrix_id = m_program.uniformLocation("matrix"); - m_opacity_id = m_program.uniformLocation("opacity"); - m_timestamp_id = m_program.uniformLocation("timestamp"); + m_matrix_id = program()->uniformLocation("matrix"); + m_opacity_id = program()->uniformLocation("opacity"); + m_timestamp_id = program()->uniformLocation("timestamp"); } virtual const char *vertexShader() const { return m_vertex_code.constData(); } @@ -193,9 +193,9 @@ public: virtual void initialize() { ParticleTrailsMaterialData::initialize(); - m_colortable_id = m_program.uniformLocation("colortable"); - m_sizetable_id = m_program.uniformLocation("sizetable"); - m_opacitytable_id = m_program.uniformLocation("opacitytable"); + m_colortable_id = program()->uniformLocation("colortable"); + m_sizetable_id = program()->uniformLocation("sizetable"); + m_opacitytable_id = program()->uniformLocation("opacitytable"); } virtual void updateState(const RenderState &state, QSGMaterial *current, QSGMaterial *old) @@ -205,15 +205,15 @@ public: ParticleTrailsMaterialCT *m = static_cast(current); state.context()->functions()->glActiveTexture(GL_TEXTURE1); m->colortable->bind(); - m_program.setUniformValue(m_colortable_id, 1); + program()->setUniformValue(m_colortable_id, 1); state.context()->functions()->glActiveTexture(GL_TEXTURE2); m->sizetable->bind(); - m_program.setUniformValue(m_sizetable_id, 2); + program()->setUniformValue(m_sizetable_id, 2); state.context()->functions()->glActiveTexture(GL_TEXTURE3); m->opacitytable->bind(); - m_program.setUniformValue(m_opacitytable_id, 3); + program()->setUniformValue(m_opacitytable_id, 3); ParticleTrailsMaterialData::updateState(state, current, old); } diff --git a/src/imports/particles/deformableparticle.cpp b/src/imports/particles/deformableparticle.cpp index 176ef2b238..768e4eb4b5 100644 --- a/src/imports/particles/deformableparticle.cpp +++ b/src/imports/particles/deformableparticle.cpp @@ -100,7 +100,7 @@ public: QSGMaterialShader::deactivate(); for (int i=0; i<8; ++i) { - m_program.setAttributeArray(i, GL_FLOAT, chunkOfBytes, 1, 0); + program()->setAttributeArray(i, GL_FLOAT, chunkOfBytes, 1, 0); } } @@ -110,17 +110,17 @@ public: state.context()->functions()->glActiveTexture(GL_TEXTURE0); m->texture->bind(); - m_program.setUniformValue(m_opacity_id, state.opacity()); - m_program.setUniformValue(m_timestamp_id, (float) m->timestamp); + program()->setUniformValue(m_opacity_id, state.opacity()); + program()->setUniformValue(m_timestamp_id, (float) m->timestamp); if (state.isMatrixDirty()) - m_program.setUniformValue(m_matrix_id, state.combinedMatrix()); + program()->setUniformValue(m_matrix_id, state.combinedMatrix()); } virtual void initialize() { - m_matrix_id = m_program.uniformLocation("matrix"); - m_opacity_id = m_program.uniformLocation("opacity"); - m_timestamp_id = m_program.uniformLocation("timestamp"); + m_matrix_id = program()->uniformLocation("matrix"); + m_opacity_id = program()->uniformLocation("opacity"); + m_timestamp_id = program()->uniformLocation("timestamp"); } virtual const char *vertexShader() const { return m_vertex_code.constData(); } diff --git a/src/imports/particles/spriteimage.cpp b/src/imports/particles/spriteimage.cpp index b0f8564f7b..0ce3461bd0 100644 --- a/src/imports/particles/spriteimage.cpp +++ b/src/imports/particles/spriteimage.cpp @@ -114,7 +114,7 @@ public: QSGMaterialShader::deactivate(); for (int i=0; i<8; ++i) { - m_program.setAttributeArray(i, GL_FLOAT, chunkOfBytes, 1, 0); + program()->setAttributeArray(i, GL_FLOAT, chunkOfBytes, 1, 0); } } @@ -123,25 +123,25 @@ public: SpriteMaterial *m = static_cast(newEffect); m->texture->bind(); - m_program.setUniformValue(m_opacity_id, state.opacity()); - m_program.setUniformValue(m_timestamp_id, (float) m->timestamp); - m_program.setUniformValue(m_framecount_id, (float) m->framecount); - m_program.setUniformValue(m_animcount_id, (float) m->animcount); - m_program.setUniformValue(m_width_id, (float) m->width); - m_program.setUniformValue(m_height_id, (float) m->height); + program()->setUniformValue(m_opacity_id, state.opacity()); + program()->setUniformValue(m_timestamp_id, (float) m->timestamp); + program()->setUniformValue(m_framecount_id, (float) m->framecount); + program()->setUniformValue(m_animcount_id, (float) m->animcount); + program()->setUniformValue(m_width_id, (float) m->width); + program()->setUniformValue(m_height_id, (float) m->height); if (state.isMatrixDirty()) - m_program.setUniformValue(m_matrix_id, state.combinedMatrix()); + program()->setUniformValue(m_matrix_id, state.combinedMatrix()); } virtual void initialize() { - m_matrix_id = m_program.uniformLocation("matrix"); - m_opacity_id = m_program.uniformLocation("opacity"); - m_timestamp_id = m_program.uniformLocation("timestamp"); - m_framecount_id = m_program.uniformLocation("framecount"); - m_animcount_id = m_program.uniformLocation("animcount"); - m_width_id = m_program.uniformLocation("width"); - m_height_id = m_program.uniformLocation("height"); + m_matrix_id = program()->uniformLocation("matrix"); + m_opacity_id = program()->uniformLocation("opacity"); + m_timestamp_id = program()->uniformLocation("timestamp"); + m_framecount_id = program()->uniformLocation("framecount"); + m_animcount_id = program()->uniformLocation("animcount"); + m_width_id = program()->uniformLocation("width"); + m_height_id = program()->uniformLocation("height"); } virtual const char *vertexShader() const { return m_vertex_code.constData(); } diff --git a/src/imports/particles/spriteparticle.cpp b/src/imports/particles/spriteparticle.cpp index 84f2db0e7f..1b62765ede 100644 --- a/src/imports/particles/spriteparticle.cpp +++ b/src/imports/particles/spriteparticle.cpp @@ -109,7 +109,7 @@ public: QSGMaterialShader::deactivate(); for (int i=0; i<8; ++i) { - m_program.setAttributeArray(i, GL_FLOAT, chunkOfBytes, 1, 0); + program()->setAttributeArray(i, GL_FLOAT, chunkOfBytes, 1, 0); } } @@ -118,21 +118,21 @@ public: SpriteParticlesMaterial *m = static_cast(newEffect); m->texture->bind(); - m_program.setUniformValue(m_opacity_id, state.opacity()); - m_program.setUniformValue(m_timestamp_id, (float) m->timestamp); - m_program.setUniformValue(m_framecount_id, (float) m->framecount); - m_program.setUniformValue(m_animcount_id, (float) m->animcount); + program()->setUniformValue(m_opacity_id, state.opacity()); + program()->setUniformValue(m_timestamp_id, (float) m->timestamp); + program()->setUniformValue(m_framecount_id, (float) m->framecount); + program()->setUniformValue(m_animcount_id, (float) m->animcount); if (state.isMatrixDirty()) - m_program.setUniformValue(m_matrix_id, state.combinedMatrix()); + program()->setUniformValue(m_matrix_id, state.combinedMatrix()); } virtual void initialize() { - m_matrix_id = m_program.uniformLocation("matrix"); - m_opacity_id = m_program.uniformLocation("opacity"); - m_timestamp_id = m_program.uniformLocation("timestamp"); - m_framecount_id = m_program.uniformLocation("framecount"); - m_animcount_id = m_program.uniformLocation("animcount"); + m_matrix_id = program()->uniformLocation("matrix"); + m_opacity_id = program()->uniformLocation("opacity"); + m_timestamp_id = program()->uniformLocation("timestamp"); + m_framecount_id = program()->uniformLocation("framecount"); + m_animcount_id = program()->uniformLocation("animcount"); } virtual const char *vertexShader() const { return m_vertex_code.constData(); } -- cgit v1.2.3