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

Show current quad when pressing space in editor

Browse source
This commit is contained in:
def 2014-08-21 00:56:35 +02:00
parent 6e7594c22a
commit a5ec9e3240
2 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1807,8 +1807,6 @@ void CEditor::DoMapEditor(CUIRect View, CUIRect ToolBar)
// fetch mouse position
float wx = UI()->MouseWorldX();
float wy = UI()->MouseWorldY();
float mx = UI()->MouseX();
float my = UI()->MouseY();
static float s_StartWx = 0;
static float s_StartWy = 0;
@ -1832,18 +1830,35 @@ void CEditor::DoMapEditor(CUIRect View, CUIRect ToolBar)
float h = Size*(Screen.h/View.h);
float x = -(View.x/Screen.w)*w;
float y = -(View.y/Screen.h)*h;
wx = x+w*mx/Screen.w;
wy = y+h*my/Screen.h;
Graphics()->MapScreen(x, y, x+w, y+h);
CLayerTiles *t = (CLayerTiles *)GetSelectedLayerType(0, LAYERTYPE_TILES);
if(t)
{
Graphics()->MapScreen(x, y, x+w, y+h);
m_TilesetPicker.m_Image = t->m_Image;
m_TilesetPicker.m_TexID = t->m_TexID;
m_TilesetPicker.Render();
if(m_ShowTileInfo)
m_TilesetPicker.ShowInfo();
}
else
{
CLayerQuads *t = (CLayerQuads *)GetSelectedLayerType(0, LAYERTYPE_QUADS);
if(t)
{
m_QuadsetPicker.m_Image = t->m_Image;
m_QuadsetPicker.m_lQuads[0].m_aPoints[0].x = (int) View.x << 10;
m_QuadsetPicker.m_lQuads[0].m_aPoints[0].y = (int) View.y << 10;
m_QuadsetPicker.m_lQuads[0].m_aPoints[1].x = (int) (View.x+View.w) << 10;
m_QuadsetPicker.m_lQuads[0].m_aPoints[1].y = (int) View.y << 10;
m_QuadsetPicker.m_lQuads[0].m_aPoints[2].x = (int) View.x << 10;
m_QuadsetPicker.m_lQuads[0].m_aPoints[2].y = (int) (View.y+View.h) << 10;
m_QuadsetPicker.m_lQuads[0].m_aPoints[3].x = (int) (View.x+View.w) << 10;
m_QuadsetPicker.m_lQuads[0].m_aPoints[3].y = (int) (View.y+View.h) << 10;
m_QuadsetPicker.m_lQuads[0].m_aPoints[4].x = (int) (View.x+View.w/2) << 10;
m_QuadsetPicker.m_lQuads[0].m_aPoints[4].y = (int) (View.y+View.h/2) << 10;
m_QuadsetPicker.Render();
}
}
}
static int s_Operation = OP_NONE;
@ -1853,11 +1868,16 @@ void CEditor::DoMapEditor(CUIRect View, CUIRect ToolBar)
int NumEditLayers = 0;
NumEditLayers = 0;
if(m_ShowPicker)
if(m_ShowPicker && GetSelectedLayer(0)->m_Type == LAYERTYPE_TILES)
{
pEditLayers[0] = &m_TilesetPicker;
NumEditLayers++;
}
else if (m_ShowPicker)
{
pEditLayers[0] = &m_QuadsetPicker;
NumEditLayers++;
}
else
{
pEditLayers[0] = GetSelectedLayer(0);
@ -4326,6 +4346,10 @@ void CEditor::Init()
m_TilesetPicker.MakePalette();
m_TilesetPicker.m_Readonly = true;
m_QuadsetPicker.m_pEditor = this;
m_QuadsetPicker.NewQuad();
m_QuadsetPicker.m_Readonly = true;
m_Brush.m_pMap = &m_Map;
Reset();

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

@ -791,7 +791,7 @@ public:
int m_SelectedPoints;
int m_SelectedEnvelope;
int m_SelectedEnvelopePoint;
int m_SelectedQuadEnvelope;
int m_SelectedQuadEnvelope;
int m_SelectedImage;
static int ms_CheckerTexture;
@ -801,6 +801,7 @@ public:
CLayerGroup m_Brush;
CLayerTiles m_TilesetPicker;
CLayerQuads m_QuadsetPicker;
static const void *ms_pUiGotContext;