ldforge: comparison src/gldraw.cpp

-:3f9067022d74
+:0737c217a54d
 #include <QGLWidget>
 #include <QWheelEvent>
 #include <QMouseEvent>
 #include <QContextMenuEvent>
 #include <QInputDialog>
+#include <QTimer>
 #include <GL/glu.h>
 #include "common.h"
 #include "config.h"
 #include "file.h"
 	m_picking = m_rangepick = false;
 	m_camera = (GL::Camera) gl_camera.value;
 	m_drawToolTip = false;
 	m_editMode = Select;
 	m_rectdraw = false;
+	setFile (null);
+	setDrawOnly (false);
 	m_toolTipTimer = new QTimer (this);
 	m_toolTipTimer->setSingleShot (true);
 	connect (m_toolTipTimer, SIGNAL (timeout ()), this, SLOT (slot_toolTipTimer ()));
 	m_rotY = 325.f;
 	m_panX = m_panY = m_rotZ = 0.0f;
 	// Set the default zoom based on the bounding box
 	if (g_BBox.empty () == false)
-		m_zoom = g_BBox.size () * 6;
+		setZoom (g_BBox.size () * 6);
 	else
-		m_zoom = 30.0f;
+		setZoom (30.0f);
 }
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
 	if (list == GL::PickList) {
 		// Make the color by the object's index color if we're picking, so we can
 		// make the index from the color we get from the picking results. Be sure
 		// to use the top level parent's index since inlinees don't have an index.
-		long i = obj->topLevelParent ()->getIndex (g_curfile);
+		long i = obj->topLevelParent ()->getIndex (file ());
 		// We should have the index now.
 		assert (i != -1);
 		// Calculate a color based from this index. This method caters for
 	glLoadIdentity ();
 	gluPerspective (45.0f, (double) w / (double) h, 1.0f, 10000.0f);
 	glMatrixMode (GL_MODELVIEW);
 }
