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

Merge pull request #7066 from Robyt3/Editor-Explain-Refactoring

Browse source 
Refactor editor entities layer explanations
This commit is contained in:
Dennis Felsing 2023-08-25 16:16:23 +00:00 committed by GitHub
parent 749ee6c83e b6f0c59b26
commit 2dd70435a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 707 additions and 673 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2774,11 +2774,10 @@ void CEditor::DoMapEditor(CUIRect View)
// brush editing
if(UI()->HotItem() == s_pEditorID)
{
int Layer = NUM_LAYERS;
bool IsQuadLayerSelected = GetSelectedLayerType(0, LAYERTYPE_QUADS) != nullptr;
if(m_ShowPicker)
{
std::shared_ptr<CLayer> pLayer = GetSelectedLayer(0);
int Layer;
if(pLayer == m_Map.m_pGameLayer)
Layer = LAYER_GAME;
else if(pLayer == m_Map.m_pFrontLayer)
@ -2791,17 +2790,27 @@ void CEditor::DoMapEditor(CUIRect View)
Layer = LAYER_SPEEDUP;
else if(pLayer == m_Map.m_pTuneLayer)
Layer = LAYER_TUNE;
}
if(m_ShowPicker && Layer != NUM_LAYERS)
{
else
Layer = NUM_LAYERS;
EExplanation Explanation = EExplanation::DDNET;
if(m_SelectEntitiesImage == "DDNet")
m_pTooltip = Explain(EXPLANATION_DDNET, (int)wx / 32 + (int)wy / 32 * 16, Layer);
Explanation = EExplanation::DDNET;
else if(m_SelectEntitiesImage == "FNG")
m_pTooltip = Explain(EXPLANATION_FNG, (int)wx / 32 + (int)wy / 32 * 16, Layer);
Explanation = EExplanation::FNG;
else if(m_SelectEntitiesImage == "Race")
Explanation = EExplanation::RACE;
else if(m_SelectEntitiesImage == "Vanilla")
m_pTooltip = Explain(EXPLANATION_VANILLA, (int)wx / 32 + (int)wy / 32 * 16, Layer);
Explanation = EExplanation::VANILLA;
else if(m_SelectEntitiesImage == "blockworlds")
Explanation = EExplanation::BLOCKWORLDS;
else
dbg_assert(false, "Unhandled entities image for explanations");
if(Layer != NUM_LAYERS)
m_pTooltip = Explain(Explanation, (int)wx / 32 + (int)wy / 32 * 16, Layer);
}
else if(m_pBrush->IsEmpty() && IsQuadLayerSelected)
else if(m_pBrush->IsEmpty() && GetSelectedLayerType(0, LAYERTYPE_QUADS) != nullptr)
m_pTooltip = "Hold shift to select multiple quads. Use ctrl + c and ctrl + v to copy and paste quads. Press R to rotate selected quads.";
else if(m_pBrush->IsEmpty())
m_pTooltip = "Use left mouse button to drag and create a brush. Use ctrl+right mouse to select layer.";

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

@ -1481,15 +1481,18 @@ public:
};
// Explanations
enum
enum class EExplanation
{
EXPLANATION_DDNET,
EXPLANATION_FNG,
EXPLANATION_RACE,
EXPLANATION_VANILLA,
EXPLANATION_BLOCKWORLDS
DDNET,
FNG,
RACE,
VANILLA,
BLOCKWORLDS
};
static const char *Explain(int ExplanationID, int Tile, int Layer);
static const char *ExplainDDNet(int Tile, int Layer);
static const char *ExplainFNG(int Tile, int Layer);
static const char *ExplainVanilla(int Tile, int Layer);
static const char *Explain(EExplanation Explanation, int Tile, int Layer);
int GetLineDistance() const;

1336
src/game/editor/explanations.cpp
View file

File diff suppressed because it is too large Load diff