ldforge: comparison src/glrenderer.cpp

-:241d3e452b32
+:1a77c6156db7
 #include "glcompiler.h"
 #include "primitives.h"
 #include "documentmanager.h"
 #include "grid.h"
+static GLCamera const cameraTemplates[7] = {
+	{"Top camera", {gl::topCameraMatrix, X, Z, false, false, false}},
+	{"Front camera", {gl::frontCameraMatrix, X, Y, false,  true, false}},
+	{"Left camera", {gl::leftCameraMatrix, Z, Y,  true,  true, false}},
+	{"Bottom camera", {gl::bottomCameraMatrix, X, Z, false,  true, true}},
+	{"Back camera", {gl::backCameraMatrix, X, Y,  true,  true, true}},
+	{"Right camera", {gl::rightCameraMatrix, Z, Y, false,  true, true}},
+	{"Free camera", GLCamera::FreeCamera},
+};
 /*
 * Constructs a GL renderer.
 */
-gl::Renderer::Renderer(const Model* model, QWidget* parent) :
+gl::Renderer::Renderer(const Model* model, CameraType cameraType, QWidget* parent) :
 QGLWidget {parent},
 HierarchyElement {parent},
 m_model {model},
-m_cameras {
+	m_camera {cameraType},
-{"Top camera", {topCameraMatrix, X, Z, false, false, false}}, // top
+	m_cameraInfo {::cameraTemplates[cameraType]}
-{"Front camera", {frontCameraMatrix, X, Y, false,  true, false}}, // front
-{"Left camera", {leftCameraMatrix, Z, Y,  true,  true, false}}, // left
-{"Bottom camera", {bottomCameraMatrix, X, Z, false,  true, true}}, // bottom
-{"Back camera", {backCameraMatrix, X, Y,  true,  true, true}}, // back
-{"Right camera", {rightCameraMatrix, Z, Y, false,  true, true}}, // right
-{"Free camera", GLCamera::FreeCamera}, // free
-}
 {
 	Q_ASSERT(model != nullptr);
-	m_camera = (gl::CameraType) config::camera();
 	m_compiler = new gl::Compiler (this);
 	m_toolTipTimer = new QTimer (this);
 	m_toolTipTimer->setSingleShot (true);
 	setAcceptDrops (true);
 	connect (m_toolTipTimer, SIGNAL (timeout()), this, SLOT (showCameraIconTooltip()));
-	resetAllAngles();
+	resetAngles();
 	m_needZoomToFit = true;
-	// Init camera icons
-	for (gl::CameraType camera : iterateEnum<gl::CameraType>())
-	{
-		const char* cameraIconNames[EnumLimits<gl::CameraType>::Count] =
-		{
-		    "camera-top", "camera-front", "camera-left",
-		    "camera-bottom", "camera-back", "camera-right",
-		    "camera-free"
-		};
-		CameraIcon* info = &m_cameraIcons[static_cast<int>(camera)];
-		info->image = MainWindow::getIcon (cameraIconNames[static_cast<int>(camera)]);
-		info->camera = camera;
-	}
 	connect(
 		this->m_compiler,
 		&gl::Compiler::sceneChanged,
 		this,
 		qOverload<>(&gl::Renderer::update)
 	);
-	calcCameraIcons();
 }
 /*
 * Destructs the GL renderer.
 */
 		m_axesInitialized = false;
 	}
 }
 /*
-* Calculates the camera icon locations.
-*/
-void gl::Renderer::calcCameraIcons()
-{
-	int i = 0;
-	const int columns = 3;
-	const int firstAtLastRow = countof(m_cameras) - (countof(m_cameras) % columns);
-	for (CameraIcon& cameraIcon : m_cameraIcons)
-	{
-		int row = i / columns;
-		int column = i % columns;
-		// Do right-justifying on the last row.
-		if (i >= firstAtLastRow)
-			column += columns - (countof(m_cameras) % columns);
-		int x1 = width() - 48 + (column * 16) - 1;
-		int y1 = (row * 16) + 1;
-		cameraIcon.sourceRect = {0, 0, 16, 16};
-		cameraIcon.targetRect = {x1, y1, 16, 16};
-		cameraIcon.hitRect = {
-		    cameraIcon.targetRect.x(),
-		    cameraIcon.targetRect.y(),
-		    cameraIcon.targetRect.width() + 1,
-		    cameraIcon.targetRect.height() + 1
-		};
-		++i;
-	}
-}
-/*
 * Returns the camera currently in use.
 */
 GLCamera& gl::Renderer::currentCamera()
 {
-	return m_cameras[static_cast<int>(camera())];
+	return m_cameraInfo;
 }
 /*
 * Returns the camera currently in use.
 */
 const GLCamera& gl::Renderer::currentCamera() const
 {
-	return m_cameras[static_cast<int>(camera())];
+	return m_cameraInfo;
 }
 /*
 * Prepares the GL context for rendering.
 */
 		m_rotation = QQuaternion::fromAxisAndAngle({1, 0, 0}, 30);
 		m_rotation *= QQuaternion::fromAxisAndAngle({0, 1, 0}, 330);
 	}
 	currentCamera().setPanning(0, 0);
 	needZoomToFit();
