Added Show patches option to View Options

RobertBeckebans · Nov 25, 2023 · 27cf7dc · 27cf7dc
1 parent 0955f33
commit 27cf7dc
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 0 deletions.
diff --git a/common/src/IO/FreeImageTextureReader.cpp b/common/src/IO/FreeImageTextureReader.cpp
@@ -147,6 +147,9 @@ Assets::Texture FreeImageTextureReader::readTextureFromMemory(
     TRUE);
 
   const auto textureType = Assets::Texture::selectTextureType(masked);
+
+  // RB: skip average Color to speed up map loading
+  // const Color averageColor(0.25f, 0.25f, 0.25f, 1.0f);
   const Color averageColor = getAverageColor(buffers.at(0), format);
 
   return Assets::Texture{

diff --git a/common/src/Model/EditorContext.cpp b/common/src/Model/EditorContext.cpp
@@ -241,6 +241,11 @@ bool EditorContext::visible(const Model::PatchNode* patchNode) const
     return true;
   }
 
+  if (!pref(Preferences::ShowPatches))
+  {
+    return false;
+  }
+
   if (patchNode->hasTag(m_hiddenTags))
   {
     return false;

diff --git a/common/src/Preferences.cpp b/common/src/Preferences.cpp
@@ -323,6 +323,7 @@ Preference<bool> ShowSoftMapBounds(IO::Path("Map view/Show soft map bounds"), tr
 
 Preference<bool> ShowPointEntities(IO::Path("Map view/Show point entities"), true);
 Preference<bool> ShowBrushes(IO::Path("Map view/Show brushes"), true);
+Preference<bool> ShowPatches(IO::Path("Map view/Show patches"), true); // RB
 
 QString entityLinkModeAll()
 {

diff --git a/common/src/Preferences.h b/common/src/Preferences.h
@@ -196,6 +196,7 @@ extern Preference<bool> ShowSoftMapBounds;
 // Editor context
 extern Preference<bool> ShowPointEntities;
 extern Preference<bool> ShowBrushes;
+extern Preference<bool> ShowPatches; // RB
 
 QString entityLinkModeAll();
 QString entityLinkModeTransitive();

diff --git a/common/src/View/Actions.cpp b/common/src/View/Actions.cpp
@@ -914,6 +914,13 @@ void ActionManager::createViewActions()
     QKeySequence(),
     [](ActionExecutionContext& context) { context.view()->toggleShowBrushes(); },
     [](ActionExecutionContext& context) { return context.hasDocument(); });
+  createAction(
+    IO::Path("Controls/Map view/View Filter > Toggle show patches"),
+    QObject::tr("Toggle Show Patches"),
+    ActionContext::Any,
+    QKeySequence(),
+    [](ActionExecutionContext& context) { context.view()->toggleShowPatches(); },
+    [](ActionExecutionContext& context) { return context.hasDocument(); });
   createAction(
     IO::Path("Controls/Map view/View Filter > Show textures"),
     QObject::tr("Show Textures"),

diff --git a/common/src/View/MapViewBase.cpp b/common/src/View/MapViewBase.cpp
@@ -852,6 +852,11 @@ void MapViewBase::toggleShowBrushes()
   togglePref(Preferences::ShowBrushes);
 }
 
+void MapViewBase::toggleShowPatches()
+{
+  togglePref(Preferences::ShowPatches);
+}
+
 void MapViewBase::showTextures()
 {
   setPref(Preferences::FaceRenderMode, Preferences::faceRenderModeTextured());

diff --git a/common/src/View/MapViewBase.h b/common/src/View/MapViewBase.h
@@ -291,6 +291,7 @@ class MapViewBase : public RenderView,
   void toggleShowPointEntities();
   void toggleShowPointEntityModels();
   void toggleShowBrushes();
+  void toggleShowPatches(); // RB
   void showTextures();
   void hideTextures();
   void hideFaces();

diff --git a/common/src/View/ViewEditor.cpp b/common/src/View/ViewEditor.cpp
@@ -414,6 +414,17 @@ QWidget* ViewEditor::createBrushesPanel(QWidget* parent)
   ensure(innerLayout != nullptr, "inner sizer is null");
   innerLayout->insertWidget(0, m_showBrushesCheckBox);
 
+  // RB begin
+  m_showPatchesCheckBox = new QCheckBox(tr("Show patches"));
+  connect(
+    m_showPatchesCheckBox,
+    &QAbstractButton::clicked,
+    this,
+    &ViewEditor::showPatchesChanged);
+
+  innerLayout->insertWidget(0, m_showPatchesCheckBox);
+  // RB end
+
   return panel;
 }
 
@@ -615,6 +626,7 @@ void ViewEditor::refreshBrushesPanel()
   auto document = kdl::mem_lock(m_document);
 
   m_showBrushesCheckBox->setChecked(pref(Preferences::ShowBrushes));
+  m_showPatchesCheckBox->setChecked(pref(Preferences::ShowPatches));
 
   Model::EditorContext& editorContext = document->editorContext();
   const Model::TagType::Type hiddenTags = editorContext.hiddenTags();
@@ -670,6 +682,11 @@ void ViewEditor::showBrushesChanged(const bool checked)
   setPref(Preferences::ShowBrushes, checked);
 }
 
+void ViewEditor::showPatchesChanged(const bool checked)
+{
+  setPref(Preferences::ShowPatches, checked);
+}
+
 void ViewEditor::showTagChanged(const bool checked, const Model::TagType::Type tagType)
 {
   auto document = kdl::mem_lock(m_document);
@@ -760,6 +777,7 @@ void ViewEditor::restoreDefaultsClicked()
   prefs.resetToDefault(Preferences::ShowSoftMapBounds);
   prefs.resetToDefault(Preferences::ShowPointEntities);
   prefs.resetToDefault(Preferences::ShowBrushes);
+  prefs.resetToDefault(Preferences::ShowPatches);
   prefs.resetToDefault(Preferences::EntityLinkMode);
   prefs.saveChanges();
 }

diff --git a/common/src/View/ViewEditor.h b/common/src/View/ViewEditor.h
@@ -105,6 +105,7 @@ class ViewEditor : public QWidget
   EntityDefinitionCheckBoxList* m_entityDefinitionCheckBoxList;
 
   QCheckBox* m_showBrushesCheckBox;
+  QCheckBox* m_showPatchesCheckBox; // RB
   std::vector<std::pair<Model::TagType::Type, QCheckBox*>> m_tagCheckBoxes;
 
   QButtonGroup* m_renderModeRadioGroup;
@@ -153,6 +154,7 @@ class ViewEditor : public QWidget
   void showPointEntitiesChanged(bool checked);
   void showPointEntityModelsChanged(bool checked);
   void showBrushesChanged(bool checked);
+  void showPatchesChanged(bool checked);
   void showTagChanged(bool checked, Model::TagType::Type tagType);
   void faceRenderModeChanged(int id);
   void shadeFacesChanged(bool checked);