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

Merge pull request #7017 from Marmare314/mapview

Browse source 
Add `CProofMode` and `CMapGrid` component
This commit is contained in:
Robert Müller 2023-08-26 08:54:38 +00:00 committed by GitHub
parent 5ba1834eed 467de92377
commit 6b6ee21338
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 871 additions and 450 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -2316,9 +2316,13 @@ if(CLIENT)
layer_quads.cpp
layer_sounds.cpp
layer_tiles.cpp
map_grid.cpp
map_grid.h
map_view.cpp
map_view.h
popups.cpp
proof_mode.cpp
proof_mode.h
smooth_value.cpp
smooth_value.h
)

72
src/game/editor/component.cpp
View file

@ -16,18 +16,86 @@ void CEditorComponent::Init(CEditor *pEditor)
m_pStorage = pEditor->Storage();
m_pUI = pEditor->UI();
m_pRenderTools = pEditor->RenderTools();
OnReset();
}
void CEditorComponent::OnUpdate(CUIRect View)
{
OnInput();
OnRender(View);
if(IsActive())
OnActive();
else if(IsHot())
OnHot();
}
bool CEditorComponent::OnInput(const IInput::CEvent &Event)
{
for(CEditorComponent &Component : m_vSubComponents)
{
if(Component.OnInput(Event))
return true;
}
return false;
}
void CEditorComponent::OnInput() {}
void CEditorComponent::OnRender(CUIRect View) {}
void CEditorComponent::OnReset() {}
void CEditorComponent::OnMapLoad() {}
bool CEditorComponent::IsHot()
{
return UI()->HotItem() == this;
}
void CEditorComponent::SetHot()
{
UI()->SetHotItem(this);
}
void CEditorComponent::UnsetHot()
{
if(IsHot())
UI()->SetHotItem(nullptr);
}
void CEditorComponent::OnHot() {}
bool CEditorComponent::IsActive()
{
return UI()->CheckActiveItem(this);
}
void CEditorComponent::SetActive()
{
SetHot();
UI()->SetActiveItem(this);
}
void CEditorComponent::SetInactive()
{
if(IsActive())
UI()->SetActiveItem(nullptr);
}
void CEditorComponent::OnActive() {}
void CEditorComponent::InitSubComponents()
{
for(CEditorComponent &Component : m_vSubComponents)
{
Component.Init(Editor());
}
}
void CEditorComponent::RegisterSubComponent(CEditorComponent &Component)
{
m_vSubComponents.emplace_back(Component);
}
CEditor *CEditorComponent::Editor() { return m_pEditor; }
const CEditor *CEditorComponent::Editor() const { return m_pEditor; }
IInput *CEditorComponent::Input() { return m_pInput; }
IClient *CEditorComponent::Client() { return m_pClient; }
CConfig *CEditorComponent::Config() { return m_pConfig; }

48
src/game/editor/component.h
View file

@ -1,6 +1,7 @@
#ifndef GAME_EDITOR_COMPONENT_H
#define GAME_EDITOR_COMPONENT_H
#include <functional>
#include <game/client/ui.h>
class CEditor;
@ -20,13 +21,56 @@ class CEditorComponent
public:
virtual ~CEditorComponent() = default;
/**
* Initialise the component and interface pointers.
* Needs to be the first function that is called.
*/
virtual void Init(CEditor *pEditor);
/**
* Calls `OnRender` and then maybe `OnHot` or `OnActive`.
*/
void OnUpdate(CUIRect View);
virtual void OnInput();
/**
* Gets called before `OnRender`. Should return true
* if the event was consumed.
*/
virtual bool OnInput(const IInput::CEvent &Event);
virtual void OnRender(CUIRect View);
/**
* Gets called after `OnRender` when the component is hot but not active.
* I
*/
virtual void OnHot();
/**
* Gets called after `OnRender` when the component is active.
*/
virtual void OnActive();
virtual void OnReset();
virtual void OnMapLoad();
bool IsHot();
void SetHot();
void UnsetHot();
bool IsActive();
void SetActive();
void SetInactive();
/**
* Initialise all registered subcomponents.
* Needs to be called after the interfaces have been initialised.
*/
void InitSubComponents();
void RegisterSubComponent(CEditorComponent &Component);
CEditor *Editor();
const CEditor *Editor() const;
IInput *Input();
IClient *Client();
CConfig *Config();
@ -52,6 +96,8 @@ private:
IStorage *m_pStorage;
CUI *m_pUI;
CRenderTools *m_pRenderTools;
std::vector<std::reference_wrapper<CEditorComponent>> m_vSubComponents = {};
};
#endif

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

