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

Merge branch 'Display tee position in editor proof'

Browse source
This commit is contained in:
def 2016-08-03 00:11:10 +02:00
parent 126b52a639 a99a9fecfc
commit c308c348cb
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2564,6 +2564,7 @@ void CEditor::DoMapEditor(CUIRect View, CUIRect ToolBar)
Graphics()->TextureSet(-1); Graphics()->TextureSet(-1);
Graphics()->LinesBegin(); Graphics()->LinesBegin();
// possible screen sizes (white border)
float aLastPoints[4]; float aLastPoints[4];
float Start = 1.0f; //9.0f/16.0f; float Start = 1.0f; //9.0f/16.0f;
float End = 16.0f/9.0f; float End = 16.0f/9.0f;
@ -2606,7 +2607,7 @@ void CEditor::DoMapEditor(CUIRect View, CUIRect ToolBar)
mem_copy(aLastPoints, aPoints, sizeof(aPoints)); mem_copy(aLastPoints, aPoints, sizeof(aPoints));
} }
if(1) // two screen sizes (green and red border)
{ {
Graphics()->SetColor(1,0,0,1); Graphics()->SetColor(1,0,0,1);
for(int i = 0; i < 2; i++) for(int i = 0; i < 2; i++)
@ -2634,8 +2635,16 @@ void CEditor::DoMapEditor(CUIRect View, CUIRect ToolBar)
Graphics()->SetColor(0,1,0,1); Graphics()->SetColor(0,1,0,1);
} }
} }
Graphics()->LinesEnd(); Graphics()->LinesEnd();
// tee position (blue circle)
{
Graphics()->TextureSet(-1);
Graphics()->QuadsBegin();
Graphics()->SetColor(0,0,1,0.3f);
RenderTools()->DrawCircle(m_WorldOffsetX, m_WorldOffsetY, 20.0f, 32);
Graphics()->QuadsEnd();
}
} }
if (!m_ShowPicker && m_ShowTileInfo && m_ShowEnvelopePreview != 0 && GetSelectedLayer(0) && GetSelectedLayer(0)->m_Type == LAYERTYPE_QUADS) if (!m_ShowPicker && m_ShowTileInfo && m_ShowEnvelopePreview != 0 && GetSelectedLayer(0) && GetSelectedLayer(0)->m_Type == LAYERTYPE_QUADS)