#5746: Start setting up the selection tool

codereader · Sep 10, 2021 · 1517261 · 1517261
1 parent f073588
commit 1517261
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 8 deletions.
diff --git a/install/input.xml b/install/input.xml
@@ -33,7 +33,7 @@
     </mouseToolMapping>
       <!-- ID 2 = textool -->
     <mouseToolMapping name="TextureTool" id="2">
-        <tool name="TexToolMoveViewTool" button="RMB" modifiers="" />
+        <tool name="TextureToolSelectionTool" button="LMB" modifiers="SHIFT" />
     </mouseToolMapping>
   </mouseToolMappings>
 	<cameraview>

diff --git a/radiant/eventmanager/MouseToolGroup.cpp b/radiant/eventmanager/MouseToolGroup.cpp
@@ -23,6 +23,8 @@ std::string MouseToolGroup::getDisplayName()
         return _("XY View");
     case Type::CameraView:
         return _("Camera View");
+    case Type::TextureTool:
+        return _("Texture Tool");
     default:
         return _("Unknown");
     };

diff --git a/radiant/selection/SelectionMouseTools.h b/radiant/selection/SelectionMouseTools.h
@@ -54,7 +54,6 @@ class SelectMouseTool: public MouseTool
 class BasicSelectionTool: public SelectMouseTool
 {
 private:
-
     Vector2 _start;		// Position at mouseDown
     Vector2 _current;	// Position during mouseMove
 
@@ -79,7 +78,7 @@ class BasicSelectionTool: public SelectMouseTool
     }
 
     // Performs a drag- or point-selection test
-    void testSelect(Event& ev) override;
+    virtual void testSelect(Event& ev) override;
 
     // Recalculates the rectangle used to draw the GUI overlay
     void updateDragSelectionRectangle(Event& ev);

diff --git a/radiant/textool/TexTool.cpp b/radiant/textool/TexTool.cpp
@@ -52,7 +52,9 @@ TexTool::TexTool() :
     MouseToolHandler(IMouseToolGroup::Type::TextureTool),
     _glWidget(new wxutil::GLWidget(this, std::bind(&TexTool::onGLDraw, this), "TexTool")),
     _selectionInfo(GlobalSelectionSystem().getSelectionInfo()),
+#if 0
     _dragRectangle(false),
+#endif
     _manipulatorMode(false),
     _grid(GRID_DEFAULT),
     _gridActive(registry::getValue<bool>(RKEY_GRID_STATE)),
@@ -570,7 +572,7 @@ void TexTool::doMouseUp(const Vector2& coords, wxMouseEvent& event)
 		// Finish the undo recording, store the accumulated undomementos
 		endOperation("TexToolDrag");
 	}
-
+#if 0
 	// If we are in selection mode, end the selection
     if ((event.LeftUp() && event.ShiftDown())
 		 && _dragRectangle)
@@ -599,18 +601,21 @@ void TexTool::doMouseUp(const Vector2& coords, wxMouseEvent& event)
 			selectables[i]->toggle();
 		}
 	}
-
+#endif
 	draw();
 }
 
 void TexTool::doMouseMove(const Vector2& coords, wxMouseEvent& event)
 {
+#if 0
 	if (_dragRectangle)
 	{
 		_selectionRectangle.bottomRight = coords;
 		draw();
 	}
-	else if (_manipulatorMode)
+	else
+#endif
+    if (_manipulatorMode)
 	{
 		Vector2 delta = coords - _manipulateRectangle.topLeft;
 
@@ -660,7 +665,9 @@ void TexTool::doMouseMove(const Vector2& coords, wxMouseEvent& event)
 void TexTool::doMouseDown(const Vector2& coords, wxMouseEvent& event)
 {
 	_manipulatorMode = false;
+#if 0
 	_dragRectangle = false;
+#endif
 
 	if (event.LeftDown() && !event.HasAnyModifiers())
 	{
@@ -679,13 +686,15 @@ void TexTool::doMouseDown(const Vector2& coords, wxMouseEvent& event)
 			beginOperation();
 		}
 	}
+#if 0
     else if (event.LeftDown() && event.ShiftDown())
 	{
 		// Start a drag or click operation
 		_dragRectangle = true;
 		_selectionRectangle.topLeft = coords;
 		_selectionRectangle.bottomRight = coords;
 	}
+#endif
 }
 
 void TexTool::selectRelatedItems() {
@@ -964,7 +973,7 @@ bool TexTool::onGLDraw()
         }
     }
 