@ -22,7 +22,6 @@
#include <engine/textrender.h>
#include <game/client/components/camera.h>
#include <game/client/components/menu_background.h>
#include <game/client/gameclient.h>
#include <game/client/lineinput.h>
#include <game/client/render.h>
@ -139,14 +138,14 @@ void CLayerGroup::Mapping(float *pPoints)
float ParallaxZoom = m_pMap->m_pEditor->m_PreviewZoom ? m_ParallaxZoom : 100.0f;
m_pMap->m_pEditor->RenderTools()->MapScreenToWorld(
m_pMap->m_pEditor->MapView()->m_WorldOffset.x, m_pMap->m_pEditor->MapView()->m_WorldOffset.y,
m_pMap->m_pEditor->MapView()->GetWorldOffset().x, m_pMap->m_pEditor->MapView()->GetWorldOffset().y,
m_ParallaxX, m_ParallaxY, ParallaxZoom, m_OffsetX, m_OffsetY,
m_pMap->m_pEditor->Graphics()->ScreenAspect(), m_pMap->m_pEditor->MapView()->m_WorldZoom, pPoints);
m_pMap->m_pEditor->Graphics()->ScreenAspect(), m_pMap->m_pEditor->MapView()->WorldZoom(), pPoints);
pPoints[0] += m_pMap->m_pEditor->MapView()->m_EditorOffset.x;
pPoints[1] += m_pMap->m_pEditor->MapView()->m_EditorOffset.y;
pPoints[2] += m_pMap->m_pEditor->MapView()->m_EditorOffset.x;
pPoints[3] += m_pMap->m_pEditor->MapView()->m_EditorOffset.y;
pPoints[0] += m_pMap->m_pEditor->MapView()->GetEditorOffset().x;
pPoints[1] += m_pMap->m_pEditor->MapView()->GetEditorOffset().y;
pPoints[2] += m_pMap->m_pEditor->MapView()->GetEditorOffset().x;
pPoints[3] += m_pMap->m_pEditor->MapView()->GetEditorOffset().y;
}
void CLayerGroup::MapScreen()
@ -511,56 +510,6 @@ int CEditor::DoButton_DraggableEx(const void *pID, const char *pText, int Checke
return UI()->DoDraggableButtonLogic(pID, Checked, pRect, pClicked, pAbrupted);
}
void CEditor::RenderGrid(const std::shared_ptr<CLayerGroup> &pGroup)
{
if(!m_GridActive)
return;
float aGroupPoints[4];
pGroup->Mapping(aGroupPoints);
float w = UI()->Screen()->w;
float h = UI()->Screen()->h;
int LineDistance = GetLineDistance();
int XOffset = aGroupPoints[0] / LineDistance;
int YOffset = aGroupPoints[1] / LineDistance;
int XGridOffset = XOffset % m_GridFactor;
int YGridOffset = YOffset % m_GridFactor;
Graphics()->TextureClear();
Graphics()->LinesBegin();
for(int i = 0; i < (int)w; i++)
{
if((i + YGridOffset) % m_GridFactor == 0)
Graphics()->SetColor(1.0f, 0.3f, 0.3f, 0.3f);
else
Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.15f);
IGraphics::CLineItem Line = IGraphics::CLineItem(LineDistance * XOffset, LineDistance * i + LineDistance * YOffset, w + aGroupPoints[2], LineDistance * i + LineDistance * YOffset);
Graphics()->LinesDraw(&Line, 1);
if((i + XGridOffset) % m_GridFactor == 0)
Graphics()->SetColor(1.0f, 0.3f, 0.3f, 0.3f);
else
Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.15f);
Line = IGraphics::CLineItem(LineDistance * i + LineDistance * XOffset, LineDistance * YOffset, LineDistance * i + LineDistance * XOffset, h + aGroupPoints[3]);
Graphics()->LinesDraw(&Line, 1);
}
Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
Graphics()->LinesEnd();
}
void CEditor::SnapToGrid(float &x, float &y)
{
const int GridDistance = GetLineDistance() * m_GridFactor;
x = (int)((x + (x >= 0 ? 1.0f : -1.0f) * GridDistance / 2) / GridDistance) * GridDistance;
y = (int)((y + (y >= 0 ? 1.0f : -1.0f) * GridDistance / 2) / GridDistance) * GridDistance;
}
void CEditor::RenderBackground(CUIRect View, IGraphics::CTextureHandle Texture, float Size, float Brightness)
{
Graphics()->TextureSet(Texture);
@ -1136,10 +1085,10 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
// proof button
TB_Top.VSplitLeft(40.0f, &Button, &TB_Top);
static int s_ProofButton = 0;
if(DoButton_Ex(&s_ProofButton, "Proof", m_ProofBorders != PROOF_BORDER_OFF, &Button, 0, "[ctrl+p] Toggles proof borders. These borders represent what a player maximum can see.", IGraphics::CORNER_L) ||
if(DoButton_Ex(&s_ProofButton, "Proof", MapView()->ProofMode()->IsEnabled(), &Button, 0, "[ctrl+p] Toggles proof borders. These borders represent what a player maximum can see.", IGraphics::CORNER_L) ||
(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_P) && ModPressed))
{
m_ProofBorders = m_ProofBorders == PROOF_BORDER_OFF ? PROOF_BORDER_INGAME : PROOF_BORDER_OFF;
MapView()->ProofMode()->Toggle();
}
TB_Top.VSplitLeft(14.0f, &Button, &TB_Top);
@ -1165,10 +1114,10 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
// grid button
TB_Top.VSplitLeft(40.0f, &Button, &TB_Top);
static int s_GridButton = 0;
if(DoButton_Editor(&s_GridButton, "Grid", m_GridActive, &Button, 0, "[ctrl+g] Toggle Grid") ||
if(DoButton_Editor(&s_GridButton, "Grid", MapView()->MapGrid()->IsEnabled(), &Button, 0, "[ctrl+g] Toggle Grid") ||
(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_G) && ModPressed && !ShiftPressed))
{
m_GridActive = !m_GridActive;
MapView()->MapGrid()->Toggle();
}
TB_Top.VSplitLeft(5.0f, nullptr, &TB_Top);
@ -1178,7 +1127,7 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
static int s_ZoomOutButton = 0;
if(DoButton_FontIcon(&s_ZoomOutButton, "-", 0, &Button, 0, "[NumPad-] Zoom out", IGraphics::CORNER_L))
{
MapView()->m_Zoom.ChangeValue(50.0f);
MapView()->Zoom()->ChangeValue(50.0f);
}
TB_Top.VSplitLeft(25.0f, &Button, &TB_Top);
@ -1192,7 +1141,7 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
static int s_ZoomInButton = 0;
if(DoButton_FontIcon(&s_ZoomInButton, "+", 0, &Button, 0, "[NumPad+] Zoom in", IGraphics::CORNER_R))
{
MapView()->m_Zoom.ChangeValue(-50.0f);
MapView()->Zoom()->ChangeValue(-50.0f);
}
TB_Top.VSplitLeft(5.0f, nullptr, &TB_Top);
@ -1278,27 +1227,25 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
}
// grid zoom
if(m_GridActive)
if(MapView()->MapGrid()->IsEnabled())
{
TB_Top.VSplitLeft(20.0f, &Button, &TB_Top);
static int s_GridIncreaseButton = 0;
if(DoButton_FontIcon(&s_GridIncreaseButton, "-", 0, &Button, 0, "Decrease grid", IGraphics::CORNER_L))
{
if(m_GridFactor > 1)
m_GridFactor--;
MapView()->MapGrid()->DecreaseFactor();
}
TB_Top.VSplitLeft(25.0f, &Button, &TB_Top);
static int s_GridNormalButton = 0;
if(DoButton_FontIcon(&s_GridNormalButton, FONT_ICON_BORDER_ALL, 0, &Button, 0, "Normal grid", IGraphics::CORNER_NONE))
m_GridFactor = 1;
MapView()->MapGrid()->ResetFactor();
TB_Top.VSplitLeft(20.0f, &Button, &TB_Top);
static int s_GridDecreaseButton = 0;
if(DoButton_FontIcon(&s_GridDecreaseButton, "+", 0, &Button, 0, "Increase grid", IGraphics::CORNER_R))
{
if(m_GridFactor < 15)
m_GridFactor++;
MapView()->MapGrid()->IncreaseFactor();
}
TB_Top.VSplitLeft(5.0f, &Button, &TB_Top);
}
@ -1310,28 +1257,9 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
{
TB_Bottom.VSplitLeft(45.0f, &Button, &TB_Bottom);
static int s_RefocusButton = 0;
int FocusButtonChecked;
if(m_ProofBorders == PROOF_BORDER_MENU)
{
if(MapView()->m_WorldOffset == m_vMenuBackgroundPositions[m_CurrentMenuProofIndex])
FocusButtonChecked = -1;
else
FocusButtonChecked = 1;
}
else
{
if(MapView()->m_WorldOffset == vec2(0, 0))
FocusButtonChecked = -1;
else
FocusButtonChecked = 1;
}
int FocusButtonChecked = MapView()->IsFocused() ? -1 : 1;
if(DoButton_Editor(&s_RefocusButton, "Refocus", FocusButtonChecked, &Button, 0, "[HOME] Restore map focus") || (m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_HOME)))
{
if(m_ProofBorders == PROOF_BORDER_MENU)
MapView()->m_WorldOffset = m_vMenuBackgroundPositions[m_CurrentMenuProofIndex];
else
MapView()->m_WorldOffset = vec2(0, 0);
}
MapView()->Focus();
TB_Bottom.VSplitLeft(5.0f, nullptr, &TB_Bottom);
}
@ -1421,8 +1349,8 @@ void CEditor::DoToolbarLayers(CUIRect ToolBar)
int y = aMapping[1] + (aMapping[3] - aMapping[1]) / 2;
if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->KeyPress(KEY_Q) && ModPressed)
{
x += UI()->MouseWorldX() - (MapView()->m_WorldOffset.x * pGroup->m_ParallaxX / 100) - pGroup->m_OffsetX;
y += UI()->MouseWorldY() - (MapView()->m_WorldOffset.y * pGroup->m_ParallaxY / 100) - pGroup->m_OffsetY;
x += UI()->MouseWorldX() - (MapView()->GetWorldOffset().x * pGroup->m_ParallaxX / 100) - pGroup->m_OffsetX;
y += UI()->MouseWorldY() - (MapView()->GetWorldOffset().y * pGroup->m_ParallaxY / 100) - pGroup->m_OffsetY;
}
if(pLayer->m_Type == LAYERTYPE_QUADS)
@ -1537,8 +1465,8 @@ void CEditor::DoSoundSource(CSoundSource *pSource, int Index)
{
float x = wx;
float y = wy;
if(m_GridActive && !IgnoreGrid)
SnapToGrid(x, y);
if(MapView()->MapGrid()->IsEnabled() && !IgnoreGrid)
MapView()->MapGrid()->SnapToGrid(x, y);
pSource->m_Position.x = f2fx(x);
pSource->m_Position.y = f2fx(y);
}
@ -1664,8 +1592,8 @@ void CEditor::DoQuad(CQuad *pQuad, int Index)
{
float x = wx;
float y = wy;
if(m_GridActive && !IgnoreGrid)
SnapToGrid(x, y);
if(MapView()->MapGrid()->IsEnabled() && !IgnoreGrid)
MapView()->MapGrid()->SnapToGrid(x, y);
int OffsetX = f2fx(x) - pQuad->m_aPoints[4].x;
int OffsetY = f2fx(y) - pQuad->m_aPoints[4].y;
@ -1683,8 +1611,8 @@ void CEditor::DoQuad(CQuad *pQuad, int Index)
// move all points including pivot
float x = wx;
float y = wy;
if(m_GridActive && !IgnoreGrid)
SnapToGrid(x, y);
if(MapView()->MapGrid()->IsEnabled() && !IgnoreGrid)
MapView()->MapGrid()->SnapToGrid(x, y);
int OffsetX = f2fx(x) - pQuad->m_aPoints[4].x;
int OffsetY = f2fx(y) - pQuad->m_aPoints[4].y;
@ -1964,8 +1892,8 @@ void CEditor::DoQuadPoint(CQuad *pQuad, int QuadIndex, int V)
{
float x = wx;
float y = wy;
if(m_GridActive && !IgnoreGrid)
SnapToGrid(x, y);
if(MapView()->MapGrid()->IsEnabled() && !IgnoreGrid)
MapView()->MapGrid()->SnapToGrid(x, y);
int OffsetX = f2fx(x) - pQuad->m_aPoints[V].x;
int OffsetY = f2fx(y) - pQuad->m_aPoints[V].y;
@ -2121,10 +2049,11 @@ void CEditor::DoQuadKnife(int QuadIndex)
}
// Handle snapping
if(m_GridActive && !IgnoreGrid)
if(MapView()->MapGrid()->IsEnabled() && !IgnoreGrid)
{
float CellSize = (float)GetLineDistance();
vec2 OnGrid = vec2(std::round(Mouse.x / CellSize) * CellSize, std::round(Mouse.y / CellSize) * CellSize);
float CellSize = MapView()->MapGrid()->GridLineDistance();
vec2 OnGrid(Mouse.x, Mouse.y);
MapView()->MapGrid()->SnapToGrid(OnGrid.x, OnGrid.y);
if(IsInTriangle(OnGrid, v[0], v[1], v[2]) || IsInTriangle(OnGrid, v[0], v[3], v[2]))
Point = OnGrid;
@ -2470,11 +2399,11 @@ void CEditor::DoQuadEnvPoint(const CQuad *pQuad, int QIndex, int PIndex)
{
if(s_Operation == OP_MOVE)
{
if(m_GridActive && !IgnoreGrid)
if(MapView()->MapGrid()->IsEnabled() && !IgnoreGrid)
{
float x = wx;
float y = wy;
SnapToGrid(x, y);
MapView()->MapGrid()->SnapToGrid(x, y);
pEnvelope->m_vPoints[PIndex].m_aValues[0] = f2fx(x) - pQuad->m_aPoints[4].x;
pEnvelope->m_vPoints[PIndex].m_aValues[1] = f2fx(y) - pQuad->m_aPoints[4].y;
}
@ -2548,51 +2477,7 @@ void CEditor::DoMapEditor(CUIRect View)
// render all good stuff
if(!m_ShowPicker)
{
if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->ShiftIsPressed() && !Input()->ModifierIsPressed() && Input()->KeyPress(KEY_G))
{
const bool AnyHidden =
!m_Map.m_pGameLayer->m_Visible ||
(m_Map.m_pFrontLayer && !m_Map.m_pFrontLayer->m_Visible) ||
(m_Map.m_pTeleLayer && !m_Map.m_pTeleLayer->m_Visible) ||
(m_Map.m_pSpeedupLayer && !m_Map.m_pSpeedupLayer->m_Visible) ||
(m_Map.m_pTuneLayer && !m_Map.m_pTuneLayer->m_Visible) ||
(m_Map.m_pSwitchLayer && !m_Map.m_pSwitchLayer->m_Visible);
m_Map.m_pGameLayer->m_Visible = AnyHidden;
if(m_Map.m_pFrontLayer)
m_Map.m_pFrontLayer->m_Visible = AnyHidden;
if(m_Map.m_pTeleLayer)
m_Map.m_pTeleLayer->m_Visible = AnyHidden;
if(m_Map.m_pSpeedupLayer)
m_Map.m_pSpeedupLayer->m_Visible = AnyHidden;
if(m_Map.m_pTuneLayer)
m_Map.m_pTuneLayer->m_Visible = AnyHidden;
if(m_Map.m_pSwitchLayer)
m_Map.m_pSwitchLayer->m_Visible = AnyHidden;
}
for(auto &pGroup : m_Map.m_vpGroups)
{
if(pGroup->m_Visible)
pGroup->Render();
}
// render the game, tele, speedup, front, tune and switch above everything else
if(m_Map.m_pGameGroup->m_Visible)
{
m_Map.m_pGameGroup->MapScreen();
for(auto &pLayer : m_Map.m_pGameGroup->m_vpLayers)
{
if(pLayer->m_Visible && pLayer->IsEntitiesLayer())
pLayer->Render();
}
}
std::shared_ptr<CLayerTiles> pT = std::static_pointer_cast<CLayerTiles>(GetSelectedLayerType(0, LAYERTYPE_TILES));
if(m_ShowTileInfo != SHOW_TILE_OFF && pT && pT->m_Visible && MapView()->m_Zoom.GetValue() <= 300.0f)
{
GetSelectedGroup()->MapScreen();
pT->ShowInfo();
}
MapView()->RenderMap();
}
else
{
@ -2721,32 +2606,8 @@ void CEditor::DoMapEditor(CUIRect View)
}
}
std::shared_ptr<CLayerGroup> pGroup = GetSelectedGroup();
if(pGroup)
{
pGroup->MapScreen();
RenderGrid(pGroup);
for(size_t i = 0; i < NumEditLayers; i++)
{
if(apEditLayers[i]->m_Type != LAYERTYPE_TILES)
continue;
float w, h;
apEditLayers[i]->GetSize(&w, &h);
IGraphics::CLineItem Array[4] = {
IGraphics::CLineItem(0, 0, w, 0),
IGraphics::CLineItem(w, 0, w, h),
IGraphics::CLineItem(w, h, 0, h),
IGraphics::CLineItem(0, h, 0, 0)};
Graphics()->TextureClear();
Graphics()->LinesBegin();
Graphics()->LinesDraw(Array, 4);
Graphics()->LinesEnd();
}
}
MapView()->RenderGroupBorder();
MapView()->MapGrid()->OnRender(View);
}
if(Inside)
@ -3067,33 +2928,33 @@ void CEditor::DoMapEditor(CUIRect View)
}
// menu proof selection
if(m_ProofBorders == PROOF_BORDER_MENU && !m_ShowPicker)
if(MapView()->ProofMode()->IsModeMenu() && !m_ShowPicker)
{
ResetMenuBackgroundPositions();
for(int i = 0; i < (int)m_vMenuBackgroundPositions.size(); i++)
MapView()->ProofMode()->ResetMenuBackgroundPositions();
for(int i = 0; i < (int)MapView()->ProofMode()->m_vMenuBackgroundPositions.size(); i++)
{
vec2 Pos = m_vMenuBackgroundPositions[i];
Pos += MapView()->m_WorldOffset - m_vMenuBackgroundPositions[m_CurrentMenuProofIndex];
vec2 Pos = MapView()->ProofMode()->m_vMenuBackgroundPositions[i];
Pos += MapView()->GetWorldOffset() - MapView()->ProofMode()->m_vMenuBackgroundPositions[MapView()->ProofMode()->m_CurrentMenuProofIndex];
Pos.y -= 3.0f;
vec2 MousePos(m_MouseWorldNoParaX, m_MouseWorldNoParaY);
if(distance(Pos, MousePos) <= 20.0f)
{
UI()->SetHotItem(&m_vMenuBackgroundPositions[i]);
UI()->SetHotItem(&MapView()->ProofMode()->m_vMenuBackgroundPositions[i]);
if(i != m_CurrentMenuProofIndex && UI()->CheckActiveItem(&m_vMenuBackgroundPositions[i]))
if(i != MapView()->ProofMode()->m_CurrentMenuProofIndex && UI()->CheckActiveItem(&MapView()->ProofMode()->m_vMenuBackgroundPositions[i]))
{
if(!UI()->MouseButton(0))
{
m_CurrentMenuProofIndex = i;
MapView()->m_WorldOffset = m_vMenuBackgroundPositions[i];
MapView()->ProofMode()->m_CurrentMenuProofIndex = i;
MapView()->SetWorldOffset(MapView()->ProofMode()->m_vMenuBackgroundPositions[i]);
UI()->SetActiveItem(nullptr);
}
}
else if(UI()->HotItem() == &m_vMenuBackgroundPositions[i])
else if(UI()->HotItem() == &MapView()->ProofMode()->m_vMenuBackgroundPositions[i])
{
char aTooltipPrefix[32] = "Switch proof position to";
if(i == m_CurrentMenuProofIndex)
if(i == MapView()->ProofMode()->m_CurrentMenuProofIndex)
str_copy(aTooltipPrefix, "Current proof position at");
char aNumBuf[8];
@ -3103,15 +2964,15 @@ void CEditor::DoMapEditor(CUIRect View)
aNumBuf[0] = '\0';
char aTooltipPositions[128];
str_format(aTooltipPositions, sizeof(aTooltipPositions), "%s %s", m_vpMenuBackgroundPositionNames[i], aNumBuf);
str_format(aTooltipPositions, sizeof(aTooltipPositions), "%s %s", MapView()->ProofMode()->m_vpMenuBackgroundPositionNames[i], aNumBuf);
for(int k : m_vMenuBackgroundCollisions.at(i))
for(int k : MapView()->ProofMode()->m_vMenuBackgroundCollisions.at(i))
{
if(k == m_CurrentMenuProofIndex)
if(k == MapView()->ProofMode()->m_CurrentMenuProofIndex)
str_copy(aTooltipPrefix, "Current proof position at");
Pos = m_vMenuBackgroundPositions[k];
Pos += MapView()->m_WorldOffset - m_vMenuBackgroundPositions[m_CurrentMenuProofIndex];
Pos = MapView()->ProofMode()->m_vMenuBackgroundPositions[k];
Pos += MapView()->GetWorldOffset() - MapView()->ProofMode()->m_vMenuBackgroundPositions[MapView()->ProofMode()->m_CurrentMenuProofIndex];
Pos.y -= 3.0f;
MousePos = vec2(m_MouseWorldNoParaX, m_MouseWorldNoParaY);
@ -3125,13 +2986,13 @@ void CEditor::DoMapEditor(CUIRect View)
char aTooltipPositionsCopy[128];
str_copy(aTooltipPositionsCopy, aTooltipPositions);
str_format(aTooltipPositions, sizeof(aTooltipPositions), "%s, %s %s", aTooltipPositionsCopy, m_vpMenuBackgroundPositionNames[k], aNumBuf);
str_format(aTooltipPositions, sizeof(aTooltipPositions), "%s, %s %s", aTooltipPositionsCopy, MapView()->ProofMode()->m_vpMenuBackgroundPositionNames[k], aNumBuf);
}
str_format(m_aMenuBackgroundTooltip, sizeof(m_aMenuBackgroundTooltip), "%s %s", aTooltipPrefix, aTooltipPositions);
m_pTooltip = m_aMenuBackgroundTooltip;
if(UI()->MouseButton(0))
UI()->SetActiveItem(&m_vMenuBackgroundPositions[i]);
UI()->SetActiveItem(&MapView()->ProofMode()->m_vMenuBackgroundPositions[i]);
}
break;
}
@ -3142,9 +3003,9 @@ void CEditor::DoMapEditor(CUIRect View)
if(UI()->CheckActiveItem(s_pEditorID))
{
if(s_Operation == OP_PAN_WORLD)
MapView()->m_WorldOffset -= vec2(m_MouseDeltaX, m_MouseDeltaY) * m_MouseWScale;
MapView()->OffsetWorld(-vec2(m_MouseDeltaX, m_MouseDeltaY) * m_MouseWScale);
else if(s_Operation == OP_PAN_EDITOR)
MapView()->m_EditorOffset -= vec2(m_MouseDeltaX, m_MouseDeltaY) * m_MouseWScale;
MapView()->OffsetEditor(-vec2(m_MouseDeltaX, m_MouseDeltaY) * m_MouseWScale);
// release mouse
if(!UI()->MouseButton(0))
@ -3157,13 +3018,13 @@ void CEditor::DoMapEditor(CUIRect View)
{
float PanSpeed = 64.0f;
if(Input()->KeyPress(KEY_A))
MapView()->m_WorldOffset.x -= PanSpeed * m_MouseWScale;
MapView()->OffsetWorld({-PanSpeed * m_MouseWScale, 0});
else if(Input()->KeyPress(KEY_D))
MapView()->m_WorldOffset.x += PanSpeed * m_MouseWScale;
MapView()->OffsetWorld({PanSpeed * m_MouseWScale, 0});
if(Input()->KeyPress(KEY_W))
MapView()->m_WorldOffset.y -= PanSpeed * m_MouseWScale;
MapView()->OffsetWorld({0, -PanSpeed * m_MouseWScale});
else if(Input()->KeyPress(KEY_S))
MapView()->m_WorldOffset.y += PanSpeed * m_MouseWScale;
MapView()->OffsetWorld({0, PanSpeed * m_MouseWScale});
}
}
else if(UI()->CheckActiveItem(s_pEditorID))
@ -3201,125 +3062,7 @@ void CEditor::DoMapEditor(CUIRect View)
Graphics()->LinesEnd();
}
// render screen sizes
if(m_ProofBorders != PROOF_BORDER_OFF && !m_ShowPicker)
{
std::shared_ptr<CLayerGroup> pGameGroup = m_Map.m_pGameGroup;
pGameGroup->MapScreen();
Graphics()->TextureClear();
Graphics()->LinesBegin();
// possible screen sizes (white border)
float aLastPoints[4];
float Start = 1.0f; // 9.0f/16.0f;
float End = 16.0f / 9.0f;
const int NumSteps = 20;
for(int i = 0; i <= NumSteps; i++)
{
float aPoints[4];
float Aspect = Start + (End - Start) * (i / (float)NumSteps);
float Zoom = (m_ProofBorders == PROOF_BORDER_MENU) ? 0.7f : 1.0f;
RenderTools()->MapScreenToWorld(
MapView()->m_WorldOffset.x, MapView()->m_WorldOffset.y,
100.0f, 100.0f, 100.0f, 0.0f, 0.0f, Aspect, Zoom, aPoints);
if(i == 0)
{
IGraphics::CLineItem Array[2] = {
IGraphics::CLineItem(aPoints[0], aPoints[1], aPoints[2], aPoints[1]),
IGraphics::CLineItem(aPoints[0], aPoints[3], aPoints[2], aPoints[3])};
Graphics()->LinesDraw(Array, 2);
}
if(i != 0)
{
IGraphics::CLineItem Array[4] = {
IGraphics::CLineItem(aPoints[0], aPoints[1], aLastPoints[0], aLastPoints[1]),
IGraphics::CLineItem(aPoints[2], aPoints[1], aLastPoints[2], aLastPoints[1]),
IGraphics::CLineItem(aPoints[0], aPoints[3], aLastPoints[0], aLastPoints[3]),
IGraphics::CLineItem(aPoints[2], aPoints[3], aLastPoints[2], aLastPoints[3])};
Graphics()->LinesDraw(Array, 4);
}
if(i == NumSteps)
{
IGraphics::CLineItem Array[2] = {
IGraphics::CLineItem(aPoints[0], aPoints[1], aPoints[0], aPoints[3]),
IGraphics::CLineItem(aPoints[2], aPoints[1], aPoints[2], aPoints[3])};
Graphics()->LinesDraw(Array, 2);
}
mem_copy(aLastPoints, aPoints, sizeof(aPoints));
}
// two screen sizes (green and red border)
{
Graphics()->SetColor(1, 0, 0, 1);
for(int i = 0; i < 2; i++)
{
float aPoints[4];
const float aAspects[] = {4.0f / 3.0f, 16.0f / 10.0f, 5.0f / 4.0f, 16.0f / 9.0f};
float Aspect = aAspects[i];
float Zoom = (m_ProofBorders == PROOF_BORDER_MENU) ? 0.7f : 1.0f;
RenderTools()->MapScreenToWorld(
MapView()->m_WorldOffset.x, MapView()->m_WorldOffset.y,
100.0f, 100.0f, 100.0f, 0.0f, 0.0f, Aspect, Zoom, aPoints);
CUIRect r;
r.x = aPoints[0];
r.y = aPoints[1];
r.w = aPoints[2] - aPoints[0];
r.h = aPoints[3] - aPoints[1];
IGraphics::CLineItem Array[4] = {
IGraphics::CLineItem(r.x, r.y, r.x + r.w, r.y),
IGraphics::CLineItem(r.x + r.w, r.y, r.x + r.w, r.y + r.h),
IGraphics::CLineItem(r.x + r.w, r.y + r.h, r.x, r.y + r.h),
IGraphics::CLineItem(r.x, r.y + r.h, r.x, r.y)};
Graphics()->LinesDraw(Array, 4);
Graphics()->SetColor(0, 1, 0, 1);
}
}
Graphics()->LinesEnd();
// tee position (blue circle) and other screen positions
{
Graphics()->TextureClear();
Graphics()->QuadsBegin();
Graphics()->SetColor(0, 0, 1, 0.3f);
Graphics()->DrawCircle(MapView()->m_WorldOffset.x, MapView()->m_WorldOffset.y - 3.0f, 20.0f, 32);
if(m_ProofBorders == PROOF_BORDER_MENU)
{
Graphics()->SetColor(0, 1, 0, 0.3f);
std::set<int> indices;
for(int i = 0; i < (int)m_vMenuBackgroundPositions.size(); i++)
indices.insert(i);
while(!indices.empty())
{
int i = *indices.begin();
indices.erase(i);
for(int k : m_vMenuBackgroundCollisions.at(i))
indices.erase(k);
vec2 Pos = m_vMenuBackgroundPositions[i];
Pos += MapView()->m_WorldOffset - m_vMenuBackgroundPositions[m_CurrentMenuProofIndex];
if(Pos == MapView()->m_WorldOffset)
continue;
Graphics()->DrawCircle(Pos.x, Pos.y - 3.0f, 20.0f, 32);
}
}
Graphics()->QuadsEnd();
}
}
MapView()->ProofMode()->RenderScreenSizes();
if(!m_ShowPicker && m_ShowTileInfo != SHOW_TILE_OFF && m_ShowEnvelopePreview != SHOWENV_NONE && GetSelectedLayer(0) && GetSelectedLayer(0)->m_Type == LAYERTYPE_QUADS)
{
@ -7507,7 +7250,7 @@ void CEditor::RenderMenubar(CUIRect MenuBar)
char aTimeStr[6];
str_timestamp_format(aTimeStr, sizeof(aTimeStr), "%H:%M");
str_format(aBuf, sizeof(aBuf), "X: %.1f, Y: %.1f, Z: %.1f, A: %.1f, G: %i %s", UI()->MouseWorldX() / 32.0f, UI()->MouseWorldY() / 32.0f, MapView()->m_Zoom.GetValue(), m_AnimateSpeed, m_GridFactor, aTimeStr);
str_format(aBuf, sizeof(aBuf), "X: %.1f, Y: %.1f, Z: %.1f, A: %.1f, G: %i %s", UI()->MouseWorldX() / 32.0f, UI()->MouseWorldY() / 32.0f, MapView()->Zoom()->GetValue(), m_AnimateSpeed, MapView()->MapGrid()->Factor(), aTimeStr);
UI()->DoLabel(&Info, aBuf, 10.0f, TEXTALIGN_MR);
static int s_CloseButton = 0;
@ -7560,9 +7303,9 @@ void CEditor::Render()
{
// handle zoom hotkeys
if(Input()->KeyPress(KEY_KP_MINUS))
MapView()->m_Zoom.ChangeValue(50.0f);
MapView()->Zoom()->ChangeValue(50.0f);
if(Input()->KeyPress(KEY_KP_PLUS))
MapView()->m_Zoom.ChangeValue(-50.0f);
MapView()->Zoom()->ChangeValue(-50.0f);
if(Input()->KeyPress(KEY_KP_MULTIPLY))
MapView()->ResetZoom();
@ -7760,9 +7503,9 @@ void CEditor::Render()
if(m_Dialog == DIALOG_NONE && !UI()->IsPopupHovered() && (!m_GuiActive || UI()->MouseInside(&View)))
{
if(Input()->KeyPress(KEY_MOUSE_WHEEL_DOWN))
MapView()->m_Zoom.ChangeValue(20.0f);
MapView()->Zoom()->ChangeValue(20.0f);
if(Input()->KeyPress(KEY_MOUSE_WHEEL_UP))
MapView()->m_Zoom.ChangeValue(-20.0f);
MapView()->Zoom()->ChangeValue(-20.0f);
}
MapView()->UpdateZoom();
@ -7847,6 +7590,7 @@ void CEditor::Reset(bool CreateDefault)
UI()->ClosePopupMenus();
m_Map.Clean();
m_MapView.OnReset();
// create default layers
if(CreateDefault)
{
@ -7880,22 +7624,6 @@ void CEditor::Reset(bool CreateDefault)
m_SettingsCommandInput.Clear();
}
int CEditor::GetLineDistance() const
{
if(MapView()->m_Zoom.GetValue() <= 100.0f)
return 16;
else if(MapView()->m_Zoom.GetValue() <= 250.0f)
return 32;
else if(MapView()->m_Zoom.GetValue() <= 450.0f)
return 64;
else if(MapView()->m_Zoom.GetValue() <= 850.0f)
return 128;
else if(MapView()->m_Zoom.GetValue() <= 1550.0f)
return 256;
else
return 512;
}
void CEditorMap::OnModify()
{
m_Modified = true;
@ -8109,9 +7837,12 @@ void CEditor::Init()
m_RenderTools.Init(m_pGraphics, m_pTextRender);
m_ZoomEnvelopeX.Init(this);
m_ZoomEnvelopeY.Init(this);
m_MapView.Init(this);
m_Map.m_pEditor = this;
m_vComponents.emplace_back(m_MapView);
for(CEditorComponent &Component : m_vComponents)
Component.Init(this);
m_CheckerTexture = Graphics()->LoadTexture("editor/checker.png", IStorage::TYPE_ALL, CImageInfo::FORMAT_AUTO, 0);
m_BackgroundTexture = Graphics()->LoadTexture("editor/background.png", IStorage::TYPE_ALL, CImageInfo::FORMAT_AUTO, 0);
m_CursorTexture = Graphics()->LoadTexture("editor/cursor.png", IStorage::TYPE_ALL, CImageInfo::FORMAT_AUTO, 0);
@ -8130,34 +7861,6 @@ void CEditor::Init()
m_pBrush->m_pMap = &m_Map;
Reset(false);
ResetMenuBackgroundPositions();
m_vpMenuBackgroundPositionNames.resize(CMenuBackground::NUM_POS);
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_START] = "start";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_INTERNET] = "browser(internet)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_LAN] = "browser(lan)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_DEMOS] = "demos";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_NEWS] = "news";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_FAVORITES] = "favorites";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_LANGUAGE] = "settings(language)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_GENERAL] = "settings(general)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_PLAYER] = "settings(player)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_TEE] = "settings(tee)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_APPEARANCE] = "settings(appearance)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_CONTROLS] = "settings(controls)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_GRAPHICS] = "settings(graphics)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_SOUND] = "settings(sound)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_DDNET] = "settings(ddnet)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_ASSETS] = "settings(assets)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_CUSTOM0] = "custom(ddnet)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_CUSTOM1] = "custom(kog)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_CUSTOM2] = "custom(3)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_CUSTOM3] = "custom(4)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_RESERVED0] = "reserved settings(1)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_RESERVED1] = "reserved settings(2)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_RESERVED0] = "reserved(1)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_RESERVED1] = "reserved(2)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_RESERVED2] = "reserved(3)";
}
void CEditor::PlaceBorderTiles()
@ -8378,6 +8081,20 @@ void CEditor::OnUpdate()
Reset();
}
// handle key presses
for(size_t i = 0; i < Input()->NumEvents(); i++)
{
const IInput::CEvent &Event = Input()->GetEvent(i);
if(!Input()->IsEventValid(Event))
continue;
for(CEditorComponent &Component : m_vComponents)
{
if(Component.OnInput(Event))
break;
}
}
HandleCursorMovement();
DispatchInputEvents();
HandleAutosave();
@ -8451,46 +8168,11 @@ void CEditor::LoadCurrentMap()
CGameClient *pGameClient = (CGameClient *)Kernel()->RequestInterface<IGameClient>();
vec2 Center = pGameClient->m_Camera.m_Center;
MapView()->m_WorldOffset = Center;
MapView()->SetWorldOffset(Center);
}
IEditor *CreateEditor() { return new CEditor; }
void CEditor::ResetMenuBackgroundPositions()
{
std::array<vec2, CMenuBackground::NUM_POS> aBackgroundPositions = GenerateMenuBackgroundPositions();
m_vMenuBackgroundPositions.assign(aBackgroundPositions.begin(), aBackgroundPositions.end());
if(m_Map.m_pGameLayer)
{
for(int y = 0; y < m_Map.m_pGameLayer->m_Height; ++y)
{
for(int x = 0; x < m_Map.m_pGameLayer->m_Width; ++x)
{
CTile Tile = m_Map.m_pGameLayer->GetTile(x, y);
if(Tile.m_Index >= TILE_TIME_CHECKPOINT_FIRST && Tile.m_Index <= TILE_TIME_CHECKPOINT_LAST)
{
int ArrayIndex = clamp<int>((Tile.m_Index - TILE_TIME_CHECKPOINT_FIRST), 0, CMenuBackground::NUM_POS);
m_vMenuBackgroundPositions[ArrayIndex] = vec2(x * 32.0f + 16.0f, y * 32.0f + 16.0f);
}
x += Tile.m_Skip;
}
}
}
m_vMenuBackgroundCollisions.clear();
m_vMenuBackgroundCollisions.resize(m_vMenuBackgroundPositions.size());
for(size_t i = 0; i < m_vMenuBackgroundPositions.size(); i++)
{
for(size_t j = i + 1; j < m_vMenuBackgroundPositions.size(); j++)
{
if(i != j && distance(m_vMenuBackgroundPositions[i], m_vMenuBackgroundPositions[j]) < 0.001f)
m_vMenuBackgroundCollisions.at(i).push_back(j);
}
}
}
// DDRace
void CEditorMap::MakeTeleLayer(const std::shared_ptr<CLayer> &pLayer)

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

