mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'i-dont-have-a-type' into 'master'

Browse Source 
Selection Groups Cleanup

Closes #7759

See merge request OpenMW/openmw!3731
qt6_macos
Alexei Kotov 4 months ago
parent 849a585e2c c563219b61
commit 8fff7215f4
11 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File

42
apps/opencs/model/prefs/values.hpp
Unescape Escape View File

@ -479,27 +479,27 @@ namespace CSMPrefs
Settings::SettingValue<std::string> mSceneRenderStats{ mIndex, sName, "scene-render-stats", "F3" };
Settings::SettingValue<std::string> mSceneClearSelection{ mIndex, sName, "scene-clear-selection", "Space" };
Settings::SettingValue<std::string> mSceneUnhideAll{ mIndex, sName, "scene-unhide-all", "Alt+H" };
Settings::SettingValue<std::string> mSceneToggleHidden{ mIndex, sName, "scene-toggle-visibility", "H" };
Settings::SettingValue<std::string> mSceneSelectGroup1{ mIndex, sName, "scene-group-1", "1" };
Settings::SettingValue<std::string> mSceneSaveGroup1{ mIndex, sName, "scene-save-1", "Ctrl+1" };
Settings::SettingValue<std::string> mSceneSelectGroup2{ mIndex, sName, "scene-group-2", "2" };
Settings::SettingValue<std::string> mSceneSaveGroup2{ mIndex, sName, "scene-save-2", "Ctrl+2" };
Settings::SettingValue<std::string> mSceneSelectGroup3{ mIndex, sName, "scene-group-3", "3" };
Settings::SettingValue<std::string> mSceneSaveGroup3{ mIndex, sName, "scene-save-3", "Ctrl+3" };
Settings::SettingValue<std::string> mSceneSelectGroup4{ mIndex, sName, "scene-group-4", "4" };
Settings::SettingValue<std::string> mSceneSaveGroup4{ mIndex, sName, "scene-save-4", "Ctrl+4" };
Settings::SettingValue<std::string> mSceneSelectGroup5{ mIndex, sName, "scene-group-5", "5" };
Settings::SettingValue<std::string> mSceneSaveGroup5{ mIndex, sName, "scene-save-5", "Ctrl+5" };
Settings::SettingValue<std::string> mSceneSelectGroup6{ mIndex, sName, "scene-group-6", "6" };
Settings::SettingValue<std::string> mSceneSaveGroup6{ mIndex, sName, "scene-save-6", "Ctrl+6" };
Settings::SettingValue<std::string> mSceneSelectGroup7{ mIndex, sName, "scene-group-7", "7" };
Settings::SettingValue<std::string> mSceneSaveGroup7{ mIndex, sName, "scene-save-7", "Ctrl+7" };
Settings::SettingValue<std::string> mSceneSelectGroup8{ mIndex, sName, "scene-group-8", "8" };
Settings::SettingValue<std::string> mSceneSaveGroup8{ mIndex, sName, "scene-save-8", "Ctrl+8" };
Settings::SettingValue<std::string> mSceneSelectGroup9{ mIndex, sName, "scene-group-9", "9" };
Settings::SettingValue<std::string> mSceneSaveGroup9{ mIndex, sName, "scene-save-9", "Ctrl+9" };
Settings::SettingValue<std::string> mSceneSelectGroup10{ mIndex, sName, "scene-group-0", "0" };
Settings::SettingValue<std::string> mSceneSaveGroup10{ mIndex, sName, "scene-save-0", "Ctrl+0" };
Settings::SettingValue<std::string> mSceneToggleVisibility{ mIndex, sName, "scene-toggle-visibility", "H" };
Settings::SettingValue<std::string> mSceneGroup0{ mIndex, sName, "scene-group-0", "0" };
Settings::SettingValue<std::string> mSceneSave0{ mIndex, sName, "scene-save-0", "Ctrl+0" };
Settings::SettingValue<std::string> mSceneGroup1{ mIndex, sName, "scene-group-1", "1" };
Settings::SettingValue<std::string> mSceneSave1{ mIndex, sName, "scene-save-1", "Ctrl+1" };
Settings::SettingValue<std::string> mSceneGroup2{ mIndex, sName, "scene-group-2", "2" };
Settings::SettingValue<std::string> mSceneSave2{ mIndex, sName, "scene-save-2", "Ctrl+2" };
Settings::SettingValue<std::string> mSceneGroup3{ mIndex, sName, "scene-group-3", "3" };
Settings::SettingValue<std::string> mSceneSave3{ mIndex, sName, "scene-save-3", "Ctrl+3" };
Settings::SettingValue<std::string> mSceneGroup4{ mIndex, sName, "scene-group-4", "4" };
Settings::SettingValue<std::string> mSceneSave4{ mIndex, sName, "scene-save-4", "Ctrl+4" };
Settings::SettingValue<std::string> mSceneGroup5{ mIndex, sName, "scene-group-5", "5" };
Settings::SettingValue<std::string> mSceneSave5{ mIndex, sName, "scene-save-5", "Ctrl+5" };
Settings::SettingValue<std::string> mSceneGroup6{ mIndex, sName, "scene-group-6", "6" };
Settings::SettingValue<std::string> mSceneSave6{ mIndex, sName, "scene-save-6", "Ctrl+6" };
Settings::SettingValue<std::string> mSceneGroup7{ mIndex, sName, "scene-group-7", "7" };
Settings::SettingValue<std::string> mSceneSave7{ mIndex, sName, "scene-save-7", "Ctrl+7" };
Settings::SettingValue<std::string> mSceneGroup8{ mIndex, sName, "scene-group-8", "8" };
Settings::SettingValue<std::string> mSceneSave8{ mIndex, sName, "scene-save-8", "Ctrl+8" };
Settings::SettingValue<std::string> mSceneGroup9{ mIndex, sName, "scene-group-9", "9" };
Settings::SettingValue<std::string> mSceneSave9{ mIndex, sName, "scene-save-9", "Ctrl+9" };
Settings::SettingValue<std::string> mFreeForward{ mIndex, sName, "free-forward", "W" };
Settings::SettingValue<std::string> mFreeBackward{ mIndex, sName, "free-backward", "S" };
Settings::SettingValue<std::string> mFreeLeft{ mIndex, sName, "free-left", "A" };

