Differential D23618 Diff 65079 effects/mousemark/mousemark.cpp

Changeset View

Standalone View

View Options

effects/mousemark/mousemark.cpp

Show First 20 Lines • Show All 132 Lines • ▼ Show 20 Line(s)119 if ( effects->isOpenGLCompositing()) {
133 binder.shader()->setUniform(GLShader::ModelViewProjectionMatrix, data.projectionMatrix()); 133​ binder.shader()->setUniform(GLShader::ModelViewProjectionMatrix, data.projectionMatrix());
134 QVector<float> verts; 134​ QVector<float> verts;
135 foreach (const Mark & mark, marks) { 135​ foreach (const Mark & mark, marks) {
136 verts.clear(); 136​ verts.clear();
137 verts.reserve(mark.size() * 2); 137​ verts.reserve(mark.size() * 2);
138 foreach (const QPoint & p, mark) { 138​ foreach (const QPoint & p, mark) {
139 verts << p.x() << p.y(); 139​ verts << p.x() << p.y();
140 } 140​ }
141 vbo->setData(verts.size() / 2, 2, verts.data(), NULL); 141​ vbo->setData(verts.size() / 2, 2, verts.data(), nullptr);
142 vbo->render(GL_LINE_STRIP); 142​ vbo->render(GL_LINE_STRIP);
143 } 143​ }
144 if (!drawing.isEmpty()) { 144​ if (!drawing.isEmpty()) {
145 verts.clear(); 145​ verts.clear();
146 verts.reserve(drawing.size() * 2); 146​ verts.reserve(drawing.size() * 2);
147 foreach (const QPoint & p, drawing) { 147​ foreach (const QPoint & p, drawing) {
148 verts << p.x() << p.y(); 148​ verts << p.x() << p.y();
149 } 149​ }
150 vbo->setData(verts.size() / 2, 2, verts.data(), NULL); 150​ vbo->setData(verts.size() / 2, 2, verts.data(), nullptr);
151 vbo->render(GL_LINE_STRIP); 151​ vbo->render(GL_LINE_STRIP);
152 } 152​ }
153 glLineWidth(1.0); 153​ glLineWidth(1.0);
154 if (!GLPlatform::instance()->isGLES()) { 154​ if (!GLPlatform::instance()->isGLES()) {
155 glDisable(GL_LINE_SMOOTH); 155​ glDisable(GL_LINE_SMOOTH);
156 glDisable(GL_BLEND); 156​ glDisable(GL_BLEND);
157 } 157​ }
158 } 158​ }
▲ Show 20 Lines • Show All 136 Lines • Show Last 20 Lines