@ -807,6 +807,7 @@ class CEditor : public IEditor
CRenderTools m_RenderTools;
CUI m_UI;
std::vector<std::reference_wrapper<CEditorComponent>> m_vComponents;
CMapView m_MapView;
bool m_EditorWasUsedBefore = false;
@ -861,9 +862,6 @@ public:
m_Dialog = 0;
m_pTooltip = nullptr;
m_GridActive = false;
m_GridFactor = 1;
m_BrushColorEnabled = true;
m_aFileName[0] = '\0';
@ -902,8 +900,6 @@ public:
m_MouseDeltaWy = 0;
m_GuiActive = true;
m_ProofBorders = PROOF_BORDER_OFF;
m_CurrentMenuProofIndex = 0;
m_PreviewZoom = false;
m_ShowTileInfo = SHOW_TILE_OFF;
@ -991,8 +987,6 @@ public:
void FreeDynamicPopupMenus();
void RenderMousePointer();
void ResetMenuBackgroundPositions();
std::vector<CQuad *> GetSelectedQuads();
std::vector<std::pair<CQuad *, int>> GetSelectedQuadPoints();
std::shared_ptr<CLayer> GetSelectedLayerType(int Index, int Type) const;
@ -1034,9 +1028,6 @@ public:
int m_Dialog;
const char *m_pTooltip;
bool m_GridActive;
int m_GridFactor;
bool m_BrushColorEnabled;
char m_aFileName[IO_MAX_PATH_LENGTH];
@ -1184,18 +1175,6 @@ public:
bool m_ShowMousePointer;
bool m_GuiActive;
enum EProofBorder
{
PROOF_BORDER_OFF,
PROOF_BORDER_INGAME,
PROOF_BORDER_MENU
};
EProofBorder m_ProofBorders;
int m_CurrentMenuProofIndex;
std::vector<vec2> m_vMenuBackgroundPositions;
std::vector<const char *> m_vpMenuBackgroundPositionNames;
std::vector<std::vector<int>> m_vMenuBackgroundCollisions;
char m_aMenuBackgroundTooltip[256];
bool m_PreviewZoom;
float m_MouseWScale = 1.0f; // Mouse (i.e. UI) scale relative to the World (selected Group)
@ -1310,9 +1289,6 @@ public:
void RenderBackground(CUIRect View, IGraphics::CTextureHandle Texture, float Size, float Brightness);
void RenderGrid(const std::shared_ptr<CLayerGroup> &pGroup);
void SnapToGrid(float &x, float &y);
int UiDoValueSelector(void *pID, CUIRect *pRect, const char *pLabel, int Current, int Min, int Max, int Step, float Scale, const char *pToolTip, bool IsDegree = false, bool IsHex = false, int corners = IGraphics::CORNER_ALL, ColorRGBA *pColor = nullptr, bool ShowValue = true);
static CUI::EPopupMenuFunctionResult PopupMenuFile(void *pContext, CUIRect View, bool Active);
@ -1494,8 +1470,6 @@ public:
static const char *ExplainVanilla(int Tile, int Layer);
static const char *Explain(EExplanation Explanation, int Tile, int Layer);
int GetLineDistance() const;
// Zooming
void ZoomAdaptOffsetX(float ZoomFactor, const CUIRect &View);
void UpdateZoomEnvelopeX(const CUIRect &View);

