ldforge: comparison src/glRenderer.cpp

-:413ecd6b9801
+:fa025ba493d8
 	if (camera() == EFreeCamera)
 		return Origin;
 	Vertex pos3d;
 	const LDFixedCamera* cam = &g_FixedCameras[camera()];
-	const Axis axisX = cam->localX;
+	Axis axisX = cam->localX;
-	const Axis axisY = cam->localY;
+	Axis axisY = cam->localY;
-	const int negXFac = cam->negatedX ? -1 : 1,
+	int signX = cam->negatedX ? -1 : 1;
-				negYFac = cam->negatedY ? -1 : 1;
+	int signY = cam->negatedY ? -1 : 1;
 	// Calculate cx and cy - these are the LDraw unit coords the cursor is at.
 	double cx = (-m_virtualWidth + ((2 * pos2d.x() * m_virtualWidth) / m_width) - panning (X));
 	double cy = (m_virtualHeight - ((2 * pos2d.y() * m_virtualHeight) / m_height) - panning (Y));
 	if (snap)
 	{
-		cx = Grid::Snap (cx, Grid::Coordinate);
+		cx = snapToGrid (cx, Grid::Coordinate);
-		cy = Grid::Snap (cy, Grid::Coordinate);
+		cy = snapToGrid (cy, Grid::Coordinate);
 	}