-void GLRenderer::drawGLScene () const {
+void GLRenderer::drawGLScene () {
-	if (g_curfile == null)
+	if (file () == null)
 		return;
 	if (gl_wireframe && !picking ())
 		glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
 		glMatrixMode (GL_MODELVIEW);
 		glPushMatrix ();
 		glLoadIdentity ();
 		glTranslatef (0.0f, 0.0f, -2.0f);
-		glTranslatef (m_panX, m_panY, -m_zoom);
+		glTranslatef (m_panX, m_panY, -zoom ());
 		glRotatef (m_rotX, 1.0f, 0.0f, 0.0f);
 		glRotatef (m_rotY, 0.0f, 1.0f, 0.0f);
 		glRotatef (m_rotZ, 0.0f, 0.0f, 1.0f);
 	}
-	if (gl_colorbfc && !m_picking) {
+	const GL::ListType list = (!drawOnly () && m_picking) ? PickList : NormalList;
+	if (gl_colorbfc && !m_picking && !drawOnly ()) {
 		glEnable (GL_CULL_FACE);
-		for (LDObject* obj : g_curfile->objs ()) {
+		for (LDObject* obj : file ()->objs ()) {
 			if (obj->hidden ())
 				continue;
 			glCullFace (GL_BACK);
 			glCallList (obj->glLists[BFCFrontList]);
 			glCallList (obj->glLists[BFCBackList]);
 		}
 		glDisable (GL_CULL_FACE);
 	} else {
-		for (LDObject* obj : g_curfile->objs ()) {
+		for (LDObject* obj : file ()->objs ()) {
 			if (obj->hidden ())
 				continue;
-			glCallList (obj->glLists[(m_picking) ? PickList : NormalList]);
+			glCallList (obj->glLists[list]);
 		}
 	}
-	if (gl_axes && !m_picking)
+	if (gl_axes && !m_picking && !drawOnly ())
 		glCallList (m_axeslist);
 	glPopMatrix ();
 	glMatrixMode (GL_MODELVIEW);
 	glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
 void GLRenderer::paintEvent (QPaintEvent* ev) {
 	Q_UNUSED (ev)
-	m_virtWidth = m_zoom;
+	makeCurrent ();
+	m_virtWidth = zoom ();
 	m_virtHeight = (m_height * m_virtWidth) / m_width;
 	initGLData ();
 	drawGLScene ();
 	m_hoverpos = g_origin;
 	QPainter paint (this);
 	QFontMetrics metrics = QFontMetrics (QFont ());
 	paint.setRenderHint (QPainter::HighQualityAntialiasing);
+	// If we wish to only draw the brick, stop here
+	if (drawOnly ())
+		return;
 	if (m_camera != Free) {
 		// Paint the overlay image if we have one
 		const overlayMeta& overlay = m_overlays[m_camera];
 		if (overlay.img != null) {
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
 void GLRenderer::compileAllObjects () {
-	if (!g_curfile) {
+	if (!file ())
-		printf ("renderer: no files loaded, cannot compile anything\n");
 		return;
-	}
+	for (LDObject* obj : file ()->objs ())
-	for (LDObject* obj : g_curfile->objs ())
 		compileObject (obj);
 	// Compile axes
 	glDeleteLists (m_axeslist, 1);
 	m_axeslist = glGenLists (1);
 			m_drawedVerts << m_hoverpos;
 			update ();
 			break;
 		case Select:
-			if (!m_rangepick)
+			if (!drawOnly ()) {
-				m_addpick = (m_keymods & Qt::ControlModifier);
+				if (!m_rangepick)
+					m_addpick = (m_keymods & Qt::ControlModifier);
-			if (m_totalmove < 10 || m_rangepick)
-				pick (ev->x (), ev->y ());
+				if (m_totalmove < 10 || m_rangepick)
+					pick (ev->x (), ev->y ());
+			}
 			break;
 		}
 		m_rangepick = false;
 		m_totalmove = 0;
 		clampAngle (m_rotX);
 		clampAngle (m_rotY);
 	}
 	if (ev->buttons () & Qt::MidButton) {
-		m_panX += 0.03f * dx * (m_zoom / 7.5f);
+		m_panX += 0.03f * dx * (zoom () / 7.5f);
-		m_panY -= 0.03f * dy * (m_zoom / 7.5f);
+		m_panY -= 0.03f * dy * (zoom () / 7.5f);
 	}
 	// Start the tool tip timer
 	if (!m_drawToolTip)
 		m_toolTipTimer->start (1000);
 	m_keymods = ev->modifiers ();
 }
 // =============================================================================
 void GLRenderer::wheelEvent (QWheelEvent* ev) {
-	if (m_zoom > 15)
+	makeCurrent ();
-		m_zoom *= (ev->delta () < 0) ? 1.2f : (1.0f / 1.2f);
+	if (zoom () > 15)
+		setZoom (zoom () * (ev->delta () < 0 ? 1.2f : 0.833f));
 	else
-		m_zoom += (double) ev->delta () / -100.0f;
+		setZoom (zoom () + ((double) ev->delta () / -100.0f));
-	m_zoom = clamp<double> (m_zoom, 0.01f, 10000.0f);
+	setZoom (clamp<double> (zoom (), 0.01f, 10000.0f));
 	update ();
 	ev->accept ();
 }
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
 void GLRenderer::pick (uint mouseX, uint mouseY) {
 	GLint viewport[4];
+	makeCurrent ();
 	// Use particularly thick lines while picking ease up selecting lines.
 	glLineWidth (max<double> (gl_linethickness, 6.5f));
 	// Clear the selection if we do not wish to add to it.
 		pixelptr += 4;
 		if (idx == 0xFFFFFF)
 			continue; // White is background; skip
-		LDObject* obj = g_curfile->obj (idx);
+		LDObject* obj = file ()->obj (idx);
 		// If this is an additive single pick and the object is currently selected,
 		// we remove it from selection instead.
 		if (!m_rangepick && m_addpick) {
 			bool removed = false;
 			break;
 		}
 	}
 	if (obj) {
-		g_curfile->addObject (obj);
+		file ()->addObject (obj);
 		compileObject (obj);
 		g_win->fullRefresh ();
-		History::addEntry (new AddHistory ({(ulong) obj->getIndex (g_curfile)}, {obj->clone ()}));
+		History::addEntry (new AddHistory ({(ulong) obj->getIndex (file ())}, {obj->clone ()}));
 	}
 	m_drawedVerts.clear ();
 	m_rectdraw = false;
 }
 // =============================================================================
 void GLRenderer::compileObject (LDObject* obj) {
 	deleteLists (obj);
 	for (const GL::ListType listType : g_glListTypes) {
+		if (drawOnly () && listType != GL::NormalList)
+			continue;
 		GLuint list = glGenLists (1);
 		glNewList (list, GL_COMPILE);
 		obj->glLists[listType] = list;
 		compileList (obj, listType);

Mercurial > ldforge / file comparison

comparison: src/gldraw.cpp

src/gldraw.cpp