2
src/game/editor/io.cpp
View file

@ -440,7 +440,7 @@ bool CEditor::Load(const char *pFileName, int StorageType)
str_copy(m_aFileName, pFileName);
SortImages();
SelectGameLayer();
ResetMenuBackgroundPositions();
MapView()->OnMapLoad();
}
else
{

115
src/game/editor/map_grid.cpp Normal file
View file

@ -0,0 +1,115 @@
#include "map_grid.h"
#include <engine/keys.h>
#include "editor.h"
void CMapGrid::OnReset()
{
m_GridActive = false;
m_GridFactor = 1;
}
void CMapGrid::OnRender(CUIRect View)
{
if(!m_GridActive)
return;
std::shared_ptr<CLayerGroup> pGroup = Editor()->GetSelectedGroup();
if(pGroup)
{
pGroup->MapScreen();
float aGroupPoints[4];
pGroup->Mapping(aGroupPoints);
float w = UI()->Screen()->w;
float h = UI()->Screen()->h;
int LineDistance = GridLineDistance();
int XOffset = aGroupPoints[0] / LineDistance;
int YOffset = aGroupPoints[1] / LineDistance;
int XGridOffset = XOffset % m_GridFactor;
int YGridOffset = YOffset % m_GridFactor;
Graphics()->TextureClear();
Graphics()->LinesBegin();
for(int i = 0; i < (int)w; i++)
{
if((i + YGridOffset) % m_GridFactor == 0)
Graphics()->SetColor(1.0f, 0.3f, 0.3f, 0.3f);
else
Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.15f);
IGraphics::CLineItem Line = IGraphics::CLineItem(LineDistance * XOffset, LineDistance * i + LineDistance * YOffset, w + aGroupPoints[2], LineDistance * i + LineDistance * YOffset);
Graphics()->LinesDraw(&Line, 1);
if((i + XGridOffset) % m_GridFactor == 0)
Graphics()->SetColor(1.0f, 0.3f, 0.3f, 0.3f);
else
Graphics()->SetColor(1.0f, 1.0f, 1.0f, 0.15f);
Line = IGraphics::CLineItem(LineDistance * i + LineDistance * XOffset, LineDistance * YOffset, LineDistance * i + LineDistance * XOffset, h + aGroupPoints[3]);
Graphics()->LinesDraw(&Line, 1);
}
Graphics()->SetColor(1.0f, 1.0f, 1.0f, 1.0f);
Graphics()->LinesEnd();
}
}
int CMapGrid::GridLineDistance() const
{
if(Editor()->MapView()->Zoom()->GetValue() <= 100.0f)
return 16;
else if(Editor()->MapView()->Zoom()->GetValue() <= 250.0f)
return 32;
else if(Editor()->MapView()->Zoom()->GetValue() <= 450.0f)
return 64;
else if(Editor()->MapView()->Zoom()->GetValue() <= 850.0f)
return 128;
else if(Editor()->MapView()->Zoom()->GetValue() <= 1550.0f)
return 256;
else
return 512;
}
void CMapGrid::SnapToGrid(float &x, float &y)
{
const int GridDistance = GridLineDistance() * m_GridFactor;
x = (int)((x + (x >= 0 ? 1.0f : -1.0f) * GridDistance / 2) / GridDistance) * GridDistance;
y = (int)((y + (y >= 0 ? 1.0f : -1.0f) * GridDistance / 2) / GridDistance) * GridDistance;
}
bool CMapGrid::IsEnabled() const
{
return m_GridActive;
}
void CMapGrid::Toggle()
{
m_GridActive = !m_GridActive;
}
bool CMapGrid::Factor() const
{
return m_GridFactor;
}
void CMapGrid::ResetFactor()
{
m_GridFactor = 1;
}
void CMapGrid::IncreaseFactor()
{
if(m_GridFactor < 15)
m_GridFactor++;
}
void CMapGrid::DecreaseFactor()
{
if(m_GridFactor > 1)
m_GridFactor--;
}

