ldforge: comparison src/gldraw.cpp

-:bd005c78a089
+:cb931c2d1e8b
 	m_virtHeight = (m_height * m_virtWidth) / m_width;
 	initGLData();
 	drawGLScene();
+	QPen textpen = getTextPen();
 	QPainter paint (this);
 	QFontMetrics metrics = QFontMetrics (QFont());
 	paint.setRenderHint (QPainter::HighQualityAntialiasing);
 	// If we wish to only draw the brick, stop here
 		QFontMetrics metrics = QFontMetrics (font());
 		QRect textSize = metrics.boundingRect (0, 0, m_width, m_height, Qt::AlignCenter, text);
 		paint.setPen (getTextPen());
 		paint.drawText (m_width - textSize.width(), m_height - 16, textSize.width(),
-						textSize.height(), Qt::AlignCenter, text);
+			textSize.height(), Qt::AlignCenter, text);
+		QPen linepen = m_thinBorderPen;
+		linepen.setWidth (2);
+		linepen.setColor (luma (m_bgcolor) < 40 ? Qt::white : Qt::black);
 		// If we're drawing, draw the vertices onto the screen.
 		if (editMode() == Draw)
 		{	int numverts = 4;
 						polyverts[0] = m_hoverpos;
 					}
 				}
 				// Draw the polygon-to-be
-				QPen pen = m_thinBorderPen;
+				paint.setPen (linepen);
-				pen.setWidth (2);
-				pen.setColor (luma (m_bgcolor) < 40 ? Qt::white : Qt::black);
-				paint.setPen (pen);
 				paint.setBrush (QColor (64, 192, 0, 128));
 				paint.drawPolygon (poly, numverts);
 				// Draw vertex blips
 				for (int i = 0; i < numverts; ++i)
 					// Draw their coordinates
 					paint.drawText (blip.x(), blip.y() - 8, polyverts[i].stringRep (true));
 				}
 			}
 		}
 		elif (editMode() == CircleMode)
 		{	// If we have not specified the center point of the circle yet, preview it on the screen.
 			if (m_drawedVerts.size() == 0)
 				drawBlip (paint, coordconv3_2 (m_hoverpos));
 			else
 			{	QVector<vertex> verts;
 				const double dist = circleDrawDist();
 				const int segs = lores;
 				const double angleUnit = (2 * pi) / segs;
 				Axis relX, relY;
+				QVector<QPoint> points;
 				getRelativeAxes (relX, relY);
 				for (int i = 0; i < segs; ++i)
 				{	vertex v = g_origin;
 					v[relX] = m_drawedVerts[0][relX] + (cos (i * angleUnit) * dist);
 					v[relY] = m_drawedVerts[0][relY] + (sin (i * angleUnit) * dist);
 					verts << v;
 				}
-				QVector<QPoint> points;
+				for (const vertex& v : verts)
-			for (const vertex & v : verts)
 				{	QPoint point = coordconv3_2 (v);
 					drawBlip (paint, point);
 					points << point;
 				}
-				QPen pen = m_thinBorderPen;
+				paint.setPen (linepen);
-				pen.setWidth (2);
-				pen.setColor (luma (m_bgcolor) < 40 ? Qt::white : Qt::black);
-				paint.setPen (pen);
 				paint.setBrush (Qt::NoBrush);
 				paint.drawPolygon (QPolygon (points));
+				{ // Draw the current radius in the middle of the circle.
+					QPoint origin = coordconv3_2 (m_drawedVerts[0]);
+					str label = str::number (dist);
+					paint.setPen (textpen);
+					paint.drawText (origin.x() - (metrics.width (label) / 2), origin.y(), label);
+				}
 			}
 		}
 	}
 	// Camera icons
 		paint.setPen (m_thinBorderPen);
 		paint.setBrush (QBrush (QColor (0, 128, 160, 128)));
 		paint.drawRect (m_cameraIcons[camera()].selRect);
 		// Draw the actual icons
-	for (CameraIcon & info : m_cameraIcons)
+		for (CameraIcon& info : m_cameraIcons)
 		{	// Don't draw the free camera icon when in draw mode
 			if (&info == &m_cameraIcons[GL::Free] && editMode() != Select)
 				continue;
 			paint.drawPixmap (info.destRect, *info.img, info.srcRect);
 		}
 		str fmtstr = tr ("%1 Camera");
 		// Draw a label for the current camera in the bottom left corner
