#401: Stitch Patch Textures disabled without selection

codereader · Aug 10, 2022 · ca5609c · ca5609c
1 parent 22851ca
commit ca5609c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 19 deletions.
diff --git a/libs/selectionlib.h b/libs/selectionlib.h
@@ -241,7 +241,7 @@ inline void assignNodeToSelectionGroups(const scene::INodePtr& node, const IGrou
 namespace pred
 {
     /// Return true if there is at least one selected brush
-    inline bool haveSelectedBrush()
+    inline bool haveBrush()
     {
         return GlobalSelectionSystem().getSelectionInfo().brushCount > 0;
     }
@@ -253,6 +253,13 @@ namespace pred
         return info.totalCount == n && info.entityCount == n;
     }
 
+    /// Return true if the exact given number of patches are selected (and nothing else)
+    inline bool havePatchesExact(int n)
+    {
+        const auto& info = GlobalSelectionSystem().getSelectionInfo();
+        return info.totalCount == n && info.patchCount == n;
+    }
+
     /// Return true if at least one patch is selected
     inline bool havePatch()
     {

diff --git a/radiant/ui/UserInterfaceModule.cpp b/radiant/ui/UserInterfaceModule.cpp
@@ -435,7 +435,7 @@ void UserInterfaceModule::registerUICommands()
 
     GlobalCommandSystem().addCommand("ExportCollisionModelDialog", ExportCollisionModelDialog::Show);
     GlobalCommandSystem().addWithCheck("QueryBrushPrefabSidesDialog", QuerySidesDialog::Show,
-                                       selection::pred::haveSelectedBrush, {cmd::ARGTYPE_INT});
+                                       selection::pred::haveBrush, {cmd::ARGTYPE_INT});
 
     // Set up the CloneSelection command to react on key up events only
 	GlobalEventManager().addCommand("CloneSelection", "CloneSelection", true); // react on keyUp

diff --git a/radiantcore/brush/BrushModule.cpp b/radiantcore/brush/BrushModule.cpp
@@ -147,7 +147,7 @@ void BrushModuleImpl::registerBrushCommands()
 	GlobalCommandSystem().addCommand("TextureNatural", selection::algorithm::naturalTexture);
     GlobalCommandSystem().addWithCheck("MakeVisportal",
                                        cmd::noArgs(selection::algorithm::makeVisportal),
-                                       selection::pred::haveSelectedBrush);
+                                       selection::pred::haveBrush);
     GlobalCommandSystem().addCommand("SurroundWithMonsterclip", selection::algorithm::surroundWithMonsterclip);
 
 	GlobalCommandSystem().addCommand("ResizeSelectedBrushesToBounds", selection::algorithm::resizeSelectedBrushesToBounds,

diff --git a/radiantcore/brush/csg/CSG.cpp b/radiantcore/brush/csg/CSG.cpp
@@ -494,13 +494,13 @@ void mergeSelectedBrushes(const cmd::ArgumentList& args)
 
 void registerCommands()
 {
-    using selection::pred::haveSelectedBrush;
+    using selection::pred::haveBrush;
 
     GlobalCommandSystem().addWithCheck("CSGSubtract", subtractBrushesFromUnselected,
-                                       haveSelectedBrush);
-    GlobalCommandSystem().addWithCheck("CSGMerge", mergeSelectedBrushes, haveSelectedBrush);
-    GlobalCommandSystem().addWithCheck("CSGHollow", hollowSelectedBrushes, haveSelectedBrush);
-    GlobalCommandSystem().addWithCheck("CSGRoom", makeRoomForSelectedBrushes, haveSelectedBrush);
+                                       haveBrush);
+    GlobalCommandSystem().addWithCheck("CSGMerge", mergeSelectedBrushes, haveBrush);
+    GlobalCommandSystem().addWithCheck("CSGHollow", hollowSelectedBrushes, haveBrush);
+    GlobalCommandSystem().addWithCheck("CSGRoom", makeRoomForSelectedBrushes, haveBrush);
 }
 
 } // namespace algorithm