32
src/game/editor/map_grid.h Normal file
View file

@ -0,0 +1,32 @@
#ifndef GAME_EDITOR_MAP_GRID_H
#define GAME_EDITOR_MAP_GRID_H
#include "component.h"
class CMapGrid : public CEditorComponent
{
public:
void OnReset() override;
void OnRender(CUIRect View) override;
void SnapToGrid(float &x, float &y);
int GridLineDistance() const;
/**
* Returns wether the grid is rendered.
*/
bool IsEnabled() const;
void Toggle();
bool Factor() const;
void ResetFactor();
void IncreaseFactor();
void DecreaseFactor();
private:
bool m_GridActive;
int m_GridFactor;
};
#endif

191
src/game/editor/map_view.cpp
View file

@ -1,19 +1,137 @@
#include "map_view.h"
#include <engine/keys.h>
#include <engine/shared/config.h>
#include <game/client/render.h>
#include <game/client/ui.h>
#include "editor.h"
void CMapView::Init(CEditor *pEditor)
{
CEditorComponent::Init(pEditor);
m_Zoom.Init(pEditor);
RegisterSubComponent(m_MapGrid);
RegisterSubComponent(m_ProofMode);
InitSubComponents();
}
void CMapView::OnReset()
{
m_Zoom = CSmoothValue(200.0f, 10.0f, 2000.0f);
m_Zoom.Init(Editor());
m_WorldZoom = 1.0f;
SetWorldOffset({0, 0});
SetEditorOffset({0, 0});
m_ProofMode.OnReset();
m_MapGrid.OnReset();
m_ShowPicker = false;
}
void CMapView::OnMapLoad()
{
m_ProofMode.OnMapLoad();
}
bool CMapView::IsFocused()
{
if(m_ProofMode.m_ProofBorders == CProofMode::PROOF_BORDER_MENU)
return GetWorldOffset() == m_ProofMode.m_vMenuBackgroundPositions[m_ProofMode.m_CurrentMenuProofIndex];
else
return GetWorldOffset() == vec2(0, 0);
}
void CMapView::Focus()
{
if(m_ProofMode.m_ProofBorders == CProofMode::PROOF_BORDER_MENU)
SetWorldOffset(m_ProofMode.m_vMenuBackgroundPositions[m_ProofMode.m_CurrentMenuProofIndex]);
else
SetWorldOffset({0, 0});
}
void CMapView::RenderGroupBorder()
{
std::shared_ptr<CLayerGroup> pGroup = Editor()->GetSelectedGroup();
if(pGroup)
{
pGroup->MapScreen();
for(size_t i = 0; i < Editor()->m_vSelectedLayers.size(); i++)
{
std::shared_ptr<CLayer> pLayer = Editor()->GetSelectedLayerType(i, LAYERTYPE_TILES);
if(pLayer)
{
float w, h;
pLayer->GetSize(&w, &h);
IGraphics::CLineItem Array[4] = {
IGraphics::CLineItem(0, 0, w, 0),
IGraphics::CLineItem(w, 0, w, h),
IGraphics::CLineItem(w, h, 0, h),
IGraphics::CLineItem(0, h, 0, 0)};
Graphics()->TextureClear();
Graphics()->LinesBegin();
Graphics()->LinesDraw(Array, 4);
Graphics()->LinesEnd();
}
}
}
}
void CMapView::RenderMap()
{
if(Editor()->m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && Input()->ShiftIsPressed() && !Input()->ModifierIsPressed() && Input()->KeyPress(KEY_G))
{
const bool AnyHidden =
!Editor()->m_Map.m_pGameLayer->m_Visible ||
(Editor()->m_Map.m_pFrontLayer && !Editor()->m_Map.m_pFrontLayer->m_Visible) ||
(Editor()->m_Map.m_pTeleLayer && !Editor()->m_Map.m_pTeleLayer->m_Visible) ||
(Editor()->m_Map.m_pSpeedupLayer && !Editor()->m_Map.m_pSpeedupLayer->m_Visible) ||
(Editor()->m_Map.m_pTuneLayer && !Editor()->m_Map.m_pTuneLayer->m_Visible) ||
(Editor()->m_Map.m_pSwitchLayer && !Editor()->m_Map.m_pSwitchLayer->m_Visible);
Editor()->m_Map.m_pGameLayer->m_Visible = AnyHidden;
if(Editor()->m_Map.m_pFrontLayer)
Editor()->m_Map.m_pFrontLayer->m_Visible = AnyHidden;
if(Editor()->m_Map.m_pTeleLayer)
Editor()->m_Map.m_pTeleLayer->m_Visible = AnyHidden;
if(Editor()->m_Map.m_pSpeedupLayer)
Editor()->m_Map.m_pSpeedupLayer->m_Visible = AnyHidden;
if(Editor()->m_Map.m_pTuneLayer)
Editor()->m_Map.m_pTuneLayer->m_Visible = AnyHidden;
if(Editor()->m_Map.m_pSwitchLayer)
Editor()->m_Map.m_pSwitchLayer->m_Visible = AnyHidden;
}
for(auto &pGroup : Editor()->m_Map.m_vpGroups)
{
if(pGroup->m_Visible)
pGroup->Render();
}
// render the game, tele, speedup, front, tune and switch above everything else
if(Editor()->m_Map.m_pGameGroup->m_Visible)
{
Editor()->m_Map.m_pGameGroup->MapScreen();
for(auto &pLayer : Editor()->m_Map.m_pGameGroup->m_vpLayers)
{
if(pLayer->m_Visible && pLayer->IsEntitiesLayer())
pLayer->Render();
}
}
std::shared_ptr<CLayerTiles> pT = std::static_pointer_cast<CLayerTiles>(Editor()->GetSelectedLayerType(0, LAYERTYPE_TILES));
if(Editor()->m_ShowTileInfo != CEditor::SHOW_TILE_OFF && pT && pT->m_Visible && m_Zoom.GetValue() <= 300.0f)
{
Editor()->GetSelectedGroup()->MapScreen();
pT->ShowInfo();
}
}
void CMapView::ResetZoom()
{
m_EditorOffset = vec2(0, 0);
SetEditorOffset({0, 0});
m_Zoom.SetValue(100.0f);
}
@ -28,7 +146,7 @@ void CMapView::ZoomMouseTarget(float ZoomFactor)
// get absolute mouse position
float aPoints[4];
RenderTools()->MapScreenToWorld(
m_WorldOffset.x, m_WorldOffset.y,
GetWorldOffset().x, GetWorldOffset().y,
100.0f, 100.0f, 100.0f, 0.0f, 0.0f, Graphics()->ScreenAspect(), m_WorldZoom, aPoints);
float WorldWidth = aPoints[2] - aPoints[0];
@ -38,7 +156,7 @@ void CMapView::ZoomMouseTarget(float ZoomFactor)
float Mwy = aPoints[1] + WorldHeight * (UI()->MouseY() / UI()->Screen()->h);
// adjust camera
m_WorldOffset += (vec2(Mwx, Mwy) - m_WorldOffset) * (1.0f - ZoomFactor);
OffsetWorld((vec2(Mwx, Mwy) - GetWorldOffset()) * (1.0f - ZoomFactor));
}
void CMapView::UpdateZoom()
@ -51,3 +169,68 @@ void CMapView::UpdateZoom()
ZoomMouseTarget(NewLevel / OldLevel);
m_WorldZoom = NewLevel / 100.0f;
}
CSmoothValue *CMapView::Zoom()
{
return &m_Zoom;
}
const CSmoothValue *CMapView::Zoom() const
{
return &m_Zoom;
}
CProofMode *CMapView::ProofMode()
{
return &m_ProofMode;
}
const CProofMode *CMapView::ProofMode() const
{
return &m_ProofMode;
}
CMapGrid *CMapView::MapGrid()
{
return &m_MapGrid;
}
const CMapGrid *CMapView::MapGrid() const
{
return &m_MapGrid;
}
void CMapView::OffsetWorld(vec2 Offset)
{
m_WorldOffset += Offset;
}
void CMapView::OffsetEditor(vec2 Offset)
{
m_EditorOffset += Offset;
}
void CMapView::SetWorldOffset(vec2 WorldOffset)
{
m_WorldOffset = WorldOffset;
}
void CMapView::SetEditorOffset(vec2 EditorOffset)
{
m_EditorOffset = EditorOffset;
}
vec2 CMapView::GetWorldOffset() const
{
return m_WorldOffset;
}
vec2 CMapView::GetEditorOffset() const
{
return m_EditorOffset;
}
float CMapView::WorldZoom() const
{
return m_WorldZoom;
}

