ldforge: comparison src/glrenderer.cpp

-:d8935cdb24c0
+:05b3e173c900
 {"Back camera", {backCameraMatrix, X, Y,  true,  true, true}}, // back
 {"Right camera", {rightCameraMatrix, Z, Y, false,  true, true}}, // right
 {"Free camera", GLCamera::FreeCamera}, // free
 }
 {
-	m_camera = (Camera) m_config->camera();
+	m_camera = (Camera) config::camera();
 	m_compiler = new GLCompiler (this);
 	m_toolTipTimer = new QTimer (this);
 	m_toolTipTimer->setSingleShot (true);
 	setAcceptDrops (true);
 	connect (m_toolTipTimer, SIGNAL (timeout()), this, SLOT (showCameraIconTooltip()));
 	glPolygonOffset (1.0f, 1.0f);
 	glEnable (GL_DEPTH_TEST);
 	glShadeModel (GL_SMOOTH);
 	glEnable (GL_MULTISAMPLE);
-	if (m_config->antiAliasedLines())
+	if (config::antiAliasedLines())
 	{
 		glEnable (GL_LINE_SMOOTH);
 		glHint (GL_LINE_SMOOTH_HINT, GL_NICEST);
 	}
 	else
 //
 void GLRenderer::initializeGL()
 {
 	initializeOpenGLFunctions();
 	setBackground();
-	glLineWidth (m_config->lineThickness());
+	glLineWidth (config::lineThickness());
 	glLineStipple (1, 0x6666);
 	setAutoFillBackground (false);
 	setMouseTracking (true);
 	setFocusPolicy (Qt::WheelFocus);
 	m_compiler->initialize();
 void GLRenderer::setBackground()
 {
 	if (not m_isDrawingSelectionScene)
 	{
 		// Otherwise use the background that the user wants.
-		QColor color = m_config->backgroundColor();
+		QColor color = config::backgroundColor();
 		if (color.isValid())
 		{
 			color.setAlpha(255);
 			m_useDarkBackground = luma(color) < 80;
 	{
 		m_needZoomToFit = false;
 		zoomAllToFit();
 	}
-	if (m_config->drawWireframe() and not m_isDrawingSelectionScene)
+	if (config::drawWireframe() and not m_isDrawingSelectionScene)
 		glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	glEnable(GL_DEPTH_TEST);
-	if (m_config->lighting() and not m_isDrawingSelectionScene)
+	if (config::lighting() and not m_isDrawingSelectionScene)
 		glEnable(GL_LIGHTING);
 	else
 		glDisable(GL_LIGHTING);
 	if (camera() != Camera::Free)
 		drawVbos (VboClass::Lines, VboSubclass::PickColors);
 		drawVbos (VboClass::ConditionalLines, VboSubclass::PickColors);
 	}
 	else
 	{
-		if (m_config->bfcRedGreenView())
+		if (config::bfcRedGreenView())
 		{
 			glEnable (GL_CULL_FACE);
 			glCullFace (GL_BACK);
 			drawVbos (VboClass::Triangles, VboSubclass::BfcFrontColors);
 			drawVbos (VboClass::Quads, VboSubclass::BfcFrontColors);
 		}
 		else
 		{
 			VboSubclass colors;
-			if (m_config->randomColors())
+			if (config::randomColors())
 				colors = VboSubclass::RandomColors;
 			else
 				colors = VboSubclass::RegularColors;
 			drawVbos (VboClass::Triangles, colors);
 		drawVbos (VboClass::Lines, VboSubclass::RegularColors);
 		glEnable (GL_LINE_STIPPLE);
 		drawVbos (VboClass::ConditionalLines, VboSubclass::RegularColors);
 		glDisable (GL_LINE_STIPPLE);
-		if (m_config->drawAxes())
+		if (config::drawAxes())
 		{
 			glDisableClientState (GL_NORMAL_ARRAY);
 			glBindBuffer (GL_ARRAY_BUFFER, m_axesVbo);
 			glVertexPointer (3, GL_FLOAT, 0, NULL);
 			glBindBuffer (GL_ARRAY_BUFFER, m_axesVbo);
 * - colors determines what VBO subclass to use for colors
 */
 void GLRenderer::drawVbos(VboClass surface, VboSubclass colors)
 {
 	// Filter this through some configuration options
-	if ((isOneOf(surface, VboClass::Quads, VboClass::Triangles) and m_config->drawSurfaces() == false)
+	if ((isOneOf(surface, VboClass::Quads, VboClass::Triangles) and config::drawSurfaces() == false)
-		or (surface == VboClass::Lines and m_config->drawEdgeLines() == false)
+		or (surface == VboClass::Lines and config::drawEdgeLines() == false)
-		or (surface == VboClass::ConditionalLines and m_config->drawConditionalLines() == false))
+		or (surface == VboClass::ConditionalLines and config::drawConditionalLines() == false))
 	{
 		return;
 	}
 	GLenum type;
 {
 	// The edit mode may forbid the free camera.
 	if (freeCameraAllowed() or camera != Camera::Free)
 	{
 		m_camera = camera;
-		m_config->setCamera(static_cast<int>(camera));
+		config::setCamera(static_cast<int>(camera));
 	}
 }
 /*
 * Resolves a pixel pointer to an RGB color.
 	if (m_isDrawingSelectionScene)
 	{
 		glDisable(GL_DITHER);
 		// Use particularly thick lines while picking ease up selecting lines.
-		glLineWidth(qMax<double>(m_config->lineThickness(), 6.5));
+		glLineWidth(qMax<double>(config::lineThickness(), 6.5));
 	}
 	else
 	{
 		glEnable(GL_DITHER);
 		// Restore line thickness
-		glLineWidth(m_config->lineThickness());
+		glLineWidth(config::lineThickness());
 	}
 }
 /*
 * Returns an image containing the current render of the scene.
 // =============================================================================
 //
 void GLRenderer::highlightCursorObject()
 {
-	if (not m_config->highlightObjectBelowCursor() and not objectAtCursor().isValid())
+	if (not config::highlightObjectBelowCursor() and not objectAtCursor().isValid())
 		return;
 	QModelIndex newIndex;
 	QModelIndex oldIndex = m_objectAtCursor;
-	if (not m_isCameraMoving and m_config->highlightObjectBelowCursor())
+	if (not m_isCameraMoving and config::highlightObjectBelowCursor())
 	{
 		setPicking (true);
 		drawGLScene();
 		setPicking (false);
 		unsigned char pixel[4];

Mercurial > ldforge / file comparison

comparison: src/glrenderer.cpp

src/glrenderer.cpp