changeset
Make drawn vertices display a label containing coordinate informations, round down calculated coordinates
Tue, 28 May 2013 02:59:54 +0300
- author
- Santeri Piippo <crimsondusk64@gmail.com>
- date
- Tue, 28 May 2013 02:59:54 +0300
- changeset 263
- d7b534057d61
- parent 262
- 56f8987f4c7c
- child 264
- 4299b818a816
Make drawn vertices display a label containing coordinate informations, round down calculated coordinates
| changelog.txt | file | annotate | diff | comparison | revisions | |
| src/gldraw.cpp | file | annotate | diff | comparison | revisions | |
| src/gldraw.h | file | annotate | diff | comparison | revisions |
--- a/changelog.txt Mon May 27 22:05:10 2013 +0300 +++ b/changelog.txt Tue May 28 02:59:54 2013 +0300 @@ -10,4 +10,6 @@ - Fixed: Coordinates weren't drawn properly on a bright background (was always drawn in bright colors..). - Parts are now zoomed to fit properly - Added ability to snap to pre-existing vertices while drawing. -- Replace coords: allow replacing all coords regardless of original value, plus relative moving (offset) \ No newline at end of file +- Replace coords: allow replacing all coords regardless of original value, plus relative moving (offset) +- When drawing, drawn vertices now display coordinate labels. +- Calculated coordinates are now rounded down (to prevent stuff like Z:160.000001) \ No newline at end of file
--- a/src/gldraw.cpp Mon May 27 22:05:10 2013 +0300 +++ b/src/gldraw.cpp Tue May 28 02:59:54 2013 +0300 @@ -97,6 +97,7 @@ m_drawToolTip = false; m_editMode = Select; m_rectdraw = false; + m_panning = false; setFile (null); setDrawOnly (false); resetAngles (); @@ -435,8 +436,8 @@ cy *= negYFac; pos3d = g_origin; - pos3d[axisX] = cx; - pos3d[axisY] = cy; + pos3d[axisX] = atof (fmt ("%.3f", cx)); + pos3d[axisY] = atof (fmt ("%.3f", cy)); pos3d[3 - axisX - axisY] = depthValue (); return pos3d; } @@ -480,8 +481,6 @@ initGLData (); drawGLScene (); - m_hoverpos = g_origin; - QPainter paint (this); QFontMetrics metrics = QFontMetrics (QFont ()); paint.setRenderHint (QPainter::HighQualityAntialiasing); @@ -502,9 +501,6 @@ paint.drawImage (targRect, *overlay.img, srcRect); } - // Calculate 3d position of the cursor - m_hoverpos = coordconv2_3 (m_pos, true); - // Paint the coordinates onto the screen. str text = fmt ("X: %s, Y: %s, Z: %s", ftoa (m_hoverpos[X]).chars (), ftoa (m_hoverpos[Y]).chars (), ftoa (m_hoverpos[Z]).chars ()); @@ -520,61 +516,66 @@ if (editMode () == Draw) { ushort numverts; + numverts = 4; if (!m_rectdraw) numverts = m_drawedVerts.size () + 1; - else - numverts = (m_drawedVerts.size () > 0) ? 4 : 1; const short blipsize = 8; if (numverts > 0) { - QPoint* poly = new QPoint[numverts]; + QPoint poly[4]; + vertex polyverts[4]; if (!m_rectdraw) { uchar i = 0; for (vertex& vert : m_drawedVerts) { poly[i] = coordconv3_2 (vert); + polyverts[i] = vert; ++i; } // Draw the cursor vertex as the last one in the list. - if (numverts < 5) + if (numverts <= 4) { poly[i] = coordconv3_2 (m_hoverpos); - else + polyverts[i] = m_hoverpos; + } else { numverts = 4; + } } else { if (m_drawedVerts.size () > 0) { - QPoint v0 = coordconv3_2 (m_drawedVerts[0]), - v1 = coordconv3_2 ((m_drawedVerts.size () >= 2) ? m_drawedVerts[1] : m_hoverpos); - - poly[0] = QPoint (v0.x (), v0.y ()); - poly[1] = QPoint (v0.x (), v1.y ()); - poly[2] = QPoint (v1.x (), v1.y ()); - poly[3] = QPoint (v1.x (), v0.y ()); + // Get vertex information from m_rectverts + for (ushort i = 0; i < numverts; ++i) { + polyverts[i] = m_rectverts[i]; + poly[i] = coordconv3_2 (polyverts[i]); + } } else { poly[0] = coordconv3_2 (m_hoverpos); + polyverts[0] = m_hoverpos; } } + // Draw the polygon-to-be QPen pen = m_thinBorderPen; - pen.setWidth (1); - paint.setPen (pen); - paint.setBrush (QColor (128, 192, 0)); - - // Draw vertex blips - for (ushort i = 0; i < numverts; ++i) { - QPoint& blip = poly[i]; - paint.drawEllipse (blip.x () - blipsize / 2, blip.y () - blipsize / 2, - blipsize, blipsize); - } - pen.setWidth (2); pen.setColor (luma (m_bgcolor) < 40 ? Qt::white : Qt::black); paint.setPen (pen); paint.setBrush (QColor (128, 192, 0, 128)); paint.drawPolygon (poly, numverts); - delete[] poly; + // Draw vertex blips + pen = m_thinBorderPen; + pen.setWidth (1); + paint.setPen (pen); + paint.setBrush (QColor (128, 192, 0)); + + for (ushort i = 0; i < numverts; ++i) { + QPoint& blip = poly[i]; + paint.drawEllipse (blip.x () - blipsize / 2, blip.y () - blipsize / 2, + blipsize, blipsize); + + // Draw their coordinates + paint.drawText (blip.x (), blip.y () - 8, polyverts[i].stringRep (true)); + } } } } @@ -858,7 +859,9 @@ const bool wasLeft = (m_lastButtons & Qt::LeftButton) && !(ev->buttons() & Qt::LeftButton); const bool wasRight = (m_lastButtons & Qt::RightButton) && !(ev->buttons() & Qt::RightButton); const bool wasMid = (m_lastButtons & Qt::MidButton) && !(ev->buttons() & Qt::MidButton); - printf ("totalmove: %lu\n", m_totalmove); + + if (m_panning) + m_panning = false; if (wasLeft) { // Check if we selected a camera icon @@ -866,8 +869,7 @@ for (CameraIcon& info : g_CameraIcons) { if (info.destRect.contains (ev->pos ())) { setCamera (info.cam); - update (); - return; + goto end; } } } @@ -891,7 +893,6 @@ } addDrawnVertex (m_hoverpos); - update (); break; case Select: @@ -902,6 +903,7 @@ if (m_totalmove < 10 || m_rangepick) pick (ev->x (), ev->y ()); } + break; } @@ -944,10 +946,10 @@ if (m_drawedVerts.size () == 0) m_rectdraw = false; - - update (); } +end: + update (); m_totalmove = 0; } @@ -986,13 +988,22 @@ if (ev->buttons () & Qt::MidButton) { m_panX += 0.03f * dx * (zoom () / 7.5f); m_panY -= 0.03f * dy * (zoom () / 7.5f); + m_panning = true; } // Start the tool tip timer if (!m_drawToolTip) m_toolTipTimer->start (1000); + // Update 2d position m_pos = ev->pos (); + + // Calculate 3d position of the cursor + m_hoverpos = (camera () != Free) ? coordconv2_3 (m_pos, true) : g_origin; + + // Update rect vertices since m_hoverpos may have changed + updateRectVerts (); + update (); } @@ -1213,20 +1224,11 @@ if (m_rectdraw) { LDQuad* quad = new LDQuad; - vertex v0 = m_drawedVerts[0], - v1 = m_drawedVerts[1]; - const Axis axisX = cameraAxis (false), - axisY = cameraAxis (true); - memset (quad->coords, 0, sizeof quad->coords); - quad->coords[0][axisX] = v0[axisX]; - quad->coords[0][axisY] = v0[axisY]; - quad->coords[1][axisX] = v1[axisX]; - quad->coords[1][axisY] = v0[axisY]; - quad->coords[2][axisX] = v1[axisX]; - quad->coords[2][axisY] = v1[axisY]; - quad->coords[3][axisX] = v0[axisX]; - quad->coords[3][axisY] = v1[axisY]; + // Copy the vertices from m_rectverts + updateRectVerts (); + memcpy (quad->coords, m_rectverts, sizeof quad->coords); + quad->color = maincolor; obj = quad; } else { @@ -1314,7 +1316,8 @@ } // Mark in known vertices of this object - m_knownVerts << getVertices (obj); + vector<vertex> verts = getVertices (obj); + m_knownVerts << verts; m_knownVerts.makeUnique (); obj->m_glinit = true; @@ -1465,6 +1468,7 @@ setZoom (zoom () + (inward ? -1.2f : 1.2f)); } +// ============================================================================= void GLRenderer::zoomToFit () { if (file () == null) { setZoom (30.0f); @@ -1540,4 +1544,36 @@ setBackground (); m_picking = false; +} + +// ============================================================================= +void GLRenderer::updateRectVerts () { + if (!m_rectdraw) + return; + + if (m_drawedVerts.size () == 0) { + for (int i = 0; i < 4; ++i) + m_rectverts[i] = m_hoverpos; + + return; + } + + vertex v0 = m_drawedVerts[0], + v1 = (m_drawedVerts.size () >= 2) ? m_drawedVerts[1] : m_hoverpos; + + const Axis ax = cameraAxis (false), + ay = cameraAxis (true), + az = (Axis) (3 - ax - ay); + + for (int i = 0; i < 4; ++i) + m_rectverts[i][az] = depthValue (); + + m_rectverts[0][ax] = v0[ax]; + m_rectverts[0][ay] = v0[ay]; + m_rectverts[1][ax] = v1[ax]; + m_rectverts[1][ay] = v0[ay]; + m_rectverts[2][ax] = v1[ax]; + m_rectverts[2][ay] = v1[ay]; + m_rectverts[3][ax] = v0[ax]; + m_rectverts[3][ay] = v1[ay]; } \ No newline at end of file
--- a/src/gldraw.h Mon May 27 22:05:10 2013 +0300 +++ b/src/gldraw.h Tue May 28 02:59:54 2013 +0300 @@ -121,21 +121,25 @@ ushort m_width, m_height; vector<vertex> m_drawedVerts; bool m_rectdraw; + vertex m_rectverts[4]; QColor m_bgcolor; double m_depthValues[6]; overlayMeta m_overlays[6]; vector<vertex> m_knownVerts; + bool m_panning; - void addDrawnVertex (vertex m_hoverpos); - void calcCameraIcons (); // Compute geometry for camera icons - void clampAngle (double& angle) const; // Clamps an angle to [0, 360] - void compileList (LDObject* obj, const ListType list); // Compile one of the lists of an object - void compileSubObject (LDObject* obj, const GLenum gltype); // Sub-routine for object compiling - void compileVertex (const vertex& vrt); // Compile a single vertex to a list - vertex coordconv2_3 (const QPoint& pos2d, bool snap) const; // Convert a 2D point to a 3D point - QPoint coordconv3_2 (const vertex& pos3d) const; // Convert a 3D point to a 2D point - void pick (uint mouseX, uint mouseY); // Perform object selection - void setObjectColor (LDObject* obj, const ListType list); // Set the color to an object list + void addDrawnVertex (vertex m_hoverpos); + void calcCameraIcons (); // Compute geometry for camera icons + void clampAngle (double& angle) const; // Clamps an angle to [0, 360] + void compileList (LDObject* obj, const ListType list); // Compile one of the lists of an object + void compileSubObject (LDObject* obj, const GLenum gltype); // Sub-routine for object compiling + void compileVertex (const vertex& vrt); // Compile a single vertex to a list + vertex coordconv2_3 (const QPoint& pos2d, bool snap) const; // Convert a 2D point to a 3D point + QPoint coordconv3_2 (const vertex& pos3d) const; // Convert a 3D point to a 2D point + void buildKnownVertBlips (); + void updateRectVerts (); + void pick (uint mouseX, uint mouseY); // Perform object selection + void setObjectColor (LDObject* obj, const ListType list); // Set the color to an object list private slots: void slot_toolTipTimer ();
