* alt + m1 2D view face vertex manipulator: use 'faces on the only best plane' pickup strategy

radiant/brush.h

@@ -3314,11 +3314,11 @@ void testSelect( Selector& selector, SelectionTest& test ){
 	}
 }
 
-void selectVerticesOnFaces( const FaceInstances_ptrs& faceinstances ){
+void selectVerticesOfFace( const FaceInstance& faceinstance ){
 	FaceVertexId faceVertex = m_vertex->m_faceVertex;
 	do
 	{
-		if( std::find( faceinstances.begin(), faceinstances.end(), &m_faceInstances[faceVertex.getFace()] ) != faceinstances.end() ){
+		if( &faceinstance == &m_faceInstances[faceVertex.getFace()] ){
 			setSelected( true );
 		}
 		faceVertex = next_vertex( m_vertex->m_faces, faceVertex );
@@ -3873,44 +3873,18 @@ void bestPlaneIndirect( SelectionTest& test, Plane3& plane, Vector3& intersectio
 	}
 }
 void selectByPlane( const Plane3& plane ){
-	for ( FaceInstances::iterator i = m_faceInstances.begin(); i != m_faceInstances.end(); ++i )
+	for ( FaceInstance& fi : m_faceInstances )
-		if( plane3_equal( plane, ( *i ).getFace().plane3() ) || plane3_equal( plane, plane3_flipped( ( *i ).getFace().plane3() ) ) )
+		if( plane3_equal( plane, fi.getFace().plane3() ) || plane3_equal( plane, plane3_flipped( fi.getFace().plane3() ) ) )
-			( *i ).setSelected( SelectionSystem::eFace, true );
+			fi.setSelected( SelectionSystem::eFace, true );
 }
 
-
+void selectVerticesOnPlane( const Plane3& plane ){
-void selectVerticesOnPlanes( SelectionTest& test ){
+	for ( FaceInstance& fi : m_faceInstances )
-	FaceInstances_ptrs bestInstances;
+		if( plane3_equal( plane, fi.getFace().plane3() ) || plane3_equal( plane, plane3_flipped( fi.getFace().plane3() ) ) )
-	selectPlanes( test, bestInstances );
+			for ( VertexInstance& vi : m_vertexInstances )
-
+				vi.selectVerticesOfFace( fi );
-	if( test.getVolume().fill() && !bestInstances.empty() ) // select only plane in camera
-		for( FaceInstances_ptrs::iterator i = bestInstances.end() - 1; i != bestInstances.begin(); --i )
-			bestInstances.pop_back();
-	for ( VertexInstances::iterator i = m_vertexInstances.begin(); i != m_vertexInstances.end(); ++i )
-		( *i ).selectVerticesOnFaces( bestInstances );
 }
 
-void selectVerticesOnTestedFaces( SelectionTest& test ){
-	test.BeginMesh( localToWorld() );
-
-	FaceInstances::iterator f;
-	SelectionIntersection si;
-	for ( f = m_faceInstances.begin(); f != m_faceInstances.end(); ++f ){
-		( *f ).testSelect( test, si );
-		if( si.valid() ){
-			break;
-		}
-	}
-	if( f != m_faceInstances.end() ){
-		FaceInstances_ptrs bestInstances;
-		bestInstances.push_back( &( *f ) );
-		for ( VertexInstances::iterator i = m_vertexInstances.begin(); i != m_vertexInstances.end(); ++i ){
-			( *i ).selectVerticesOnFaces( bestInstances );
-		}
-	}
-}
-
-
 void transformComponents( const Matrix4& matrix );
 
 const AABB& getSelectedComponentsBounds() const {

radiant/selection.cpp

@@ -2950,55 +2950,6 @@ bool Scene_forEachBrush_setupExtrude( scene::Graph& graph, SelectionTest& test,
 }
 
 
-class TestedBrushFacesSelectVeritces : public scene::Graph::Walker
-{
-SelectionTest& m_test;
-public:
-TestedBrushFacesSelectVeritces( SelectionTest& test )
-	: m_test( test ){
-}
-bool pre( const scene::Path& path, scene::Instance& instance ) const {
-	if ( path.top().get().visible() ) {
-		Selectable* selectable = Instance_getSelectable( instance );
-		if ( selectable != 0 && selectable->isSelected() ) {
-			BrushInstance* brushInstance = Instance_getBrush( instance );
-			if ( brushInstance != 0 ) {
-				brushInstance->selectVerticesOnTestedFaces( m_test );
-			}
-		}
-	}
-	return true;
-}
-};
-
-void Scene_forEachTestedBrushFace_selectVertices( scene::Graph& graph, SelectionTest& test ){
-	graph.traverse( TestedBrushFacesSelectVeritces( test ) );
-}
-
-class BrushPlanesSelectVeritces : public scene::Graph::Walker
-{
-SelectionTest& m_test;
-public:
-BrushPlanesSelectVeritces( SelectionTest& test )
-	: m_test( test ){
-}
-bool pre( const scene::Path& path, scene::Instance& instance ) const {
-	if ( path.top().get().visible() ) {
-		Selectable* selectable = Instance_getSelectable( instance );
-		if ( selectable != 0 && selectable->isSelected() ) {
-			BrushInstance* brushInstance = Instance_getBrush( instance );
-			if ( brushInstance != 0 ) {
-				brushInstance->selectVerticesOnPlanes( m_test );
-			}
-		}
-	}
-	return true;
-}
-};
-
-void Scene_forEachBrushPlane_selectVertices( scene::Graph& graph, SelectionTest& test ){
-	graph.traverse( BrushPlanesSelectVeritces( test ) );
-}
 
 void Scene_Translate_Component_Selected( scene::Graph& graph, const Vector3& translation );
 void Scene_Translate_Selected( scene::Graph& graph, const Vector3& translation );
@@ -4143,6 +4094,44 @@ bool scene_insert_brush_vertices( const View& view, TranslateFreeXY_Z& freeDragX
 	return false;
 }
 
+bool selection_selectVerticesOrFaceVertices( SelectionTest& test ){
+	{ /* try to hit vertices */
+		DeepBestSelector deepSelector;
+		Scene_TestSelect_Component_Selected( deepSelector, test, test.getVolume(), SelectionSystem::eVertex );
+		if( !deepSelector.best().empty() ){
+			for ( Selectable* s : deepSelector.best() )
+				s->setSelected( true );
+			return true;
+		}
+	}
+	/* otherwise select vertices of brush faces, which lay on best plane */
+	Plane3 plane( 0, 0, 0, 0 );
+	SelectionIntersection intersection;
+	auto bestPlaneDirect = [&test, &plane, &intersection]( BrushInstance& brushInstance ){
+		brushInstance.bestPlaneDirect( test, plane, intersection );
+	};
+	Scene_forEachVisibleSelectedBrush( bestPlaneDirect );
+
+	if( !plane3_valid( plane ) ){
+		Vector3 intersectionPoint;
+		float dist( FLT_MAX );
+		auto bestPlaneIndirect = [&test, &plane, &intersectionPoint, &dist]( BrushInstance& brushInstance ){
+			brushInstance.bestPlaneIndirect( test, plane, intersectionPoint, dist );
+		};
+		Scene_forEachVisibleSelectedBrush( bestPlaneIndirect );
+	}
+
+	if( plane3_valid( plane ) ){
+		auto selectVerticesOnPlane = [&plane]( BrushInstance& brushInstance ){
+			brushInstance.selectVerticesOnPlane( plane );
+		};
+		Scene_forEachVisibleSelectedBrush( selectVerticesOnPlane );
+
+	}
+	return plane3_valid( plane );
+}
+
+
 
 static ModifierFlags g_modifiers = c_modifierNone; //AltDragManipulatorResize, extrude, uvtool skew, select primitives in component modes
 static bool g_bTmpComponentMode = false;
@@ -4186,9 +4175,14 @@ void testSelect( const View& view, const Matrix4& pivot2world ){
 
 	if( GlobalSelectionSystem().countSelected() != 0 ){
 		if ( GlobalSelectionSystem().Mode() == SelectionSystem::ePrimitive ){
-			if( g_modifiers == c_modifierAlt && view.fill() ){
+			if( g_modifiers == c_modifierAlt ){
+				if( view.fill() ){
 					m_selected2 = Scene_forEachPlaneSelectable_selectPlanes2( GlobalSceneGraph(), test, m_axisResize );
 				}
+				else{
+					m_selected = selection_selectVerticesOrFaceVertices( test );
+				}
+			}
 			else if( g_modifiers == ( c_modifierAlt | c_modifierControl ) ){ // extrude
 				m_extrudeFaces = Scene_forEachBrush_setupExtrude( GlobalSceneGraph(), test, m_dragExtrudeFaces );
 			}
@@ -4197,39 +4191,22 @@ void testSelect( const View& view, const Matrix4& pivot2world ){
 				Scene_TestSelect_Primitive( booleanSelector, test, view );
 
 				if ( booleanSelector.isSelected() ) { /* hit a primitive */
-					if( g_modifiers == c_modifierAlt ){
+					m_dragSelected = true; /* drag a primitive */
-						DeepBestSelector deepSelector;
-						Scene_TestSelect_Component_Selected( deepSelector, test, view, SelectionSystem::eVertex ); /* try to quickly select hit vertices */
-						for ( std::list<Selectable*>::iterator i = deepSelector.best().begin(); i != deepSelector.best().end(); ++i )
-							selector.addSelectable( SelectionIntersection( 0, 0 ), ( *i ) );
-						if( deepSelector.best().empty() ) /* otherwise drag clicked face's vertices */
-							Scene_forEachTestedBrushFace_selectVertices( GlobalSceneGraph(), test );
-						m_selected = true;
-					}
-					else{ /* drag a primitive */
-						m_dragSelected = true;
 					test.BeginMesh( g_matrix4_identity, true );
 					m_freeDragXY_Z.set0( vector4_projected( matrix4_transformed_vector4( test.getScreen2world(), Vector4( 0, 0, booleanSelector.bestIntersection().depth(), 1 ) ) ) );
 				}
-				}
 				else{ /* haven't hit a primitive */
-					if( g_modifiers == c_modifierAlt ){
-						Scene_forEachBrushPlane_selectVertices( GlobalSceneGraph(), test ); /* select vertices on planeSelectables */
-						m_selected = true;
-					}
-					else{
 					m_selected = Scene_forEachPlaneSelectable_selectPlanes( GlobalSceneGraph(), selector, test ); /* select faces on planeSelectables */
 				}
 			}
 		}
-		}
 		else{
 			BestSelector bestSelector;
 			Scene_TestSelect_Component_Selected( bestSelector, test, view, GlobalSelectionSystem().ComponentMode() ); /* drag components */
-			for ( std::list<Selectable*>::iterator i = bestSelector.best().begin(); i != bestSelector.best().end(); ++i ){
+			for ( Selectable* s : bestSelector.best() ){
-				if ( !( *i )->isSelected() )
+				if ( !s->isSelected() )
 					GlobalSelectionSystem().setSelectedAllComponents( false );
-				selector.addSelectable( SelectionIntersection( 0, 0 ), ( *i ) );
+				selector.addSelectable( SelectionIntersection( 0, 0 ), s );
 				m_dragSelected = true;
 			}
 			if( bestSelector.bestIntersection().valid() ){
@@ -4237,19 +4214,19 @@ void testSelect( const View& view, const Matrix4& pivot2world ){
 				m_freeDragXY_Z.set0( vector4_projected( matrix4_transformed_vector4( test.getScreen2world(), Vector4( 0, 0, bestSelector.bestIntersection().depth(), 1 ) ) ) );
 			}
 			else{
-				if( GlobalSelectionSystem().countSelectedComponents() != 0 ){ /* even if hit nothing, but got selected */
+				if( GlobalSelectionSystem().countSelectedComponents() != 0 ){ /* drag, even if hit nothing, but got selected */
 					m_dragSelected = true;
 					m_freeDragXY_Z.set0( g_vector3_identity );
 				}
-				else if( GlobalSelectionSystem().ComponentMode() == SelectionSystem::eVertex ){
+				else if( GlobalSelectionSystem().ComponentMode() == SelectionSystem::eVertex ){ /* otherwise insert */
 					m_dragSelected = g_bTmpComponentMode = scene_insert_brush_vertices( view, m_freeDragXY_Z ); //hack: indicating not a tmp mode
 					return;
 				}
 			}
 		}
 
-		for ( SelectionPool::iterator i = selector.begin(); i != selector.end(); ++i )
+		for ( SelectableSortedSet::value_type& value : selector )
-			( *i ).second->setSelected( true );
+			value.second->setSelected( true );
 		g_bTmpComponentMode = m_selected | m_selected2;
 	}
 	else if( GlobalSelectionSystem().Mode() == SelectionSystem::ePrimitive ){