-		{	const ushort margin = 4;
+		{	const int margin = 4;
 			str label;
 			label = fmt (fmtstr, tr (g_CameraNames[camera()]));
-			paint.setPen (getTextPen());
+			paint.setPen (textpen);
 			paint.drawText (QPoint (margin, height() - (margin + metrics.descent())), label);
 		}
 		// Tool tips
 		if (m_drawToolTip)
 	if (msglog())
 	{	int y = 0;
 		const int margin = 2;
 		QColor penColor = getTextPen();
-	for (const MessageManager::Line & line : msglog()->getLines())
+		for (const MessageManager::Line& line : msglog()->getLines())
 		{	penColor.setAlphaF (line.alpha);
 			paint.setPen (penColor);
 			paint.drawText (QPoint (margin, y + margin + metrics.ascent()), line.text);
 			y += metrics.height();
 		}
 	}
 	// If we're range-picking, draw a rectangle encompassing the selection area.
 	if (m_rangepick && !m_picking && m_totalmove >= 10)
-	{	const short x0 = m_rangeStart.x(),
+	{	int x0 = m_rangeStart.x(),
-						y0 = m_rangeStart.y(),
+			y0 = m_rangeStart.y(),
-						x1 = m_pos.x(),
+			x1 = m_pos.x(),
-						y1 = m_pos.y();
+			y1 = m_pos.y();
 		QRect rect (x0, y0, x1 - x0, y1 - y0);
 		QColor fillColor = (m_addpick ? "#40FF00" : "#00CCFF");
 		fillColor.setAlphaF (0.2f);
 		m_panning = false;
 	if (wasLeft)
 	{	// Check if we selected a camera icon
 		if (!m_rangepick)
-	{	for (CameraIcon & info : m_cameraIcons)
+		{	for (CameraIcon & info : m_cameraIcons)
 			{	if (info.destRect.contains (ev->pos()))
 				{	setCamera (info.cam);
 					goto end;
 				}
 			}
 		}
 		switch (editMode())
-		{	case Draw:
+		{
+			case Draw:
-				if (m_rectdraw)
+			{	if (m_rectdraw)
 				{	if (m_drawedVerts.size() == 2)
 					{	endDraw (true);
 						return;
 					}
 				}
 						updateRectVerts();
 					}
 				}
 				addDrawnVertex (m_hoverpos);
-				break;
+			} break;
 			case CircleMode:
+			{	if (m_drawedVerts.size() == 2)
-				if (m_drawedVerts.size() == 2)
 				{	endDraw (true);
 					return;
 				}
 				addDrawnVertex (m_hoverpos);
-				break;
+			} break;
 			case Select:
+			{	if (!drawOnly())
-				if (!drawOnly())
 				{	if (m_totalmove < 10)
 						m_rangepick = false;
 					if (!m_rangepick)
 						m_addpick = (m_keymods & Qt::ControlModifier);
 					if (m_totalmove < 10 || m_rangepick)
 						pick (ev->x(), ev->y());
 				}
+			} break;
-				break;
 		}
 		m_rangepick = false;
 	}
 		vertex closest;
 		bool valid = false;
 		QPoint curspos = coordconv3_2 (m_hoverpos);
-	for (const vertex & pos3d: m_knownVerts)
+		for (const vertex& pos3d: m_knownVerts)
 		{	QPoint pos2d = coordconv3_2 (pos3d);
 			// Measure squared distance
 			const double dx = abs (pos2d.x() - curspos.x()),
 						 dy = abs (pos2d.y() - curspos.y()),
 SET_ACCESSOR (EditMode, GLRenderer::setEditMode)
 {	m_editMode = val;
 	switch (editMode())
 	{	case Select:
-			unsetCursor();
+		{	unsetCursor();
 			setContextMenuPolicy (Qt::DefaultContextMenu);
-			break;
+		} break;
 		case Draw:
 		case CircleMode:
+		{	// Cannot draw into the free camera - use top instead.
-			// Cannot draw into the free camera - use top instead.
 			if (m_camera == Free)
 				setCamera (Top);
 			// Disable the context menu - we need the right mouse button
 			// for removing vertices.
 			// FIXME: make the selection clearing stuff in ::pick a method and use it
 			// here! This code doesn't update the GL lists.
 			g_win->sel().clear();
 			g_win->updateSelection();
 			m_drawedVerts.clear();
-			break;
+		} break;
 	}
 	g_win->updateEditModeActions();
 	update();
 }
 			matrix transform = g_circleDrawTransforms[camera() % 3];
 			for (int i = 0; i < 9; ++i)
 			{	if (transform[i] == 2)
 					transform[i] = dist;
 				elif (transform[i] == 1 && camera() >= 3)
-				transform[i] = -1;
+					transform[i] = -1;
 			}
 			LDSubfile* ref = new LDSubfile;
 			ref->setFileInfo (findLoadedFile ("4-4edge.dat"));
 			ref->setTransform (transform);

Mercurial > ldforge / file comparison

comparison: src/gldraw.cpp

src/gldraw.cpp