44
src/game/editor/map_view.h
View file

@ -4,12 +4,27 @@
#include <base/vmath.h>
#include "component.h"
#include "map_grid.h"
#include "proof_mode.h"
#include "smooth_value.h"
class CLayerGroup;
class CMapView : public CEditorComponent
{
public:
void Init(CEditor *pEditor) override;
void OnReset() override;
void OnMapLoad() override;
void ZoomMouseTarget(float ZoomFactor);
void UpdateZoom();
void RenderGroupBorder();
void RenderMap();
bool IsFocused();
void Focus();
/**
* Reset zoom and editor offset.
@ -21,14 +36,33 @@ public:
*/
float ScaleLength(float Value);
void ZoomMouseTarget(float ZoomFactor);
void UpdateZoom();
bool m_ShowPicker; // TODO: make private
float WorldZoom() const;
void OffsetWorld(vec2 Offset);
void OffsetEditor(vec2 Offset);
void SetWorldOffset(vec2 WorldOffset);
void SetEditorOffset(vec2 EditorOffset);
vec2 GetWorldOffset() const;
vec2 GetEditorOffset() const;
CSmoothValue *Zoom();
const CSmoothValue *Zoom() const;
CProofMode *ProofMode();
const CProofMode *ProofMode() const;
CMapGrid *MapGrid();
const CMapGrid *MapGrid() const;
private:
CSmoothValue m_Zoom = CSmoothValue(200.0f, 10.0f, 2000.0f);
float m_WorldZoom;
CProofMode m_ProofMode;
CMapGrid m_MapGrid;
vec2 m_WorldOffset;
vec2 m_EditorOffset;
CSmoothValue m_Zoom = CSmoothValue(200.0f, 10.0f, 2000.0f);
float m_WorldZoom = 1.0f;
};
#endif

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

