ldforge: comparison src/glRenderer.cpp

-:4fdd74a04790
+:413ecd6b9801
 	HierarchyElement (parent),
 	m_document (nullptr),
 	m_initialized (false)
 {
 	m_isPicking = false;
-	m_camera = (ECamera) m_config->camera();
+	m_camera = (ECamera) Config->camera();
 	m_drawToolTip = false;
 	m_currentEditMode = AbstractEditMode::createByType (this, EditModeType::Select);
 	m_panning = false;
 	m_compiler = new GLCompiler (this);
 	m_objectAtCursor = nullptr;
 	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);
 		glEnable (GL_POLYGON_SMOOTH);
 		glHint (GL_LINE_SMOOTH_HINT, GL_NICEST);
 		glHint (GL_POLYGON_SMOOTH_HINT, GL_NICEST);
 {
 #ifdef USE_QT5
 	initializeOpenGLFunctions();
 #endif
 	setBackground();
-	glLineWidth (m_config->lineThickness());
+	glLineWidth (Config->lineThickness());
 	glLineStipple (1, 0x6666);
 	setAutoFillBackground (false);
 	setMouseTracking (true);
 	setFocusPolicy (Qt::WheelFocus);
 	compiler()->initialize();
 	{
 		glClearColor (0.0f, 0.0f, 0.0f, 1.0f);
 		return;
 	}
-	QColor color = m_config->backgroundColor();
+	QColor color = Config->backgroundColor();
 	if (not color.isValid())
 		return;
 	color.setAlpha (255);
 	{
 		currentDocumentData().needZoomToFit = false;
 		zoomAllToFit();
 	}
-	if (m_config->drawWireframe() and not isPicking())
+	if (Config->drawWireframe() and not isPicking())
 		glPolygonMode (GL_FRONT_AND_BACK, GL_LINE);
 	glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	glEnable (GL_DEPTH_TEST);
 		drawVbos (LinesVbo, PickColorsVboComplement, GL_LINES);
 		drawVbos (ConditionalLinesVbo, PickColorsVboComplement, GL_LINES);
 	}
 	else
 	{
-		if (m_config->bfcRedGreenView())
+		if (Config->bfcRedGreenView())
 		{
 			glEnable (GL_CULL_FACE);
 			glCullFace (GL_BACK);
 			drawVbos (TrianglesVbo, BfcFrontColorsVboComplement, GL_TRIANGLES);
 			drawVbos (QuadsVbo, BfcFrontColorsVboComplement, GL_QUADS);
 		}
 		else
 		{
 			ComplementVboType colors;
-			if (m_config->randomColors())
+			if (Config->randomColors())
 				colors = RandomColorsVboComplement;
 			else
 				colors = NormalColorsVboComplement;
 			drawVbos (TrianglesVbo, colors, GL_TRIANGLES);
 		drawVbos (LinesVbo, NormalColorsVboComplement, GL_LINES);
 		glEnable (GL_LINE_STIPPLE);
 		drawVbos (ConditionalLinesVbo, NormalColorsVboComplement, GL_LINES);
 		glDisable (GL_LINE_STIPPLE);
-		if (m_config->drawAxes())
+		if (Config->drawAxes())
 		{
 			glBindBuffer (GL_ARRAY_BUFFER, m_axesVbo);
 			glVertexPointer (3, GL_FLOAT, 0, NULL);
 			glBindBuffer (GL_ARRAY_BUFFER, m_axesVbo);
 			glColorPointer (3, GL_FLOAT, 0, NULL);
 // =============================================================================
 //
 void GLRenderer::drawVbos (SurfaceVboType surface, ComplementVboType colors, GLenum type)
 {
 	// Filter this through some configuration options
-	if ((isOneOf (surface, QuadsVbo, TrianglesVbo) and m_config->drawSurfaces() == false)
+	if ((isOneOf (surface, QuadsVbo, TrianglesVbo) and Config->drawSurfaces() == false)
-		or (surface == LinesVbo and m_config->drawEdgeLines() == false)
+		or (surface == LinesVbo and Config->drawEdgeLines() == false)
-		or (surface == ConditionalLinesVbo and m_config->drawConditionalLines() == false))
+		or (surface == ConditionalLinesVbo and Config->drawConditionalLines() == false))
 	{
 		return;
 	}
 	int surfacenum = m_compiler->vboNumber (surface, SurfacesVboComplement);
 	// The edit mode may forbid the free camera.
 	if (cam == EFreeCamera and not m_currentEditMode->allowFreeCamera())
 		return;
 	m_camera = cam;
-	m_config->setCamera ((int) cam);
+	Config->setCamera ((int) cam);
 	m_window->updateEditModeActions();
 }
 // =============================================================================
 //
 	if (isPicking())
 	{
 		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());
 	}
 }
 // =============================================================================
 //
 // =============================================================================
 //
 void GLRenderer::highlightCursorObject()
 {
-	if (not m_config->highlightObjectBelowCursor() and objectAtCursor() == nullptr)
+	if (not Config->highlightObjectBelowCursor() and objectAtCursor() == nullptr)
 		return;
 	LDObject* newObject = nullptr;
 	LDObject* oldObject = objectAtCursor();
 	qint32 newIndex;
-	if (m_isCameraMoving or not m_config->highlightObjectBelowCursor())
+	if (m_isCameraMoving or not Config->highlightObjectBelowCursor())
 	{
 		newIndex = 0;
 	}
 	else
 	{

Mercurial > ldforge / file comparison

comparison: src/glRenderer.cpp

src/glRenderer.cpp