ldforge: comparison src/glRenderer.cc

-:46377d340c23
+:b4a990f59a5e
 //
 QColor GLRenderer::getMainColor()
 {
 	QColor col (gl_maincolor);
-	if (!col.isValid())
+	if (not col.isValid())
 		return QColor (0, 0, 0);
 	col.setAlpha (gl_maincolor_alpha * 255.f);
 	return col;
 }
 //
 void GLRenderer::setBackground()
 {
 	QColor col (gl_bgcolor);
-	if (!col.isValid())
+	if (not col.isValid())
 		return;
 	col.setAlpha (255);
 	m_darkbg = luma (col) < 80;
 void GLRenderer::drawGLScene()
 {
 	if (document() == null)
 		return;
-	if (gl_wireframe && !isPicking())
+	if (gl_wireframe && not isPicking())
 		glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
 	glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	glEnable (GL_DEPTH_TEST);
 			QPoint poly[4];
 			Vertex poly3d[4];
 			int numverts = 4;
 			// Calculate polygon data
-			if (!m_rectdraw)
+			if (not m_rectdraw)
 			{
 				numverts = m_drawedVerts.size() + 1;
 				int i = 0;
 				for (Vertex& vert : m_drawedVerts)
 			}
 		}
 	}
 	// Camera icons
-	if (!isPicking())
+	if (not isPicking())
 	{
 		// Draw a background for the selected camera
 		paint.setPen (m_thinBorderPen);
 		paint.setBrush (QBrush (QColor (0, 128, 160, 128)));
 		paint.drawRect (m_cameraIcons[camera()].selRect);
 		}
 		// Tool tips
 		if (m_drawToolTip)
 		{
-			if (m_cameraIcons[m_toolTipCamera].destRect.contains (m_pos) == false)
+			if (not m_cameraIcons[m_toolTipCamera].destRect.contains (m_pos))
 				m_drawToolTip = false;
 			else
 			{
 				QString label = format (formatstr, tr (g_CameraNames[m_toolTipCamera]));
 				QToolTip::showText (m_globalpos, label);
 			y += metrics.height();
 		}
 	}
 	// If we're range-picking, draw a rectangle encompassing the selection area.
