diff options
Diffstat (limited to 'src/game/editor/ed_popups.cpp')
| -rw-r--r-- | src/game/editor/ed_popups.cpp | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/src/game/editor/ed_popups.cpp b/src/game/editor/ed_popups.cpp index 8f2c929a..f572e43c 100644 --- a/src/game/editor/ed_popups.cpp +++ b/src/game/editor/ed_popups.cpp @@ -44,7 +44,7 @@ void CEditor::UiDoPopupMenu() { bool Inside = UI()->MouseInside(&s_UiPopups[i].m_Rect); UI()->SetHotItem(&s_UiPopups[i].m_pId); - + if(UI()->ActiveItem() == &s_UiPopups[i].m_pId) { if(!UI()->MouseButton(0)) @@ -59,20 +59,20 @@ void CEditor::UiDoPopupMenu() if(UI()->MouseButton(0)) UI()->SetActiveItem(&s_UiPopups[i].m_pId); } - + int Corners = CUI::CORNER_ALL; if(s_UiPopups[i].m_IsMenu) Corners = CUI::CORNER_R|CUI::CORNER_B; - + CUIRect r = s_UiPopups[i].m_Rect; RenderTools()->DrawUIRect(&r, vec4(0.5f,0.5f,0.5f,0.75f), Corners, 3.0f); r.Margin(1.0f, &r); RenderTools()->DrawUIRect(&r, vec4(0,0,0,0.75f), Corners, 3.0f); r.Margin(4.0f, &r); - + if(s_UiPopups[i].m_pfnFunc(this, r)) g_UiNumPopups--; - + if(Input()->KeyDown(KEY_ESCAPE)) g_UiNumPopups--; } @@ -85,7 +85,7 @@ int CEditor::PopupGroup(CEditor *pEditor, CUIRect View) CUIRect Button; View.HSplitBottom(12.0f, &View, &Button); static int s_DeleteButton = 0; - + // don't allow deletion of game group if(pEditor->m_Map.m_pGameGroup != pEditor->GetSelectedGroup()) { @@ -162,7 +162,7 @@ int CEditor::PopupGroup(CEditor *pEditor, CUIRect View) pEditor->m_SelectedLayer = pEditor->m_Map.m_lGroups[pEditor->m_SelectedGroup]->m_lLayers.size()-1; return 1; } - + enum { PROP_ORDER=0, @@ -177,7 +177,7 @@ int CEditor::PopupGroup(CEditor *pEditor, CUIRect View) PROP_CLIP_H, NUM_PROPS, }; - + CProperty aProps[] = { {"Order", pEditor->m_SelectedGroup, PROPTYPE_INT_STEP, 0, pEditor->m_Map.m_lGroups.size()-1}, {"Pos X", -pEditor->m_Map.m_lGroups[pEditor->m_SelectedGroup]->m_OffsetX, PROPTYPE_INT_SCROLL, -1000000, 1000000}, @@ -192,21 +192,21 @@ int CEditor::PopupGroup(CEditor *pEditor, CUIRect View) {"Clip H", pEditor->m_Map.m_lGroups[pEditor->m_SelectedGroup]->m_ClipH, PROPTYPE_INT_SCROLL, -1000000, 1000000}, {0}, }; - + static int s_aIds[NUM_PROPS] = {0}; int NewVal = 0; - + // cut the properties that isn't needed if(pEditor->GetSelectedGroup()->m_GameGroup) aProps[PROP_POS_X].m_pName = 0; - + int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal); if(Prop != -1) pEditor->m_Map.m_Modified = true; if(Prop == PROP_ORDER) pEditor->m_SelectedGroup = pEditor->m_Map.SwapGroups(pEditor->m_SelectedGroup, NewVal); - + // these can not be changed on the game group if(!pEditor->GetSelectedGroup()->m_GameGroup) { @@ -220,7 +220,7 @@ int CEditor::PopupGroup(CEditor *pEditor, CUIRect View) else if(Prop == PROP_CLIP_W) pEditor->m_Map.m_lGroups[pEditor->m_SelectedGroup]->m_ClipW = NewVal; else if(Prop == PROP_CLIP_H) pEditor->m_Map.m_lGroups[pEditor->m_SelectedGroup]->m_ClipH = NewVal; } - + return 0; } @@ -230,7 +230,7 @@ int CEditor::PopupLayer(CEditor *pEditor, CUIRect View) CUIRect Button; View.HSplitBottom(12.0f, &View, &Button); static int s_DeleteButton = 0; - + // don't allow deletion of game layer if(pEditor->m_Map.m_pGameLayer != pEditor->GetSelectedLayer(0) && pEditor->DoButton_Editor(&s_DeleteButton, "Delete layer", 0, &Button, 0, "Deletes the layer")) @@ -240,10 +240,10 @@ int CEditor::PopupLayer(CEditor *pEditor, CUIRect View) } View.HSplitBottom(10.0f, &View, 0); - + CLayerGroup *pCurrentGroup = pEditor->m_Map.m_lGroups[pEditor->m_SelectedGroup]; CLayer *pCurrentLayer = pEditor->GetSelectedLayer(0); - + enum { PROP_GROUP=0, @@ -251,7 +251,7 @@ int CEditor::PopupLayer(CEditor *pEditor, CUIRect View) PROP_HQ, NUM_PROPS, }; - + CProperty aProps[] = { {"Group", pEditor->m_SelectedGroup, PROPTYPE_INT_STEP, 0, pEditor->m_Map.m_lGroups.size()-1}, {"Order", pEditor->m_SelectedLayer, PROPTYPE_INT_STEP, 0, pCurrentGroup->m_lLayers.size()}, @@ -264,13 +264,13 @@ int CEditor::PopupLayer(CEditor *pEditor, CUIRect View) aProps[0].m_Type = PROPTYPE_NULL; aProps[2].m_Type = PROPTYPE_NULL; } - + static int s_aIds[NUM_PROPS] = {0}; int NewVal = 0; int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal); if(Prop != -1) pEditor->m_Map.m_Modified = true; - + if(Prop == PROP_ORDER) pEditor->m_SelectedLayer = pCurrentGroup->SwapLayers(pEditor->m_SelectedLayer, NewVal); else if(Prop == PROP_GROUP && pCurrentLayer->m_Type != LAYERTYPE_GAME) @@ -289,7 +289,7 @@ int CEditor::PopupLayer(CEditor *pEditor, CUIRect View) if(NewVal) pCurrentLayer->m_Flags |= LAYERFLAG_DETAIL; } - + return pCurrentLayer->RenderProperties(&View); } @@ -298,7 +298,7 @@ int CEditor::PopupQuad(CEditor *pEditor, CUIRect View) CQuad *pQuad = pEditor->GetSelectedQuad(); CUIRect Button; - + // delete button View.HSplitBottom(12.0f, &View, &Button); static int s_DeleteButton = 0; @@ -335,7 +335,7 @@ int CEditor::PopupQuad(CEditor *pEditor, CUIRect View) } int Height = (Right-Left)*pEditor->m_Map.m_lImages[pLayer->m_Image]->m_Height/pEditor->m_Map.m_lImages[pLayer->m_Image]->m_Width; - + pQuad->m_aPoints[0].x = Left; pQuad->m_aPoints[0].y = Top; pQuad->m_aPoints[1].x = Right; pQuad->m_aPoints[1].y = Top; pQuad->m_aPoints[2].x = Left; pQuad->m_aPoints[2].y = Top+Height; @@ -370,7 +370,7 @@ int CEditor::PopupQuad(CEditor *pEditor, CUIRect View) int Left = pQuad->m_aPoints[0].x; int Bottom = pQuad->m_aPoints[0].y; int Right = pQuad->m_aPoints[0].x; - + for(int k = 1; k < 4; k++) { if(pQuad->m_aPoints[k].y < Top) Top = pQuad->m_aPoints[k].y; @@ -378,7 +378,7 @@ int CEditor::PopupQuad(CEditor *pEditor, CUIRect View) if(pQuad->m_aPoints[k].y > Bottom) Bottom = pQuad->m_aPoints[k].y; if(pQuad->m_aPoints[k].x > Right) Right = pQuad->m_aPoints[k].x; } - + pQuad->m_aPoints[0].x = Left; pQuad->m_aPoints[0].y = Top; pQuad->m_aPoints[1].x = Right; pQuad->m_aPoints[1].y = Top; pQuad->m_aPoints[2].x = Left; pQuad->m_aPoints[2].y = Bottom; @@ -398,7 +398,7 @@ int CEditor::PopupQuad(CEditor *pEditor, CUIRect View) PROP_COLOR_ENV_OFFSET, NUM_PROPS, }; - + CProperty aProps[] = { {"Pos X", pQuad->m_aPoints[4].x/1000, PROPTYPE_INT_SCROLL, -1000000, 1000000}, {"Pos Y", pQuad->m_aPoints[4].y/1000, PROPTYPE_INT_SCROLL, -1000000, 1000000}, @@ -406,16 +406,16 @@ int CEditor::PopupQuad(CEditor *pEditor, CUIRect View) {"Pos. TO", pQuad->m_PosEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000}, {"Color Env", pQuad->m_ColorEnv+1, PROPTYPE_INT_STEP, 0, pEditor->m_Map.m_lEnvelopes.size()+1}, {"Color TO", pQuad->m_ColorEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000}, - + {0}, }; - + static int s_aIds[NUM_PROPS] = {0}; int NewVal = 0; int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal); if(Prop != -1) pEditor->m_Map.m_Modified = true; - + if(Prop == PROP_POS_X) { float Offset = NewVal*1000-pQuad->m_aPoints[4].x; @@ -432,14 +432,14 @@ int CEditor::PopupQuad(CEditor *pEditor, CUIRect View) if(Prop == PROP_POS_ENV_OFFSET) pQuad->m_PosEnvOffset = NewVal; if(Prop == PROP_COLOR_ENV) pQuad->m_ColorEnv = clamp(NewVal-1, -1, pEditor->m_Map.m_lEnvelopes.size()-1); if(Prop == PROP_COLOR_ENV_OFFSET) pQuad->m_ColorEnvOffset = NewVal; - + return 0; } int CEditor::PopupPoint(CEditor *pEditor, CUIRect View) { CQuad *pQuad = pEditor->GetSelectedQuad(); - + enum { PROP_POS_X=0, @@ -447,7 +447,7 @@ int CEditor::PopupPoint(CEditor *pEditor, CUIRect View) PROP_COLOR, NUM_PROPS, }; - + int Color = 0; int x = 0, y = 0; @@ -465,15 +465,15 @@ int CEditor::PopupPoint(CEditor *pEditor, CUIRect View) y = pQuad->m_aPoints[v].y/1000; } } - - + + CProperty aProps[] = { {"Pos X", x, PROPTYPE_INT_SCROLL, -1000000, 1000000}, {"Pos Y", y, PROPTYPE_INT_SCROLL, -1000000, 1000000}, {"Color", Color, PROPTYPE_COLOR, -1, pEditor->m_Map.m_lEnvelopes.size()}, {0}, }; - + static int s_aIds[NUM_PROPS] = {0}; int NewVal = 0; int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal); @@ -506,8 +506,8 @@ int CEditor::PopupPoint(CEditor *pEditor, CUIRect View) } } } - - return 0; + + return 0; } int CEditor::PopupNewFolder(CEditor *pEditor, CUIRect View) @@ -520,7 +520,7 @@ int CEditor::PopupNewFolder(CEditor *pEditor, CUIRect View) pEditor->UI()->DoLabel(&Label, "Create new folder", 20.0f, 0); View.HSplitBottom(10.0f, &View, 0); - View.HSplitBottom(20.0f, &View, &ButtonBar); + View.HSplitBottom(20.0f, &View, &ButtonBar); if(pEditor->m_FileDialogErrString[0] == 0) { @@ -551,7 +551,7 @@ int CEditor::PopupNewFolder(CEditor *pEditor, CUIRect View) } else str_copy(pEditor->m_FileDialogErrString, "Unable to create the folder", sizeof(pEditor->m_FileDialogErrString)); - } + } } ButtonBar.VSplitRight(30.0f, &ButtonBar, 0); ButtonBar.VSplitRight(110.0f, &ButtonBar, &Label); @@ -576,7 +576,7 @@ int CEditor::PopupNewFolder(CEditor *pEditor, CUIRect View) return 1; } - return 0; + return 0; } int CEditor::PopupEvent(CEditor *pEditor, CUIRect View) @@ -596,7 +596,7 @@ int CEditor::PopupEvent(CEditor *pEditor, CUIRect View) pEditor->UI()->DoLabel(&Label, "Save map", 20.0f, 0); View.HSplitBottom(10.0f, &View, 0); - View.HSplitBottom(20.0f, &View, &ButtonBar); + View.HSplitBottom(20.0f, &View, &ButtonBar); // notification text View.HSplitTop(30.0f, 0, &View); @@ -648,18 +648,18 @@ int CEditor::PopupSelectImage(CEditor *pEditor, CUIRect View) CUIRect ButtonBar, ImageView; View.VSplitLeft(80.0f, &ButtonBar, &View); View.Margin(10.0f, &ImageView); - + int ShowImage = g_SelectImageCurrent; - + for(int i = -1; i < pEditor->m_Map.m_lImages.size(); i++) { CUIRect Button; ButtonBar.HSplitTop(12.0f, &Button, &ButtonBar); ButtonBar.HSplitTop(2.0f, 0, &ButtonBar); - + if(pEditor->UI()->MouseInside(&Button)) ShowImage = i; - + if(i == -1) { if(pEditor->DoButton_MenuItem(&pEditor->m_Map.m_lImages[i], "None", i==g_SelectImageCurrent, &Button)) @@ -671,7 +671,7 @@ int CEditor::PopupSelectImage(CEditor *pEditor, CUIRect View) g_SelectImageSelected = i; } } - + if(ShowImage >= 0 && ShowImage < pEditor->m_Map.m_lImages.size()) pEditor->Graphics()->TextureSet(pEditor->m_Map.m_lImages[ShowImage]->m_TexID); else @@ -696,7 +696,7 @@ int CEditor::PopupSelectImageResult() { if(g_SelectImageSelected == -100) return -100; - + g_SelectImageCurrent = g_SelectImageSelected; g_SelectImageSelected = -100; return g_SelectImageCurrent; @@ -732,7 +732,7 @@ int CEditor::PopupSelectGameTileOpResult() { if(s_GametileOpSelected < 0) return -1; - + int Result = s_GametileOpSelected; s_GametileOpSelected = -1; return Result; |