caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small fixes.

Browse Source
This commit is contained in:
Sergiusz Bazanski 2018-06-22 15:13:05 +01:00
parent 858acc5c1c
commit a684785986
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gui/fpgaviewwidget.cc
View File

@ -75,18 +75,18 @@ void PolyLine::buildPoint(LineShaderData *building, const QVector2D *prev,
// Calculate normal to tangent - this is the line on which the vectors need // Calculate normal to tangent - this is the line on which the vectors need
// to be pushed to build a thickened line. // to be pushed to build a thickened line.
QVector2D tangent_normal = QVector2D(-tangent.y(), tangent.x()); const QVector2D tangent_normal = QVector2D(-tangent.y(), tangent.x());
// Calculate normal to one of the lines. // Calculate normal to one of the lines.
QVector2D dprev_normal = QVector2D(-dprev.y(), dprev.x()); const QVector2D dprev_normal = QVector2D(-dprev.y(), dprev.x());
// https://people.eecs.berkeley.edu/~sequin/CS184/IMGS/Sweep_PolyLine.jpg // https://people.eecs.berkeley.edu/~sequin/CS184/IMGS/Sweep_PolyLine.jpg
// (the ^-1 is performed in the shader) // (the ^-1 is performed in the shader)
float miter = QVector2D::dotProduct(tangent_normal, dprev_normal); const float miter = QVector2D::dotProduct(tangent_normal, dprev_normal);
float x = cur->x(); const float x = cur->x();
float y = cur->y(); const float y = cur->y();
float mx = tangent_normal.x(); const float mx = tangent_normal.x();
float my = tangent_normal.y(); const float my = tangent_normal.y();
// Push back 'left' vertex. // Push back 'left' vertex.
building->vertices.push_back(Vertex2DPOD(x, y)); building->vertices.push_back(Vertex2DPOD(x, y));
@ -149,7 +149,7 @@ void PolyLine::build(LineShaderData &target) const
prev = &point; prev = &point;
} }
// If we're closed, built to more vertices that loop the line around. // If we're closed, build two more vertices that loop the line around.
if (closed_) { if (closed_) {
target.indices.push_back(index); target.indices.push_back(index);
target.indices.push_back(index + 1); target.indices.push_back(index + 1);
@ -278,7 +278,7 @@ void FPGAViewWidget::initializeGL()
void FPGAViewWidget::drawElement(LineShaderData &out, const GraphicElement &el) void FPGAViewWidget::drawElement(LineShaderData &out, const GraphicElement &el)
{ {
float scale = 1.0, offset = 0.0; const float scale = 1.0, offset = 0.0;
if (el.type == GraphicElement::G_BOX) { if (el.type == GraphicElement::G_BOX) {
auto line = PolyLine(true); auto line = PolyLine(true);
@ -303,7 +303,7 @@ void FPGAViewWidget::paintGL()
gl->glViewport(0, 0, width() * retinaScale, height() * retinaScale); gl->glViewport(0, 0, width() * retinaScale, height() * retinaScale);
gl->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); gl->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
float aspect = float(width()) / float(height()); const float aspect = float(width()) / float(height());
QMatrix4x4 matrix; QMatrix4x4 matrix;
matrix.ortho(QRectF(-aspect / 2.0, -0.5, aspect, 1.0f)); matrix.ortho(QRectF(-aspect / 2.0, -0.5, aspect, 1.0f));