#5660: Avoid tens of thousands of reallocations of the Face/FaceInsta…

…nce vectors when parsing brushes

radiantcore/brush/Brush.cpp

@@ -46,6 +46,8 @@ Brush::Brush(BrushNode& owner) :
     m_transformChanged(false),
 	_detailFlag(Structural)
 {
+    // Make some space for a few faces
+    reserve(6);
     onFacePlaneChanged();
 }
 

radiantcore/brush/BrushNode.cpp

@@ -21,6 +21,9 @@ BrushNode::BrushNode() :
     _untransformedOriginChanged(true)
 {
 	m_brush.attach(*this); // BrushObserver
+
+    // Try to anticipate a few face additions to avoid reallocations during map parsing
+    reserve(6);
 }
 
 // Copy Constructor
@@ -297,8 +300,9 @@ void BrushNode::reserve(std::size_t size) {
 	m_faceInstances.reserve(size);
 }
 
-void BrushNode::push_back(Face& face) {
-	m_faceInstances.push_back(FaceInstance(face, std::bind(&BrushNode::selectedChangedComponent, this, std::placeholders::_1)));
+void BrushNode::push_back(Face& face)
+{
+	m_faceInstances.emplace_back(face, std::bind(&BrushNode::selectedChangedComponent, this, std::placeholders::_1));
     _untransformedOriginChanged = true;
 }
 

radiantcore/brush/FaceInstance.h

@@ -159,34 +159,3 @@ class FaceInstance
 
 typedef std::vector<FaceInstance> FaceInstances;
 
-/*class FaceInstanceSet
-{
-	typedef SelectionList<FaceInstance> FaceInstances;
-	FaceInstances m_faceInstances;
-public:
-	void insert(FaceInstance& faceInstance) {
-		m_faceInstances.append(faceInstance);
-	}
-	void erase(FaceInstance& faceInstance) {
-		m_faceInstances.erase(faceInstance);
-	}
-
-	template<typename Functor>
-	void foreach(Functor& functor) {
-		for (FaceInstances::iterator i = m_faceInstances.begin(); i != m_faceInstances.end(); ++i) {
-			functor(*(*i));
-		}
-	}
-
-	bool empty() const {
-		return m_faceInstances.empty();
-	}
-
-	FaceInstance& last() const {
-		return m_faceInstances.back();
-	}
-
-	std::size_t size() const {
-		return m_faceInstances.size();
-	}
-};*/