ldforge: comparison src/gldraw.cc

-:5a31f6c14451
+:39085791128f
 void GLRenderer::compileList (LDObject* obj, const GLRenderer::ListType list)
 {	setObjectColor (obj, list);
 	switch (obj->getType())
 	{	case LDObject::Line:
-			compileSubObject (obj, GL_LINES);
+		{	compileSubObject (obj, GL_LINES);
-			break;
+		} break;
 		case LDObject::CondLine:
+		{	// Draw conditional lines with a dash pattern - however, use a full
-			// Draw conditional lines with a dash pattern - however, use a full
 			// line when drawing a pick list to make selecting them easier.
 			if (list != GL::PickList)
 			{	glLineStipple (1, 0x6666);
 				glEnable (GL_LINE_STIPPLE);
 			}
 			compileSubObject (obj, GL_LINES);
 			glDisable (GL_LINE_STIPPLE);
-			break;
+		} break;
 		case LDObject::Triangle:
-			compileSubObject (obj, GL_TRIANGLES);
+		{	compileSubObject (obj, GL_TRIANGLES);
-			break;
+		} break;
 		case LDObject::Quad:
-			compileSubObject (obj, GL_QUADS);
+		{	compileSubObject (obj, GL_QUADS);
-			break;
+		} break;
 		case LDObject::Subfile:
 		{	LDSubfile* ref = static_cast<LDSubfile*> (obj);
 			QList<LDObject*> objs;
 			LDObject* prev = ref->prev();
 			if (prev && prev->getType() == LDObject::BFC && static_cast<LDBFC*> (prev)->type == LDBFC::InvertNext)
 				g_glInvert = !g_glInvert;
-		for (LDObject * obj : objs)
+			for (LDObject* obj : objs)
 			{	compileList (obj, list);
-				delete obj;
+				obj->deleteSelf();
 			}
 			g_glInvert = oldinvert;
-		}
+		} break;
-		break;
 		default:
 			break;
 	}
 }
 		pixelptr += 4;
 		if (idx == 0xFFFFFF)
 			continue; // White is background; skip
+		dlog ("idx: %1", idx);
 		LDObject* obj = LDObject::fromID (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)
 	{	LDSubfile* ref = static_cast<LDSubfile*> (obj);
 		QList<LDObject*> objs = ref->inlineContents (LDSubfile::DeepCacheInline);
 		for (LDObject* obj : objs)
 		{	verts << getVertices (obj);
-			delete obj;
+			obj->deleteSelf();
 		}
 	}
 	return verts;
 }
 	// Mark in known vertices of this object
 	QList<vertex> verts = getVertices (obj);
 	m_knownVerts << verts;
 	removeDuplicates (m_knownVerts);
-	obj->m_glinit = true;
+	obj->setGLInit (true);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 uchar* GLRenderer::getScreencap (int& w, int& h)
 // =============================================================================
 // -----------------------------------------------------------------------------
 void GLRenderer::deleteLists (LDObject* obj)
 {	// Delete the lists but only if they have been initialized
-	if (!obj->m_glinit)
+	if (!obj->isGLInit())
 		return;
-for (const GL::ListType listType : g_glListTypes)
+	for (const GL::ListType listType : g_glListTypes)
 		glDeleteLists (obj->glLists[listType], 1);
-	obj->m_glinit = false;
+	obj->setGLInit (false);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 Axis GLRenderer::getCameraAxis (bool y, GLRenderer::EFixedCamera camid)
 // =============================================================================
 // -----------------------------------------------------------------------------
 LDOverlay* GLRenderer::findOverlayObject (EFixedCamera cam)
 {	LDOverlay* ovlobj = null;
-	for (LDObject * obj : getFile()->getObjects())
+	for (LDObject* obj : getFile()->getObjects())
 	{	if (obj->getType() == LDObject::Overlay && static_cast<LDOverlay*> (obj)->getCamera() == cam)
 		{	ovlobj = static_cast<LDOverlay*> (obj);
 			break;
 		}
 	}
 		if (!meta.img && ovlobj)
 		{	// If this is the last overlay image, we need to remove the empty space after it as well.
 			LDObject* nextobj = ovlobj->next();
 			if (nextobj && nextobj->getType() == LDObject::Empty)
-			{	getFile()->forgetObject (nextobj);
+				nextobj->deleteSelf();
-				delete nextobj;
-			}
 			// If the overlay object was there and the overlay itself is
 			// not, remove the object.
-			getFile()->forgetObject (ovlobj);
+			ovlobj->deleteSelf();
-			delete ovlobj;
 		} elif (meta.img && !ovlobj)
 		{	// Inverse case: image is there but the overlay object is
 			// not, thus create the object.
 			ovlobj = new LDOverlay;

Mercurial > ldforge / file comparison

comparison: src/gldraw.cc

src/gldraw.cc