@ -2336,7 +2336,7 @@ CUI::EPopupMenuFunctionResult CEditor::PopupGoto(void *pContext, CUIRect View, b
static int s_Button;
if(pEditor->DoButton_Editor(&s_Button, "Go", 0, &Button, 0, nullptr))
{
pEditor->MapView()->m_WorldOffset = vec2(32.0f * s_GotoPos.x + 0.5f, 32.0f * s_GotoPos.y + 0.5f);
pEditor->MapView()->SetWorldOffset({32.0f * s_GotoPos.x + 0.5f, 32.0f * s_GotoPos.y + 0.5f});
}
return CUI::POPUP_KEEP_OPEN;
@ -2381,18 +2381,18 @@ CUI::EPopupMenuFunctionResult CEditor::PopupProofMode(void *pContext, CUIRect Vi
CUIRect Button;
View.HSplitTop(12.0f, &Button, &View);
static int s_ButtonIngame;
if(pEditor->DoButton_MenuItem(&s_ButtonIngame, "Ingame", pEditor->m_ProofBorders == PROOF_BORDER_INGAME, &Button, 0, "These borders represent what a player maximum can see."))
if(pEditor->DoButton_MenuItem(&s_ButtonIngame, "Ingame", pEditor->MapView()->ProofMode()->IsModeIngame(), &Button, 0, "These borders represent what a player maximum can see."))
{
pEditor->m_ProofBorders = PROOF_BORDER_INGAME;
pEditor->MapView()->ProofMode()->SetModeIngame();
return CUI::POPUP_CLOSE_CURRENT;
}
View.HSplitTop(2.0f, nullptr, &View);
View.HSplitTop(12.0f, &Button, &View);
static int s_ButtonMenu;
if(pEditor->DoButton_MenuItem(&s_ButtonMenu, "Menu", pEditor->m_ProofBorders == PROOF_BORDER_MENU, &Button, 0, "These borders represent what will be shown in the menu."))
if(pEditor->DoButton_MenuItem(&s_ButtonMenu, "Menu", pEditor->MapView()->ProofMode()->IsModeMenu(), &Button, 0, "These borders represent what will be shown in the menu."))
{
pEditor->m_ProofBorders = PROOF_BORDER_MENU;
pEditor->MapView()->ProofMode()->SetModeMenu();
return CUI::POPUP_CLOSE_CURRENT;
}

245
src/game/editor/proof_mode.cpp Normal file
View file

@ -0,0 +1,245 @@
#include "proof_mode.h"
#include <game/client/components/menu_background.h>
#include "editor.h"
void CProofMode::Init(CEditor *pEditor)
{
CEditorComponent::Init(pEditor);
SetMenuBackgroundPositionNames();
OnReset();
OnMapLoad();
}
void CProofMode::OnReset()
{
m_ProofBorders = PROOF_BORDER_OFF;
m_CurrentMenuProofIndex = 0;
}
void CProofMode::OnMapLoad()
{
m_vMenuBackgroundCollisions = {};
ResetMenuBackgroundPositions();
}
void CProofMode::SetMenuBackgroundPositionNames()
{
m_vpMenuBackgroundPositionNames.resize(CMenuBackground::NUM_POS);
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_START] = "start";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_INTERNET] = "browser(internet)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_LAN] = "browser(lan)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_DEMOS] = "demos";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_NEWS] = "news";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_FAVORITES] = "favorites";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_LANGUAGE] = "settings(language)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_GENERAL] = "settings(general)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_PLAYER] = "settings(player)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_TEE] = "settings(tee)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_APPEARANCE] = "settings(appearance)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_CONTROLS] = "settings(controls)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_GRAPHICS] = "settings(graphics)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_SOUND] = "settings(sound)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_DDNET] = "settings(ddnet)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_ASSETS] = "settings(assets)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_CUSTOM0] = "custom(ddnet)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_CUSTOM1] = "custom(kog)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_CUSTOM2] = "custom(3)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_BROWSER_CUSTOM3] = "custom(4)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_RESERVED0] = "reserved settings(1)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_SETTINGS_RESERVED1] = "reserved settings(2)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_RESERVED0] = "reserved(1)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_RESERVED1] = "reserved(2)";
m_vpMenuBackgroundPositionNames[CMenuBackground::POS_RESERVED2] = "reserved(3)";
}
void CProofMode::ResetMenuBackgroundPositions()
{
std::array<vec2, CMenuBackground::NUM_POS> aBackgroundPositions = GenerateMenuBackgroundPositions();
m_vMenuBackgroundPositions.assign(aBackgroundPositions.begin(), aBackgroundPositions.end());
if(Editor()->m_Map.m_pGameLayer)
{
for(int y = 0; y < Editor()->m_Map.m_pGameLayer->m_Height; ++y)
{
for(int x = 0; x < Editor()->m_Map.m_pGameLayer->m_Width; ++x)
{
CTile Tile = Editor()->m_Map.m_pGameLayer->GetTile(x, y);
if(Tile.m_Index >= TILE_TIME_CHECKPOINT_FIRST && Tile.m_Index <= TILE_TIME_CHECKPOINT_LAST)
{
int ArrayIndex = clamp<int>((Tile.m_Index - TILE_TIME_CHECKPOINT_FIRST), 0, CMenuBackground::NUM_POS);
m_vMenuBackgroundPositions[ArrayIndex] = vec2(x * 32.0f + 16.0f, y * 32.0f + 16.0f);
}
x += Tile.m_Skip;
}
}
}
m_vMenuBackgroundCollisions.clear();
m_vMenuBackgroundCollisions.resize(m_vMenuBackgroundPositions.size());
for(size_t i = 0; i < m_vMenuBackgroundPositions.size(); i++)
{
for(size_t j = i + 1; j < m_vMenuBackgroundPositions.size(); j++)
{
if(i != j && distance(m_vMenuBackgroundPositions[i], m_vMenuBackgroundPositions[j]) < 0.001f)
m_vMenuBackgroundCollisions.at(i).push_back(j);
}
}
}
void CProofMode::RenderScreenSizes()
{
const vec2 WorldOffset = Editor()->MapView()->GetWorldOffset();
// render screen sizes
if(m_ProofBorders != PROOF_BORDER_OFF && !Editor()->MapView()->m_ShowPicker)
{
std::shared_ptr<CLayerGroup> pGameGroup = Editor()->m_Map.m_pGameGroup;
pGameGroup->MapScreen();
Graphics()->TextureClear();
Graphics()->LinesBegin();
// possible screen sizes (white border)
float aLastPoints[4];
float Start = 1.0f; // 9.0f/16.0f;
float End = 16.0f / 9.0f;
const int NumSteps = 20;
for(int i = 0; i <= NumSteps; i++)
{
float aPoints[4];
float Aspect = Start + (End - Start) * (i / (float)NumSteps);
float Zoom = (m_ProofBorders == PROOF_BORDER_MENU) ? 0.7f : 1.0f;
RenderTools()->MapScreenToWorld(
WorldOffset.x, WorldOffset.y,
100.0f, 100.0f, 100.0f, 0.0f, 0.0f, Aspect, Zoom, aPoints);
if(i == 0)
{
IGraphics::CLineItem Array[2] = {
IGraphics::CLineItem(aPoints[0], aPoints[1], aPoints[2], aPoints[1]),
IGraphics::CLineItem(aPoints[0], aPoints[3], aPoints[2], aPoints[3])};
Graphics()->LinesDraw(Array, 2);
}
if(i != 0)
{
IGraphics::CLineItem Array[4] = {
IGraphics::CLineItem(aPoints[0], aPoints[1], aLastPoints[0], aLastPoints[1]),
IGraphics::CLineItem(aPoints[2], aPoints[1], aLastPoints[2], aLastPoints[1]),
IGraphics::CLineItem(aPoints[0], aPoints[3], aLastPoints[0], aLastPoints[3]),
IGraphics::CLineItem(aPoints[2], aPoints[3], aLastPoints[2], aLastPoints[3])};
Graphics()->LinesDraw(Array, 4);
}
if(i == NumSteps)
{
IGraphics::CLineItem Array[2] = {
IGraphics::CLineItem(aPoints[0], aPoints[1], aPoints[0], aPoints[3]),
IGraphics::CLineItem(aPoints[2], aPoints[1], aPoints[2], aPoints[3])};
Graphics()->LinesDraw(Array, 2);
}
mem_copy(aLastPoints, aPoints, sizeof(aPoints));
}
// two screen sizes (green and red border)
{
Graphics()->SetColor(1, 0, 0, 1);
for(int i = 0; i < 2; i++)
{
float aPoints[4];
const float aAspects[] = {4.0f / 3.0f, 16.0f / 10.0f, 5.0f / 4.0f, 16.0f / 9.0f};
float Aspect = aAspects[i];
float Zoom = (m_ProofBorders == PROOF_BORDER_MENU) ? 0.7f : 1.0f;
RenderTools()->MapScreenToWorld(
WorldOffset.x, WorldOffset.y,
100.0f, 100.0f, 100.0f, 0.0f, 0.0f, Aspect, Zoom, aPoints);
CUIRect r;
r.x = aPoints[0];
r.y = aPoints[1];
r.w = aPoints[2] - aPoints[0];
r.h = aPoints[3] - aPoints[1];
IGraphics::CLineItem Array[4] = {
IGraphics::CLineItem(r.x, r.y, r.x + r.w, r.y),
IGraphics::CLineItem(r.x + r.w, r.y, r.x + r.w, r.y + r.h),
IGraphics::CLineItem(r.x + r.w, r.y + r.h, r.x, r.y + r.h),
IGraphics::CLineItem(r.x, r.y + r.h, r.x, r.y)};
Graphics()->LinesDraw(Array, 4);
Graphics()->SetColor(0, 1, 0, 1);
}
}
Graphics()->LinesEnd();
// tee position (blue circle) and other screen positions
{
Graphics()->TextureClear();
Graphics()->QuadsBegin();
Graphics()->SetColor(0, 0, 1, 0.3f);
Graphics()->DrawCircle(WorldOffset.x, WorldOffset.y - 3.0f, 20.0f, 32);
if(m_ProofBorders == PROOF_BORDER_MENU)
{
Graphics()->SetColor(0, 1, 0, 0.3f);
std::set<int> indices;
for(int i = 0; i < (int)m_vMenuBackgroundPositions.size(); i++)
indices.insert(i);
while(!indices.empty())
{
int i = *indices.begin();
indices.erase(i);
for(int k : m_vMenuBackgroundCollisions.at(i))
indices.erase(k);
vec2 Pos = m_vMenuBackgroundPositions[i];
Pos += WorldOffset - m_vMenuBackgroundPositions[m_CurrentMenuProofIndex];
if(Pos == WorldOffset)
continue;
Graphics()->DrawCircle(Pos.x, Pos.y - 3.0f, 20.0f, 32);
}
}
Graphics()->QuadsEnd();
}
}
}
bool CProofMode::IsEnabled() const
{
return m_ProofBorders != PROOF_BORDER_OFF;
}
bool CProofMode::IsModeMenu() const
{
return m_ProofBorders == PROOF_BORDER_MENU;
}
bool CProofMode::IsModeIngame() const
{
return m_ProofBorders == PROOF_BORDER_INGAME;
}
void CProofMode::Toggle()
{
m_ProofBorders = m_ProofBorders == PROOF_BORDER_OFF ? PROOF_BORDER_INGAME : PROOF_BORDER_OFF;
}
void CProofMode::SetModeIngame()
{
m_ProofBorders = PROOF_BORDER_INGAME;
}
void CProofMode::SetModeMenu()
{
m_ProofBorders = PROOF_BORDER_MENU;
}

38
src/game/editor/proof_mode.h Normal file
View file

@ -0,0 +1,38 @@
#ifndef GAME_EDITOR_PROOF_MODE_H
#define GAME_EDITOR_PROOF_MODE_H
#include "component.h"
class CProofMode : public CEditorComponent
{
public:
void Init(CEditor *pEditor) override;
void OnReset() override;
void OnMapLoad() override;
void RenderScreenSizes();
bool IsEnabled() const;
bool IsModeMenu() const;
bool IsModeIngame() const;
void Toggle();
void SetModeMenu();
void SetModeIngame();
enum EProofBorder
{
PROOF_BORDER_OFF,
PROOF_BORDER_INGAME,
PROOF_BORDER_MENU
};
EProofBorder m_ProofBorders;
int m_CurrentMenuProofIndex;
std::vector<vec2> m_vMenuBackgroundPositions;
std::vector<const char *> m_vpMenuBackgroundPositionNames;
std::vector<std::vector<int>> m_vMenuBackgroundCollisions;
void SetMenuBackgroundPositionNames();
void ResetMenuBackgroundPositions();
};
#endif