From b3c81e7258cabc72cf9f610da0aa6aa494dd30a9 Mon Sep 17 00:00:00 2001 From: oy Date: Sat, 9 Oct 2010 18:38:23 +0200 Subject: added the possibility to shift the tiles of a layer into any direction --- src/game/editor/ed_editor.cpp | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'src/game/editor/ed_editor.cpp') diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp index 270f3efd..0b84fe38 100644 --- a/src/game/editor/ed_editor.cpp +++ b/src/game/editor/ed_editor.cpp @@ -1668,6 +1668,41 @@ int CEditor::DoProperties(CUIRect *pToolBox, CProperty *pProps, int *pIds, int * Change = i; } } + else if(pProps[i].m_Type == PROPTYPE_SHIFT) + { + CUIRect Left, Right, Up, Down; + Shifter.VSplitMid(&Left, &Up); + Left.VSplitRight(1.0f, &Left, 0); + Up.VSplitLeft(1.0f, 0, &Up); + Left.VSplitLeft(10.0f, &Left, &Shifter); + Shifter.VSplitRight(10.0f, &Shifter, &Right); + RenderTools()->DrawUIRect(&Shifter, vec4(1,1,1,0.5f), 0, 0.0f); + UI()->DoLabel(&Shifter, "X", 10.0f, 0, -1); + Up.VSplitLeft(10.0f, &Up, &Shifter); + Shifter.VSplitRight(10.0f, &Shifter, &Down); + RenderTools()->DrawUIRect(&Shifter, vec4(1,1,1,0.5f), 0, 0.0f); + UI()->DoLabel(&Shifter, "Y", 10.0f, 0, -1); + if(DoButton_ButtonDec(&pIds[i], "-", 0, &Left, 0, Localize("Left"))) + { + *pNewVal = 1; + Change = i; + } + if(DoButton_ButtonInc(((char *)&pIds[i])+3, "+", 0, &Right, 0, Localize("Right"))) + { + *pNewVal = 2; + Change = i; + } + if(DoButton_ButtonDec(((char *)&pIds[i])+1, "-", 0, &Up, 0, Localize("Up"))) + { + *pNewVal = 4; + Change = i; + } + if(DoButton_ButtonInc(((char *)&pIds[i])+2, "+", 0, &Down, 0, Localize("Down"))) + { + *pNewVal = 8; + Change = i; + } + } } return Change; @@ -1779,7 +1814,7 @@ void CEditor::RenderLayers(CUIRect ToolBox, CUIRect ToolBar, CUIRect View) m_SelectedGroup = g; static int s_LayerPopupId = 0; if(Result == 2) - UiInvokePopupMenu(&s_LayerPopupId, 0, UI()->MouseX(), UI()->MouseY(), 120, 150, PopupLayer); + UiInvokePopupMenu(&s_LayerPopupId, 0, UI()->MouseX(), UI()->MouseY(), 120, 180, PopupLayer); } LayerCur += 14.0f; -- cgit 1.4.1