1
apps/opencs/model/world/data.cpp
Unescape Escape View File

@ -622,6 +622,7 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
mSelectionGroups.addColumn(new StringIdColumn<ESM::SelectionGroup>);
mSelectionGroups.addColumn(new RecordStateColumn<ESM::SelectionGroup>);
mSelectionGroups.addColumn(new FixedRecordTypeColumn<ESM::SelectionGroup>(UniversalId::Type_SelectionGroup));
mSelectionGroups.addColumn(new SelectionGroupColumn);
mMetaData.appendBlankRecord(ESM::RefId::stringRefId("sys::meta"));

2
apps/opencs/view/render/cell.cpp
Unescape Escape View File

@ -612,7 +612,7 @@ osg::ref_ptr<CSVRender::TagBase> CSVRender::Cell::getSnapTarget(unsigned int ele
return result;
}
void CSVRender::Cell::selectFromGroup(const std::vector<std::string> group)
void CSVRender::Cell::selectFromGroup(const std::vector<std::string>& group)
{
for (const auto& [_, object] : mObjects)
{

2
apps/opencs/view/render/cell.hpp
Unescape Escape View File

@ -148,7 +148,7 @@ namespace CSVRender
// already selected
void selectAllWithSameParentId(int elementMask);
void selectFromGroup(const std::vector<std::string> group);
void selectFromGroup(const std::vector<std::string>& group);
void unhideAll();

2
apps/opencs/view/render/object.cpp
Unescape Escape View File

@ -484,7 +484,7 @@ CSVRender::Object::~Object()
mParentNode->removeChild(mRootNode);
}
void CSVRender::Object::setSelected(bool selected, osg::Vec4f color)
void CSVRender::Object::setSelected(bool selected, const osg::Vec4f& color)
{
mSelected = selected;

2
apps/opencs/view/render/object.hpp
Unescape Escape View File

@ -139,7 +139,7 @@ namespace CSVRender
~Object();
/// Mark the object as selected, selected objects show an outline effect
void setSelected(bool selected, osg::Vec4f color = osg::Vec4f(1, 1, 1, 1));
void setSelected(bool selected, const osg::Vec4f& color = osg::Vec4f(1, 1, 1, 1));
bool getSelected() const;

2
apps/opencs/view/render/pagedworldspacewidget.cpp
Unescape Escape View File

@ -875,7 +875,7 @@ std::vector<osg::ref_ptr<CSVRender::TagBase>> CSVRender::PagedWorldspaceWidget::
return result;
}
void CSVRender::PagedWorldspaceWidget::selectGroup(std::vector<std::string> group) const
void CSVRender::PagedWorldspaceWidget::selectGroup(const std::vector<std::string>& group) const
{
for (const auto& [_, cell] : mCells)
cell->selectFromGroup(group);

2
apps/opencs/view/render/pagedworldspacewidget.hpp
Unescape Escape View File

@ -163,7 +163,7 @@ namespace CSVRender
std::vector<osg::ref_ptr<TagBase>> getSelection(unsigned int elementMask) const override;
void selectGroup(const std::vector<std::string> group) const override;
void selectGroup(const std::vector<std::string>& group) const override;
void unhideAll() const override;

2
apps/opencs/view/render/unpagedworldspacewidget.cpp
Unescape Escape View File

@ -199,7 +199,7 @@ std::vector<osg::ref_ptr<CSVRender::TagBase>> CSVRender::UnpagedWorldspaceWidget
return mCell->getSelection(elementMask);
}
void CSVRender::UnpagedWorldspaceWidget::selectGroup(const std::vector<std::string> group) const
void CSVRender::UnpagedWorldspaceWidget::selectGroup(const std::vector<std::string>& group) const
{
mCell->selectFromGroup(group);
}

2
apps/opencs/view/render/unpagedworldspacewidget.hpp
Unescape Escape View File

@ -93,7 +93,7 @@ namespace CSVRender
std::vector<osg::ref_ptr<TagBase>> getSelection(unsigned int elementMask) const override;
void selectGroup(const std::vector<std::string> group) const override;
void selectGroup(const std::vector<std::string>& group) const override;
void unhideAll() const override;

2
apps/opencs/view/render/worldspacewidget.hpp
Unescape Escape View File

@ -201,7 +201,7 @@ namespace CSVRender
virtual std::vector<osg::ref_ptr<TagBase>> getSelection(unsigned int elementMask) const = 0;
virtual void selectGroup(const std::vector<std::string>) const = 0;
virtual void selectGroup(const std::vector<std::string>&) const = 0;
virtual void unhideAll() const = 0;

Write Preview
Loading…
Cancel
Save