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

fix quadpoint moving on selection

Browse source
This commit is contained in:
marmare314 2023-07-13 10:25:28 +02:00
parent fc6bf6545b
commit 974255b3ea
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1674,6 +1674,7 @@ void CEditor::DoQuadPoint(CQuad *pQuad, int QuadIndex, int V)
enum
{
OP_NONE = 0,
OP_SELECT,
OP_MOVEPOINT,
OP_MOVEUV,
OP_CONTEXT_MENU
@ -1681,6 +1682,8 @@ void CEditor::DoQuadPoint(CQuad *pQuad, int QuadIndex, int V)
static bool s_Moved;
static int s_Operation = OP_NONE;
static float s_MouseXStart = 0.0f;
static float s_MouseYStart = 0.0f;
const bool IgnoreGrid = Input()->AltIsPressed();
@ -1694,6 +1697,15 @@ void CEditor::DoQuadPoint(CQuad *pQuad, int QuadIndex, int V)
if(s_Moved)
{
if(s_Operation == OP_SELECT)
{
float x = s_MouseXStart - UI()->MouseX();
float y = s_MouseYStart - UI()->MouseY();
if(x * x + y * y > 20.0f)
s_Operation = OP_MOVEPOINT;
}
if(s_Operation == OP_MOVEPOINT)
{
float x = wx;
@ -1791,7 +1803,12 @@ void CEditor::DoQuadPoint(CQuad *pQuad, int QuadIndex, int V)
UI()->EnableMouseLock(pID);
}
else
s_Operation = OP_MOVEPOINT;
{
s_MouseXStart = UI()->MouseX();
s_MouseYStart = UI()->MouseY();
s_Operation = OP_SELECT;
}
if(!(m_SelectedPoints & (1 << V)))
{