diff --git a/radiantcore/clipper/Clipper.cpp b/radiantcore/clipper/Clipper.cpp
@@ -280,7 +280,7 @@ void Clipper::initialiseModule(const IApplicationContext& ctx)
 
 	// Register the clip commands
     auto haveSomethingToClip = [this] {
-        return clipMode() && selection::pred::haveSelectedBrush();
+        return clipMode() && selection::pred::haveBrush();
     };
     GlobalCommandSystem().addWithCheck(
         "ClipSelected", cmd::noArgs([this] { clipSelectionCmd(); }), haveSomethingToClip

diff --git a/radiantcore/patch/PatchModule.cpp b/radiantcore/patch/PatchModule.cpp
@@ -12,6 +12,7 @@
 #include "patch/algorithm/Prefab.h"
 #include "patch/algorithm/General.h"
 #include "selection/algorithm/Patch.h"
+#include "selectionlib.h"
 
 #include "module/StaticModule.h"
 #include "messages/TextureChanged.h"
@@ -104,16 +105,20 @@ void PatchModule::registerPatchCommands()
 	GlobalCommandSystem().addCommand("PatchAppendRowBeginning", selection::algorithm::appendPatchRowsAtBeginning);
 	GlobalCommandSystem().addCommand("PatchAppendRowEnd", selection::algorithm::appendPatchRowsAtEnd);
 
-	GlobalCommandSystem().addCommand("InvertCurve", selection::algorithm::invertPatch);
-	GlobalCommandSystem().addCommand("RedisperseRows", selection::algorithm::redispersePatchRows);
-	GlobalCommandSystem().addCommand("RedisperseCols", selection::algorithm::redispersePatchCols);
-	GlobalCommandSystem().addCommand("MatrixTranspose", selection::algorithm::transposePatch);
-	GlobalCommandSystem().addCommand("CapSelectedPatches", selection::algorithm::capPatch, { cmd::ARGTYPE_STRING });
-	GlobalCommandSystem().addCommand("ThickenSelectedPatches", selection::algorithm::thickenPatches,
-		{ cmd::ARGTYPE_DOUBLE, cmd::ARGTYPE_INT, cmd::ARGTYPE_INT }); // thickness, create_seams, axis
-	GlobalCommandSystem().addCommand("StitchPatchTexture", patch::algorithm::stitchTextures);
-	GlobalCommandSystem().addCommand("BulgePatch", patch::algorithm::bulge, { cmd::ARGTYPE_DOUBLE });
-	GlobalCommandSystem().addCommand("WeldSelectedPatches", patch::algorithm::weldSelectedPatches);
+    GlobalCommandSystem().addCommand("InvertCurve", selection::algorithm::invertPatch);
+    GlobalCommandSystem().addCommand("RedisperseRows", selection::algorithm::redispersePatchRows);
+    GlobalCommandSystem().addCommand("RedisperseCols", selection::algorithm::redispersePatchCols);
+    GlobalCommandSystem().addCommand("MatrixTranspose", selection::algorithm::transposePatch);
+    GlobalCommandSystem().addCommand("CapSelectedPatches", selection::algorithm::capPatch,
+                                     {cmd::ARGTYPE_STRING});
+    GlobalCommandSystem().addCommand(
+        "ThickenSelectedPatches", selection::algorithm::thickenPatches,
+        {cmd::ARGTYPE_DOUBLE, cmd::ARGTYPE_INT, cmd::ARGTYPE_INT} // thickness, create_seams, axis
+    );
+    GlobalCommandSystem().addWithCheck("StitchPatchTexture", patch::algorithm::stitchTextures,
+                                       [] { return selection::pred::havePatchesExact(2); });
+    GlobalCommandSystem().addCommand("BulgePatch", patch::algorithm::bulge, {cmd::ARGTYPE_DOUBLE});
+    GlobalCommandSystem().addCommand("WeldSelectedPatches", patch::algorithm::weldSelectedPatches);
 }
 
 module::StaticModuleRegistration<PatchModule> patchModule;