edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-18 22:18:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8982 from ChillerDragon/pr_qa_aq

Browse source 
Add quick action "Add quads layer"
This commit is contained in:
Dennis Felsing 2024-09-19 06:13:51 +00:00 committed by GitHub
parent be659b2f5d ec6ddc5ef7
commit 66e8d1f726
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/game/editor/editor.h
View file

@ -330,6 +330,7 @@ public:
void AddGroup(); void AddGroup();
void AddTileLayer(); void AddTileLayer();
void AddFrontLayer(); void AddFrontLayer();
void AddQuadsLayer();
void LayerSelectImage(); void LayerSelectImage();
bool IsNonGameTileLayerSelected() const; bool IsNonGameTileLayerSelected() const;
void MapDetails(); void MapDetails();

10
src/game/editor/popups.cpp
View file

@ -565,15 +565,9 @@ CUi::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View,
// new quad layer // new quad layer
View.HSplitBottom(5.0f, &View, nullptr); View.HSplitBottom(5.0f, &View, nullptr);
View.HSplitBottom(12.0f, &View, &Button); View.HSplitBottom(12.0f, &View, &Button);
static int s_NewQuadLayerButton = 0; if(pEditor->DoButton_Editor(&pEditor->m_QuickActionAddQuadsLayer, pEditor->m_QuickActionAddQuadsLayer.Label(), 0, &Button, 0, pEditor->m_QuickActionAddQuadsLayer.Description()))
if(pEditor->DoButton_Editor(&s_NewQuadLayerButton, "Add quads layer", 0, &Button, 0, "Creates a new quad layer"))
{ {
std::shared_ptr<CLayer> pQuadLayer = std::make_shared<CLayerQuads>(pEditor); pEditor->m_QuickActionAddQuadsLayer.Call();
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pQuadLayer);
int LayerIndex = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1;
pEditor->SelectLayer(LayerIndex);
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_Collapse = false;
pEditor->m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(pEditor, pEditor->m_SelectedGroup, LayerIndex));
return CUi::POPUP_CLOSE_CURRENT; return CUi::POPUP_CLOSE_CURRENT;
} }

10
src/game/editor/quick_actions.cpp
View file

@ -75,6 +75,16 @@ void CEditor::AddFrontLayer()
m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(this, m_SelectedGroup, LayerIndex)); m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(this, m_SelectedGroup, LayerIndex));
} }
void CEditor::AddQuadsLayer()
{
std::shared_ptr<CLayer> pQuadLayer = std::make_shared<CLayerQuads>(this);
m_Map.m_vpGroups[m_SelectedGroup]->AddLayer(pQuadLayer);
int LayerIndex = m_Map.m_vpGroups[m_SelectedGroup]->m_vpLayers.size() - 1;
SelectLayer(LayerIndex);
m_Map.m_vpGroups[m_SelectedGroup]->m_Collapse = false;
m_EditorHistory.RecordAction(std::make_shared<CEditorActionAddLayer>(this, m_SelectedGroup, LayerIndex));
}
bool CEditor::IsNonGameTileLayerSelected() const bool CEditor::IsNonGameTileLayerSelected() const
{ {
std::shared_ptr<CLayer> pLayer = GetSelectedLayer(0); std::shared_ptr<CLayer> pLayer = GetSelectedLayer(0);

2
src/game/editor/quick_actions.h
View file

@ -177,6 +177,8 @@ REGISTER_QUICK_ACTION(
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Creates a new item layer.") "Creates a new item layer.")
REGISTER_QUICK_ACTION(
AddQuadsLayer, "Add quads layer", [&]() { AddQuadsLayer(); }, ALWAYS_FALSE, ALWAYS_FALSE, DEFAULT_BTN, "Creates a new quads layer.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
SaveAs, SaveAs,
"Save As", "Save As",