-}
-// =============================================================================
-//
-void gl::Renderer::resetAllAngles()
-{
-	gl::CameraType const oldCamera = camera();
-	for (gl::CameraType camera : iterateEnum<gl::CameraType>())
-	{
-		setCamera(camera);
-		resetAngles();
-	}
-	setCamera(oldCamera);
 }
 // =============================================================================
 //
 void gl::Renderer::initializeGL()
 	m_compiler->initialize();
 	initializeAxes();
 	initializeLighting();
 	m_initialized = true;
 	// Now that GL is initialized, we can reset angles.
-	resetAllAngles();
+	resetAngles();
 }
 void gl::Renderer::initializeLighting()
 {
 	GLfloat materialShininess[] = {5.0};
 // =============================================================================
 //
 void gl::Renderer::resizeGL (int width, int height)
 {
-	calcCameraIcons();
 	glViewport (0, 0, width, height);
 	glMatrixMode (GL_PROJECTION);
 	glLoadIdentity();
 	gluPerspective (45.0f, (double) width / (double) height, near, far);
 	glMatrixMode (GL_MODELVIEW);
 	// Unfortunately Qt does not provide a resized() signal so we have to manually feed the information.
-	for (GLCamera& camera : m_cameras)
+	m_cameraInfo.rendererResized(width, height);
-		camera.rendererResized(width, height);
 }
 /*
 * Pads a 3×3 matrix into a 4×4 one by adding cells from the identity matrix.
 */
 	if (config::lighting() and not m_isDrawingSelectionScene)
 		glEnable(GL_LIGHTING);
 	else
 		glDisable(GL_LIGHTING);
-	if (camera() != gl::FreeCamera)
+	if (not m_cameraInfo.isModelview())
 	{
 		glMatrixMode (GL_PROJECTION);
 		glPushMatrix();
 		glLoadIdentity();
 		glMultMatrixf(currentCamera().realMatrix().constData());
 	overpaint(painter);
 }
 void gl::Renderer::overpaint(QPainter &painter)
 {
-	// Draw a background for the selected camera
-	painter.setPen(thinBorderPen);
-	painter.setBrush(QBrush {QColor {0, 128, 160, 128}});
-	painter.drawRect(m_cameraIcons[static_cast<int>(camera())].hitRect);
-	// Draw the camera icons
-	for (const CameraIcon& info : m_cameraIcons)
-	{
-		// Don't draw the free camera icon when we can't use the free camera
-		if (info.camera == gl::FreeCamera and not freeCameraAllowed())
-			continue;
-		painter.drawPixmap(info.targetRect, info.image, info.sourceRect);
-	}
 	// Draw a label for the current camera in the bottom left corner
 	{
 		QFontMetrics metrics {QFont {}};
 		int margin = 4;
 		painter.setPen(textPen());
 // =============================================================================
 //
 void gl::Renderer::mouseReleaseEvent(QMouseEvent* event)
 {
-	bool wasLeft = (m_lastButtons & Qt::LeftButton) and not (event->buttons() & Qt::LeftButton);
+	ignore(event);
 	m_panning = false;
-	// Check if we selected a camera icon
-	if (wasLeft and not mouseHasMoved())
-	{
-		for (CameraIcon& info : m_cameraIcons)
-		{
-			if (info.targetRect.contains (event->pos()))
-			{
-				setCamera (info.camera);
-				break;
-			}
-		}
-	}
 	update();
 	m_totalMouseMove = 0;
 }
 // =============================================================================
 	{
 		currentCamera().pan(xMove, yMove);
 		m_panning = true;
 		m_isCameraMoving = true;
 	}
-	else if (left and camera() == gl::FreeCamera and (xMove != 0 or yMove != 0))
+	else if (left and m_cameraInfo.isModelview() and (xMove != 0 or yMove != 0))
 	{
 		QQuaternion versor = QQuaternion::fromAxisAndAngle(yMove, xMove, 0, 0.6 * hypot(xMove, yMove));
 		m_rotation = versor * m_rotation;
 		m_isCameraMoving = true;
 	}
 //
 void gl::Renderer::leaveEvent(QEvent*)
 {
 	m_toolTipTimer->stop();
 	update();
-}
-// =============================================================================
-//
-void gl::Renderer::setCamera(gl::CameraType camera)
-{
-	// The edit mode may forbid the free camera.
-	if (freeCameraAllowed() or camera != gl::FreeCamera)
-	{
-		m_camera = camera;
-		config::setCamera(static_cast<int>(camera));
-	}
 }
 /*
 * Resolves a pixel pointer to an RGB color.
 * pixel[0..2] must be valid.
 	glReadPixels(0, 0, width(), height(), GL_RGBA, GL_UNSIGNED_BYTE, pixelData.data());
 	// Prepare the image and return it. It appears that GL and Qt formats have red and blue swapped and the Y axis flipped.
 	QImage image {pixelData.constData(), width(), height(), QImage::Format_ARGB32};
 	return image.rgbSwapped().mirrored();
-}
-/*
-* Show a tooltip if the cursor is currently hovering over a camera icon.
-*/
-void gl::Renderer::showCameraIconTooltip()
-{
-	for (CameraIcon & icon : m_cameraIcons)
-	{
-		if (icon.targetRect.contains (m_mousePosition))
-		{
-			QToolTip::showText(m_globalpos, m_cameras[static_cast<int>(icon.camera)].name());
-			update();
-			break;
-		}
-	}
 }
 // =============================================================================
 //
 void gl::Renderer::zoomToFit()

Mercurial > ldforge / file comparison

comparison: src/glrenderer.cpp

src/glrenderer.cpp