kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Remove redundant Uniform(QColor) helper.

Browse source
This commit is contained in:
John Preston 2021-06-07 18:31:11 +04:00
parent b1d5ed4ab5
commit 35236988b7
3 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ui/gl/gl_math.cpp
View file

@ -20,14 +20,6 @@ QVector4D Uniform(const Rect &rect) {
return QVector4D(rect.x(), rect.y(), rect.width(), rect.height()); return QVector4D(rect.x(), rect.y(), rect.width(), rect.height());
} }
QVector4D Uniform(const QColor &color) {
return QVector4D(
color.redF(),
color.greenF(),
color.blueF(),
color.alphaF());
}
QSizeF Uniform(QSize size) { QSizeF Uniform(QSize size) {
return size; return size;
} }

1
ui/gl/gl_math.h
View file

@ -73,7 +73,6 @@ private:
[[nodiscard]] QVector4D Uniform(const QRect &rect, float factor); [[nodiscard]] QVector4D Uniform(const QRect &rect, float factor);
[[nodiscard]] QVector4D Uniform(const Rect &rect); [[nodiscard]] QVector4D Uniform(const Rect &rect);
[[nodiscard]] QVector4D Uniform(const QColor &color);
[[nodiscard]] QSizeF Uniform(QSize size); [[nodiscard]] QSizeF Uniform(QSize size);
[[nodiscard]] Rect TransformRect( [[nodiscard]] Rect TransformRect(

4
ui/gl/gl_primitives.cpp
View file

@ -41,7 +41,7 @@ void FillTriangles(
buffer->bind(); buffer->bind();
buffer->allocate(coords.data(), coords.size() * sizeof(GLfloat)); buffer->allocate(coords.data(), coords.size() * sizeof(GLfloat));
program->setUniformValue("s_color", Uniform(color)); program->setUniformValue("s_color", color);
GLint position = program->attributeLocation("position"); GLint position = program->attributeLocation("position");
f.glVertexAttribPointer( f.glVertexAttribPointer(
@ -71,7 +71,7 @@ void FillRectangle(
return reinterpret_cast<const void*>( return reinterpret_cast<const void*>(
(skipVertices * 4 + elements) * sizeof(GLfloat)); (skipVertices * 4 + elements) * sizeof(GLfloat));
}; };
program->setUniformValue("s_color", Uniform(color)); program->setUniformValue("s_color", color);
GLint position = program->attributeLocation("position"); GLint position = program->attributeLocation("position");
f.glVertexAttribPointer( f.glVertexAttribPointer(