-#if 1
+#if 0
 	if (_dragRectangle) {
 		// Create a working reference to save typing
 		textool::Rectangle& rectangle = _selectionRectangle;

diff --git a/radiant/textool/TexTool.h b/radiant/textool/TexTool.h
@@ -69,14 +69,17 @@ class TexTool :
 	// The currently active objects in the textool window
 	textool::TexToolItemVec _items;
 
+#if 0
 	// The draggable selection rectangle
 	textool::Rectangle _selectionRectangle;
-
+#endif
 	// The rectangle defining the manipulation's start and end point
 	textool::Rectangle _manipulateRectangle;
 
+#if 0
 	// TRUE if we are in selection mode
 	bool _dragRectangle;
+#endif
 
 	// TRUE if a manipulation is currently ongoing
 	bool _manipulatorMode;

diff --git a/radiant/textool/tools/TextureToolSelectionTool.h b/radiant/textool/tools/TextureToolSelectionTool.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include "i18n.h"
+#include "math/Vector2.h"
+#include "selection/SelectionMouseTools.h"
+
+namespace ui
+{
+
+class TextureToolSelectionTool :
+    public BasicSelectionTool
+{
+private:
+    Vector2 _start;		// Position at mouseDown
+    Vector2 _current;	// Position during mouseMove
+
+public:
+    TextureToolSelectionTool()
+    {}
+
+    virtual const std::string& getName() override
+    {
+        static std::string name("TextureToolSelectionTool");
+        return name;
+    }
+
+    virtual const std::string& getDisplayName() override
+    {
+        static std::string displayName(_("Select"));
+        return displayName;
+    }
+
+    virtual void testSelect(Event& ev) override
+    {
+        int i = 6;
+    }
+};
+
+}
diff --git a/radiant/ui/mousetool/RegistrationHelper.h b/radiant/ui/mousetool/RegistrationHelper.h
@@ -5,6 +5,7 @@
 #include "selection/ManipulateMouseTool.h"
 #include "xyview/tools/MoveViewTool.h"
 #include "xyview/tools/ZoomTool.h"
+#include "textool/tools/TextureToolSelectionTool.h"
 
 namespace ui
 {
@@ -34,6 +35,7 @@ class MouseToolRegistrationHelper
 
         texToolGroup.registerMouseTool(std::make_shared<MoveViewTool>());
         texToolGroup.registerMouseTool(std::make_shared<ZoomTool>());
+        texToolGroup.registerMouseTool(std::make_shared<TextureToolSelectionTool>());
 	}
 };
 

diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -418,6 +418,7 @@
     <ClInclude Include="..\..\radiant\settings\LocalisationProvider.h" />
     <ClInclude Include="..\..\radiant\settings\Win32Registry.h" />
     <ClInclude Include="..\..\radiant\textool\tools\TextureToolMouseEvent.h" />
+    <ClInclude Include="..\..\radiant\textool\tools\TextureToolSelectionTool.h" />
     <ClInclude Include="..\..\radiant\ui\aas\AasControl.h" />
     <ClInclude Include="..\..\radiant\ui\aas\AasControlDialog.h" />
     <ClInclude Include="..\..\radiant\ui\aas\RenderableAasFile.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -1416,6 +1416,9 @@
     <ClInclude Include="..\..\radiant\textool\tools\TextureToolMouseEvent.h">
       <Filter>src\textool\tools</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiant\textool\tools\TextureToolSelectionTool.h">
+      <Filter>src\textool\tools</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\radiant\darkradiant.rc" />