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

Implement brush saving. Fix #1111

Browse source
This commit is contained in:
Learath 2018-10-02 03:52:01 +02:00
parent 24bd8f2d56
commit fef22f34f2
2 changed files with 94 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
src/game/editor/editor.cpp
View file

@ -132,6 +132,28 @@ CLayerGroup::CLayerGroup()
m_ClipH = 0;
}
CLayerGroup::CLayerGroup(const CLayerGroup& rhs)
{
str_copy(m_aName, rhs.m_aName, sizeof m_aName);
m_Visible = rhs.m_Visible;
m_SaveToMap = rhs.m_SaveToMap;
m_Collapse = rhs.m_Collapse;
m_GameGroup = rhs.m_GameGroup;
m_OffsetX = rhs.m_OffsetX;
m_OffsetY = rhs.m_OffsetY;
m_ParallaxX = rhs.m_ParallaxX;
m_ParallaxY = rhs.m_ParallaxY;
m_UseClipping = rhs.m_UseClipping;
m_ClipX = rhs.m_ClipX;
m_ClipY = rhs.m_ClipY;
m_ClipW = rhs.m_ClipW;
m_ClipH = rhs.m_ClipH;
m_lLayers = rhs.m_lLayers;
m_pMap = rhs.m_pMap;
}
CLayerGroup::~CLayerGroup()
{
Clear();
@ -196,7 +218,7 @@ void CLayerGroup::Render()
m_lLayers[i]->Render();
}
}
for(int i = 0; i < m_lLayers.size(); i++)
{
if(m_lLayers[i]->m_Visible && m_lLayers[i]->m_Type == LAYERTYPE_TILES && m_lLayers[i] != m_pMap->m_pGameLayer
@ -859,10 +881,10 @@ CLayer *CEditor::GetSelectedLayer(int Index)
CLayerGroup *pGroup = GetSelectedGroup();
if(!pGroup)
return 0x0;
if(Index < 0 || Index >= m_lSelectedLayers.size())
return 0x0;
int LayerIndex = m_lSelectedLayers[Index];
if(LayerIndex >= 0 && LayerIndex < m_Map.m_lGroups[m_SelectedGroup]->m_lLayers.size())
@ -1742,10 +1764,10 @@ void CEditor::DoQuad(CQuad *q, int Index)
m_LockMouse = true;
s_Operation = OP_ROTATE;
s_RotateAngle = 0;
if(!IsQuadSelected(Index))
SelectQuad(Index);
CLayerQuads *pLayer = (CLayerQuads *)GetSelectedLayerType(0, LAYERTYPE_QUADS);
s_lRotatePoints.clear();
s_lRotatePoints.set_size(m_lSelectedQuads.size());
@ -1763,7 +1785,7 @@ void CEditor::DoQuad(CQuad *q, int Index)
else
{
s_Operation = OP_MOVE_ALL;
if(!IsQuadSelected(Index))
SelectQuad(Index);
}
@ -1987,7 +2009,7 @@ void CEditor::DoQuadPoint(CQuad *pQuad, int QuadIndex, int V)
m_SelectedPoints = 1<<V;
s_Moved = true;
}
if(!IsQuadSelected(QuadIndex))
SelectQuad(QuadIndex);
}
@ -2553,6 +2575,9 @@ void CEditor::DoMapEditor(CUIRect View)
if(Grabs == 0)
m_Brush.Clear();
for(int i = 0; i < m_Brush.m_lLayers.size(); i++)
m_Brush.m_lLayers[i]->m_BrushRefCount = 1;
m_lSelectedQuads.clear();
m_SelectedPoints = 0;
}
@ -2588,7 +2613,14 @@ void CEditor::DoMapEditor(CUIRect View)
else
{
if(UI()->MouseButton(1))
{
for(int i = 0; i < m_Brush.m_lLayers.size(); i++)
{
if(m_Brush.m_lLayers[i]->m_BrushRefCount == 1)
delete m_Brush.m_lLayers[i];
}
m_Brush.Clear();
}
if(UI()->MouseButton(0) && s_Operation == OP_NONE)
{
@ -3263,7 +3295,7 @@ void CEditor::RenderLayers(CUIRect ToolBox, CUIRect View)
}
}
}
if(m_Map.m_lGroups[g]->m_lLayers[i] == m_Map.m_pGameLayer ||
m_Map.m_lGroups[g]->m_lLayers[i] == m_Map.m_pFrontLayer ||
m_Map.m_lGroups[g]->m_lLayers[i] == m_Map.m_pSwitchLayer ||
@ -5378,6 +5410,48 @@ void CEditor::Render()
m_EditorOffsetY = 0;
m_ZoomLevel = 100;
}
for(int i = KEY_1; i <= KEY_0; i++)
{
if(m_Dialog != DIALOG_NONE || m_EditBoxActive != 0)
break;
if(Input()->KeyPress(i))
{
int Slot = i - KEY_1;
if((Input()->KeyIsPressed(KEY_LCTRL) || Input()->KeyIsPressed(KEY_RCTRL)) && !m_Brush.IsEmpty())
{
dbg_msg("editor", "saving current brush to %d", Slot);
if(m_apSavedBrushes[Slot])
{
CLayerGroup *pPrev = m_apSavedBrushes[Slot];
for(int i = 0; i < pPrev->m_lLayers.size(); i++)
{
if(pPrev->m_lLayers[i]->m_BrushRefCount == 1)
delete pPrev->m_lLayers[i];
else
pPrev->m_lLayers[i]->m_BrushRefCount--;
}
}
delete m_apSavedBrushes[Slot];
m_apSavedBrushes[Slot] = new CLayerGroup(m_Brush);
for(int i = 0; i < m_apSavedBrushes[Slot]->m_lLayers.size(); i++)
m_apSavedBrushes[Slot]->m_lLayers[i]->m_BrushRefCount++;
}
else if(m_apSavedBrushes[Slot])
{
dbg_msg("editor", "loading brush from slot %d", Slot);
CLayerGroup *pNew = m_apSavedBrushes[Slot];
for(int i = 0; i < pNew->m_lLayers.size(); i++)
pNew->m_lLayers[i]->m_BrushRefCount++;
m_Brush = *pNew;
}
}
}
if(m_Dialog == DIALOG_NONE && UI()->MouseInside(&View))
{
// Determines in which direction to zoom.
@ -5538,6 +5612,8 @@ void CEditor::Reset(bool CreateDefault)
fs_listdir(aBuffer, UndoStepsListdirCallback, 0, m_pStorage);
m_lUndoSteps.clear();
mem_zero(m_apSavedBrushes, sizeof m_apSavedBrushes);
// create default layers
if(CreateDefault)
m_Map.CreateDefault(ms_EntitiesTexture);

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

@ -136,6 +136,7 @@ public:
m_SaveToMap = true;
m_Flags = 0;
m_pEditor = 0;
m_BrushRefCount = 0;
}
virtual ~CLayer()
@ -168,6 +169,8 @@ public:
bool m_Readonly;
bool m_Visible;
bool m_SaveToMap;
int m_BrushRefCount;
};
class CLayerGroup
@ -196,6 +199,7 @@ public:
bool m_Collapse;
CLayerGroup();
CLayerGroup(const CLayerGroup& rhs);
~CLayerGroup();
void Convert(CUIRect *pRect);
@ -250,7 +254,8 @@ public:
void Clear()
{
m_lLayers.delete_all();
//m_lLayers.delete_all();
m_lLayers.clear();
}
void AddLayer(CLayer *l);
@ -752,6 +757,9 @@ public:
bool m_Undo;
int m_ShowUndo;
float m_UndoScrollValue;
CLayerGroup *m_apSavedBrushes[10];
void FilelistPopulate(int StorageType);
void InvokeFileDialog(int StorageType, int FileType, const char *pTitle, const char *pButtonText,
const char *pBasepath, const char *pDefaultName,
@ -763,7 +771,7 @@ public:
int Append(const char *pFilename, int StorageType);
void LoadCurrentMap();
void Render();
array<CQuad *> GetSelectedQuads();
CLayer *GetSelectedLayerType(int Index, int Type);
CLayer *GetSelectedLayer(int Index);