ldforge: comparison src/ldDocument.cpp

-:3b279b5e57d3
+:fc1c13db9618
 LDDocument::LDDocument (DocumentManager* parent) :
 	QObject (parent),
 	HierarchyElement (parent),
 	m_history (new EditHistory (this)),
-	m_isCache (true),
+	m_flags(IsCache | VerticesOutdated | NeedsVertexMerge | NeedsRecache),
-	m_verticesOutdated (true),
-	m_needVertexMerge (true),
-	m_needsReCache(true),
-	m_beingDestroyed (false),
-	m_needRecount(false),
 	m_savePosition(-1),
 	m_tabIndex(-1),
 	m_triangleCount(0),
 	m_gldata (new LDGLData),
 	m_manager (parent) {}
 LDDocument::~LDDocument()
 {
-	m_beingDestroyed = true;
+	m_flags |= IsBeingDestroyed;
 	for (int i = 0; i < m_objects.size(); ++i)
 		m_objects[i]->destroy();
 	delete m_history;
 	m_defaultName = value;
 }
 int LDDocument::triangleCount()
 {
-	if (m_needRecount)
+	if (checkFlag(NeedsTriangleRecount))
 	{
 		m_triangleCount = 0;
 		for (LDObject* obj : m_objects)
 			m_triangleCount += obj->triangleCount();
-		m_needRecount = false;
+		unsetFlag(NeedsTriangleRecount);
 	}
 	return m_triangleCount;
 }
 void LDDocument::openForEditing()
 {
-	if (m_isCache)
+	if (isCache())
 	{
-		m_isCache = false;
+		m_flags &= ~IsCache;
 		print ("Opened %1", name());
 		// Cache files are not compiled by the GL renderer. Now that this file is open for editing, it needs to be
 		// compiled.
 		m_window->renderer()->compiler()->compileDocument (this);
 	}
 }
 bool LDDocument::isCache() const
 {
-	return m_isCache;
+	return !!(m_flags & IsCache);
 }
 void LDDocument::addHistoryStep()
 {
 	history()->addStep();
 void LDDocument::close()
 {
 	if (not isCache())
 	{
-		m_isCache = true;
+		m_flags |= IsCache;
 		print ("Closed %1", name());
 		m_window->updateDocumentList();
 		// If the current document just became implicit (i.e. user closed it), we need to get a new one to show.
 		if (currentDocument() == this)
 		// of loading errors. Circumstances may be different now.
 		if (obj->type() == OBJ_Error)
 			obj->replace (ParseLine (static_cast<LDError*> (obj)->contents()));
 	}
-	m_needsReCache = true;
+	m_flags |= NeedsRecache;
 	if (this == m_window->currentDocument())
 		m_window->buildObjectList();
 }
 {
 	history()->add (new AddHistoryEntry (objects().size(), obj));
 	m_objects << obj;
 	addKnownVertices (obj);
 	obj->setDocument (this);
-	m_needRecount = true;
+	setFlag(NeedsTriangleRecount);
 	m_window->renderer()->compileObject (obj);
 	return getObjectCount() - 1;
 }
 // =============================================================================
 	}
 }
 // =============================================================================
 //
-void LDDocument::insertObj (int pos, LDObject* obj)
+void LDDocument::insertObject (int pos, LDObject* obj)
 {
 	history()->add (new AddHistoryEntry (pos, obj));
 	m_objects.insert (pos, obj);
 	obj->setDocument (this);
-	m_needRecount = true;
+	setFlag(NeedsTriangleRecount);
 	m_window->renderer()->compileObject (obj);
 #ifdef DEBUG
 	if (not isCache())
 	if (m_objects[idx] == obj)
 	{
 		obj->deselect();
-		if (not isCache() and not m_beingDestroyed)
+		if (not isCache() and not checkFlag(IsBeingDestroyed))
 		{
 			history()->add (new DelHistoryEntry (idx, obj));
 			m_objectVertices.remove (obj);
 		}
 		m_objects.removeAt (idx);
-		m_needRecount = true;
+		setFlag(NeedsTriangleRecount);
 		obj->setDocument (nullptr);
 	}
 }
 // =============================================================================
 //
-void LDDocument::setObject (int idx, LDObject* obj)
+void LDDocument::setObjectAt (int idx, LDObject* obj)
 {
 	if (idx < 0 or idx >= m_objects.size())
 		return;
 	// Mark this change to history
 // =============================================================================
 //
 void LDDocument::initializeCachedData()
 {
-	if (m_needsReCache)
+	if (checkFlag(NeedsRecache))
 	{
 		m_vertices.clear();
 		for (LDObject* obj : inlineContents (true, true))
 		{
 				m_polygonData << *data;
 				delete data;
 			}
 		}
-		m_needsReCache = false;
+		unsetFlag(NeedsRecache);
 	}
-	if (m_verticesOutdated)
+	if (checkFlag(VerticesOutdated))
 	{
 		m_objectVertices.clear();
 		for (LDObject* obj : inlineContents (true, false))
 			addKnownVertices (obj);
 		mergeVertices();
-		m_verticesOutdated = false;
+		unsetFlag(VerticesOutdated);
 	}
-	if (m_needVertexMerge)
+	if (checkFlag(NeedsVertexMerge))
 		mergeVertices();
 }
 // =============================================================================
 //
 	for (QVector<Vertex> const& verts : m_objectVertices)
 		m_vertices << verts;
 	removeDuplicates (m_vertices);
-	m_needVertexMerge = false;
+	unsetFlag(NeedsVertexMerge);
 }
 // =============================================================================
 //
 QList<LDPolygon> LDDocument::inlinePolygons()
 	return m_vertices;
 }
 void LDDocument::redoVertices()
 {
-	m_verticesOutdated = true;
+	setFlag(VerticesOutdated);
 }
 void LDDocument::needVertexMerge()
 {
-	m_needVertexMerge = true;
+	setFlag(NeedsVertexMerge);
 }
-void LDDocument::needRecount()
+void LDDocument::recountTriangles()
 {
-	m_needRecount = true;
+	setFlag(NeedsTriangleRecount);
 }

Mercurial > ldforge / file comparison

comparison: src/ldDocument.cpp

src/ldDocument.cpp