-	cx *= negXFac;
+	cx *= signX;
-	cy *= negYFac;
+	cy *= signY;
-	RoundToDecimals (cx, 4);
+	roundToDecimals (cx, 4);
-	RoundToDecimals (cy, 4);
+	roundToDecimals (cy, 4);
 	// Create the vertex from the coordinates
 	pos3d.setCoordinate (axisX, cx);
 	pos3d.setCoordinate (axisY, cy);
 	pos3d.setCoordinate ((Axis) (3 - axisX - axisY), getDepthValue());
 // =============================================================================
 //
 void GLRenderer::paintEvent (QPaintEvent*)
 {
-	doMakeCurrent();
+	makeCurrent();
 	m_virtualWidth = zoom();
 	m_virtualHeight = (m_height * m_virtualWidth) / m_width;
 	initGLData();
 	drawGLScene();
-	QPainter paint (this);
+	QPainter painter (this);
 	QFontMetrics metrics = QFontMetrics (QFont());
-	paint.setRenderHint (QPainter::HighQualityAntialiasing);
+	painter.setRenderHint (QPainter::Antialiasing);
+	painter.setRenderHint (QPainter::HighQualityAntialiasing);
 	// If we wish to only draw the brick, stop here
 	if (isDrawOnly())
 		return;
 	if (not isPicking())
 	{
 		QString text = format ("Rotation: (%1°, %2°, %3°)\nPanning: (%4, %5), Zoom: %6",
 			rotation(X), rotation(Y), rotation(Z), panning(X), panning(Y), zoom());
 		QRect textSize = metrics.boundingRect (0, 0, m_width, m_height, Qt::AlignCenter, text);
-		paint.setPen (textPen());
+		painter.setPen (textPen());
-		paint.drawText ((width() - textSize.width()) / 2, height() - textSize.height(), textSize.width(),
+		painter.drawText ((width() - textSize.width()) / 2, height() - textSize.height(), textSize.width(),
 			textSize.height(), Qt::AlignCenter, text);
 	}
 #endif
 	if (camera() != EFreeCamera and not isPicking())
 		{
 			QPoint v0 = convert3dTo2d (currentDocumentData().overlays[camera()].v0);
 			QPoint v1 = convert3dTo2d (currentDocumentData().overlays[camera()].v1);
 			QRect targetRect (v0.x(), v0.y(), qAbs (v1.x() - v0.x()), qAbs (v1.y() - v0.y()));
 			QRect sourceRect (0, 0, overlay.img->width(), overlay.img->height());
-			paint.drawImage (targetRect, *overlay.img, sourceRect);
+			painter.drawImage (targetRect, *overlay.img, sourceRect);
 		}
 		// Paint the coordinates onto the screen.
 		QString text = format (tr ("X: %1, Y: %2, Z: %3"), m_position3D[X], m_position3D[Y], m_position3D[Z]);
 		QFontMetrics metrics = QFontMetrics (font());
 		QRect textSize = metrics.boundingRect (0, 0, m_width, m_height, Qt::AlignCenter, text);
-		paint.setPen (textPen());
+		painter.setPen (textPen());
-		paint.drawText (m_width - textSize.width(), m_height - 16, textSize.width(),
+		painter.drawText (m_width - textSize.width(), m_height - 16, textSize.width(),
 			textSize.height(), Qt::AlignCenter, text);
 	}
 	if (not isPicking())
 	{
 		// Draw edit mode HUD
-		m_currentEditMode->render (paint);
+		m_currentEditMode->render (painter);
 		// Draw a background for the selected camera
-		paint.setPen (m_thinBorderPen);
+		painter.setPen (m_thinBorderPen);
-		paint.setBrush (QBrush (QColor (0, 128, 160, 128)));
+		painter.setBrush (QBrush (QColor (0, 128, 160, 128)));
-		paint.drawRect (m_cameraIcons[camera()].selRect);
+		painter.drawRect (m_cameraIcons[camera()].selRect);
 		// Draw the camera icons
 		for (CameraIcon& info : m_cameraIcons)
 		{
 			// Don't draw the free camera icon when we can't use the free camera
 			if (&info == &m_cameraIcons[EFreeCamera] and not m_currentEditMode->allowFreeCamera())
 				continue;
-			paint.drawPixmap (info.targetRect, *info.image, info.sourceRect);
+			painter.drawPixmap (info.targetRect, *info.image, info.sourceRect);
 		}
 		// Draw a label for the current camera in the bottom left corner
 		{
 			const int margin = 4;
-			paint.setPen (textPen());
+			painter.setPen (textPen());
-			paint.drawText (QPoint (margin, height() - (margin + metrics.descent())), currentCameraName());
+			painter.drawText (QPoint (margin, height() - (margin + metrics.descent())), currentCameraName());
 		}
 		// Tool tips
 		if (m_drawToolTip)
 		{
 		QColor penColor = textPen().color();
 		for (const MessageManager::Line& line : messageLog()->getLines())
 		{
 			penColor.setAlphaF (line.alpha);
-			paint.setPen (penColor);
+			painter.setPen (penColor);
-			paint.drawText (QPoint (margin, y + margin + metrics.ascent()), line.text);
+			painter.drawText (QPoint (margin, y + margin + metrics.ascent()), line.text);
 			y += metrics.height();
 		}
 	}
 }
 // =============================================================================
 //
 void GLRenderer::wheelEvent (QWheelEvent* ev)
 {
-	doMakeCurrent();
+	makeCurrent();
 	zoomNotch (ev->delta() > 0);
 	zoom() = qBound (0.01, zoom(), 10000.0);
 	m_isCameraMoving = true;
 	update();
 	ev->accept();
 // =============================================================================
 //
 void GLRenderer::pick (QRect const& range, bool additive)
 {
-	doMakeCurrent();
+	makeCurrent();
 	// Clear the selection if we do not wish to add to it.
 	if (not additive)
 	{
 		LDObjectList oldSelection = selectedObjects();
 	const int areawidth = (x1 - x0);
 	const int areaheight = (y1 - y0);
 	const qint32 numpixels = areawidth * areaheight;
 	// Allocate space for the pixel data.
-	uchar* const pixeldata = new uchar[4 * numpixels];
+	QVector<unsigned char> pixeldata (4 * numpixels);
-	uchar* pixelptr = &pixeldata[0];
+	unsigned char* pixelcursor = pixeldata.data();
 	// Read pixels from the color buffer.
-	glReadPixels (x0, m_height - y1, areawidth, areaheight, GL_RGBA, GL_UNSIGNED_BYTE, pixeldata);
+	glReadPixels (x0, m_height - y1, areawidth, areaheight, GL_RGBA, GL_UNSIGNED_BYTE, pixeldata.data());
 	LDObject* removedObj = nullptr;
-	QList<qint32> indices;
+	QSet<qint32> indices;
 	// Go through each pixel read and add them to the selection.
 	// Note: black is background, those indices are skipped.
 	for (qint32 i = 0; i < numpixels; ++i)
 	{
-		qint32 idx =
+		qint32 idx = (pixelcursor[0] * 0x10000) + (pixelcursor[1] * 0x100) + pixelcursor[2];
-			(*(pixelptr + 0) * 0x10000) +
+		pixelcursor += 4;
-			(*(pixelptr + 1) * 0x100) +
-			*(pixelptr + 2);
-		pixelptr += 4;
 		if (idx != 0)
 			indices << idx;
 	}
-	removeDuplicates (indices);
 	for (qint32 idx : indices)
 	{
 		LDObject* obj = LDObject::fromID (idx);
 		}
 		obj->select();
 	}
-	delete[] pixeldata;
 	// Update everything now.
 	m_window->updateSelection();
 	// Recompile the objects now to update their color
 	for (LDObject* obj : selectedObjects())
 	setPicking (false);
 	repaint();
 }
 //
-// Simpler version of GLRenderer::pick which simply picks whatever object on the screen
+// Simpler version of GLRenderer::pick which simply picks whatever object on the cursor
 //
 LDObject* GLRenderer::pickOneObject (int mouseX, int mouseY)
 {
 	uchar pixel[4];
-	doMakeCurrent();
+	makeCurrent();
 	setPicking (true);
 	drawGLScene();
 	glReadPixels (mouseX, m_height - mouseY, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel);
 	LDObject* obj = LDObject::fromID ((pixel[0] * 0x10000) + (pixel[1] * 0x100) + pixel[2]);
 	setPicking (false);
 QPointF const& GLRenderer::mousePositionF() const
 {
 	return m_mousePositionF;
 }
-void GLRenderer::doMakeCurrent()
+void GLRenderer::makeCurrent()
 {
-	makeCurrent();
+	QGLWidget::makeCurrent();
 	initializeOpenGLFunctions();
 }
 int GLRenderer::depthNegateFactor() const
 {

Mercurial > ldforge / file comparison

comparison: src/glRenderer.cpp

src/glRenderer.cpp