-	if (m_rangepick && !isPicking() && m_totalmove >= 10)
+	if (m_rangepick && not isPicking() && m_totalmove >= 10)
 	{
 		int x0 = m_rangeStart.x(),
 			y0 = m_rangeStart.y(),
 			x1 = m_pos.x(),
 			y1 = m_pos.y();
 // =============================================================================
 //
 void GLRenderer::mouseReleaseEvent (QMouseEvent* ev)
 {
-	const bool wasLeft = (m_lastButtons & Qt::LeftButton) && ! (ev->buttons() & Qt::LeftButton),
+	const bool wasLeft = (m_lastButtons & Qt::LeftButton) && not (ev->buttons() & Qt::LeftButton),
-				   wasRight = (m_lastButtons & Qt::RightButton) && ! (ev->buttons() & Qt::RightButton),
+	   wasRight = (m_lastButtons & Qt::RightButton) && not (ev->buttons() & Qt::RightButton),
-				   wasMid = (m_lastButtons & Qt::MidButton) && ! (ev->buttons() & Qt::MidButton);
+	   wasMid = (m_lastButtons & Qt::MidButton) && not (ev->buttons() & Qt::MidButton);
 	if (m_panning)
 		m_panning = false;
 	if (wasLeft)
 	{
 		// Check if we selected a camera icon
-		if (!m_rangepick)
+		if (not m_rangepick)
 		{
 			for (CameraIcon & info : m_cameraIcons)
 			{
 				if (info.destRect.contains (ev->pos()))
 				{
 				addDrawnVertex (m_hoverpos);
 			} break;
 			case ESelectMode:
 			{
-				if (!isDrawOnly())
+				if (not isDrawOnly())
 				{
 					if (m_totalmove < 10)
 						m_rangepick = false;
-					if (!m_rangepick)
+					if (not m_rangepick)
 						m_addpick = (m_keymods & Qt::ControlModifier);
 					if (m_totalmove < 10 || m_rangepick)
 						pick (ev->x(), ev->y());
 				}
 		if (valid)
 			addDrawnVertex (closest);
 	}
-	if (wasRight && !m_drawedVerts.isEmpty())
+	if (wasRight && not m_drawedVerts.isEmpty())
 	{
 		// Remove the last vertex
 		m_drawedVerts.removeLast();
 		if (m_drawedVerts.isEmpty())
 	if (mid || (left && shift))
 	{
 		pan (X) += 0.03f * dx * (zoom() / 7.5f);
 		pan (Y) -= 0.03f * dy * (zoom() / 7.5f);
 		m_panning = true;
-	} elif (left && !m_rangepick && camera() == EFreeCamera)
+	}
+	elif (left && not m_rangepick && camera() == EFreeCamera)
 	{
 		rot (X) = rot (X) + dy;
 		rot (Y) = rot (Y) + dx;
 		clampAngle (rot (X));
 		clampAngle (rot (Y));
 	}
 	// Start the tool tip timer
-	if (!m_drawToolTip)
+	if (not m_drawToolTip)
 		m_toolTipTimer->start (500);
 	// Update 2d position
 	m_pos = ev->pos();
 	m_globalpos = ev->globalPos();
 	// 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.
-	if (!m_addpick)
+	if (not m_addpick)
 	{
 		LDObjectList oldsel = selection();
 		getCurrentDocument()->clearSelection();
 		for (LDObject* obj : oldsel)
 		LDObject* obj = LDObject::fromID (idx);
 		assert (obj != null);
 		// If this is an additive single pick and the object is currently selected,
 		// we remove it from selection instead.
-		if (!m_rangepick && m_addpick)
+		if (not m_rangepick && m_addpick)
 		{
 			if (obj->isSelected())
 			{
 				obj->unselect();
 				removedObj = obj;
 	if (a != null)
 	{
 		initOverlaysFromObjects();
-		if (currentDocumentData().init == false)
+		if (not currentDocumentData().init)
 		{
 			resetAllAngles();
 			currentDocumentData().init = true;
 		}
 	}
 		if (firstrun)
 		{
 			// If this is the first run, we don't know enough to determine
 			// whether the zoom was to fit, so we mark in our knowledge so
 			// far and start over.
-			inward = !filled;
+			inward = not filled;
 			firstrun = false;
 		}
 		else
 		{
 			// If this run filled the screen and the last one did not, the
 			// last run had ideal zoom - zoom a bit back and we should reach it.
-			if (filled && !lastfilled)
+			if (filled && not lastfilled)
 			{
 				zoomNotch (false);
 				break;
 			}
 			// If this run did not fill the screen and the last one did, we've
 			// now reached ideal zoom so we're done here.
-			if (!filled && lastfilled)
+			if (not filled && lastfilled)
 				break;
-			inward = !filled;
+			inward = not filled;
 		}
 		lastfilled = filled;
 	}
 // =============================================================================
 //
 void GLRenderer::updateRectVerts()
 {
-	if (!m_rectdraw)
+	if (not m_rectdraw)
 		return;
 	if (m_drawedVerts.isEmpty())
 	{
 		for (int i = 0; i < 4; ++i)
 // =============================================================================
 //
 void GLRenderer::mouseDoubleClickEvent (QMouseEvent* ev)
 {
-	if (!(ev->buttons() & Qt::LeftButton) || editMode() != ESelectMode)
+	if (not (ev->buttons() & Qt::LeftButton) || editMode() != ESelectMode)
 		return;
 	pick (ev->x(), ev->y());
 	if (selection().isEmpty())
 			continue;
 		LDGLOverlay& meta = currentDocumentData().overlays[cam];
 		LDOverlay* ovlobj = findOverlayObject (cam);
-		if (!ovlobj && meta.img)
+		if (not ovlobj && meta.img)
 		{
 			delete meta.img;
 			meta.img = null;
 		}
 		elif (ovlobj && (meta.img == null || meta.fname != ovlobj->fileName()) && meta.invalid == false)
 				if (found)
 					document()->insertObj (i + 1, new LDEmpty);
 			}
 		}
-		if (meta.img && ovlobj)
+		if (meta.img != null && ovlobj != null)
 		{
 			ovlobj->setCamera (cam);
 			ovlobj->setFileName (meta.fname);
 			ovlobj->setX (meta.ox);
 			ovlobj->setY (meta.oy);

Mercurial > ldforge / file comparison

comparison: src/glRenderer.cc

src/glRenderer.cc