More changes to ensure that switching between selectMode stuff works properly (won't get stuck or trigger on mouseup when it shouldn't)
Hopefully no bugs but lots of the previous commits had bugs. Also, remove wasd shortcuts for shifting stamps because they conflicted with being able to press 's' to switch selectMode at any point.
This commit is contained in:
jacob1
parent
a0c77fe6e8
commit
e5ef3cd4a8
@ -673,7 +673,7 @@ bool GameController::KeyPress(int key, Uint16 character, bool shift, bool ctrl,
|
||||
sim->player2.comm = (int)(sim->player2.comm)|0x04; //Jump command
|
||||
}
|
||||
|
||||
if((!sim->elementCount[PT_STKM2] || ctrl) && gameView->GetSelectMode() == SelectNone)
|
||||
if (!sim->elementCount[PT_STKM2] || ctrl)
|
||||
{
|
||||
switch(key)
|
||||
{
|
||||
|
||||
@ -1101,6 +1101,7 @@ void GameView::OnMouseDown(int x, int y, unsigned button)
|
||||
button = BUTTON_MIDDLE;
|
||||
if (!(zoomEnabled && !zoomCursorFixed))
|
||||
{
|
||||
isMouseDown = true;
|
||||
if (selectMode != SelectNone)
|
||||
{
|
||||
if (button == BUTTON_LEFT && selectPoint1.X == -1)
|
||||
@ -1118,7 +1119,6 @@ void GameView::OnMouseDown(int x, int y, unsigned button)
|
||||
toolIndex = 1;
|
||||
if (button == BUTTON_MIDDLE)
|
||||
toolIndex = 2;
|
||||
isMouseDown = true;
|
||||
c->HistorySnapshot();
|
||||
if (drawMode == DrawRect || drawMode == DrawLine)
|
||||
{
|
||||
@ -1142,8 +1142,9 @@ void GameView::OnMouseUp(int x, int y, unsigned button)
|
||||
drawMode = DrawPoints;
|
||||
isMouseDown = false;
|
||||
}
|
||||
else
|
||||
else if (isMouseDown)
|
||||
{
|
||||
isMouseDown = false;
|
||||
if (selectMode != SelectNone)
|
||||
{
|
||||
if (button == BUTTON_LEFT && selectPoint1.X != -1 && selectPoint1.Y != -1 && selectPoint2.X != -1 && selectPoint2.Y != -1)
|
||||
@ -1186,19 +1187,14 @@ void GameView::OnMouseUp(int x, int y, unsigned button)
|
||||
return;
|
||||
}
|
||||
|
||||
if (isMouseDown)
|
||||
{
|
||||
isMouseDown = false;
|
||||
ui::Point finalDrawPoint2 = c->PointTranslate(currentMouse);
|
||||
if (drawMode == DrawRect || drawMode == DrawLine)
|
||||
{
|
||||
drawPoint2 = finalDrawPoint2;
|
||||
|
||||
if (drawSnap && drawMode == DrawLine)
|
||||
{
|
||||
finalDrawPoint2 = lineSnapCoords(c->PointTranslate(drawPoint1), drawPoint2);
|
||||
}
|
||||
|
||||
if (drawSnap && drawMode == DrawRect)
|
||||
{
|
||||
finalDrawPoint2 = rectSnapCoords(c->PointTranslate(drawPoint1), drawPoint2);
|
||||
@ -1225,7 +1221,9 @@ void GameView::OnMouseUp(int x, int y, unsigned button)
|
||||
// since ctrl/shift state may have changed since we started drawing
|
||||
UpdateDrawMode();
|
||||
}
|
||||
}
|
||||
// this shouldn't happen, but do this just in case
|
||||
else if (selectMode != SelectNone && button != BUTTON_LEFT)
|
||||
selectMode = SelectNone;
|
||||
}
|
||||
|
||||
void GameView::ExitPrompt()
|
||||
@ -1275,13 +1273,13 @@ void GameView::ToolTip(ui::Point senderPosition, std::string toolTip)
|
||||
|
||||
void GameView::OnMouseWheel(int x, int y, int d)
|
||||
{
|
||||
if(!d)
|
||||
if (!d)
|
||||
return;
|
||||
if(selectMode!=SelectNone)
|
||||
if (selectMode != SelectNone)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if(zoomEnabled && !zoomCursorFixed)
|
||||
if (zoomEnabled && !zoomCursorFixed)
|
||||
{
|
||||
c->AdjustZoomSize(d);
|
||||
}
|
||||
@ -1294,7 +1292,8 @@ void GameView::OnMouseWheel(int x, int y, int d)
|
||||
void GameView::BeginStampSelection()
|
||||
{
|
||||
selectMode = SelectStamp;
|
||||
selectPoint1 = ui::Point(-1, -1);
|
||||
selectPoint1 = selectPoint2 = ui::Point(-1, -1);
|
||||
isMouseDown = false;
|
||||
buttonTip = "\x0F\xEF\xEF\020Click-and-drag to specify an area to create a stamp (right click = cancel)";
|
||||
buttonTipShow = 120;
|
||||
}
|
||||
@ -1313,19 +1312,15 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
|
||||
switch (key)
|
||||
{
|
||||
case KEY_RIGHT:
|
||||
case 'd':
|
||||
c->TranslateSave(ui::Point(1, 0));
|
||||
return;
|
||||
case KEY_LEFT:
|
||||
case 'a':
|
||||
c->TranslateSave(ui::Point(-1, 0));
|
||||
return;
|
||||
case KEY_UP:
|
||||
case 'w':
|
||||
c->TranslateSave(ui::Point(0, -1));
|
||||
return;
|
||||
case KEY_DOWN:
|
||||
case 's':
|
||||
c->TranslateSave(ui::Point(0, 1));
|
||||
return;
|
||||
case 'r':
|
||||
@ -1483,6 +1478,7 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
|
||||
{
|
||||
selectMode = SelectCopy;
|
||||
selectPoint1 = selectPoint2 = ui::Point(-1, -1);
|
||||
isMouseDown = false;
|
||||
buttonTip = "\x0F\xEF\xEF\020Click-and-drag to specify an area to copy (right click = cancel)";
|
||||
buttonTipShow = 120;
|
||||
}
|
||||
@ -1492,15 +1488,19 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
|
||||
{
|
||||
selectMode = SelectCut;
|
||||
selectPoint1 = selectPoint2 = ui::Point(-1, -1);
|
||||
isMouseDown = false;
|
||||
buttonTip = "\x0F\xEF\xEF\020Click-and-drag to specify an area to copy then cut (right click = cancel)";
|
||||
buttonTipShow = 120;
|
||||
}
|
||||
break;
|
||||
case 'v':
|
||||
if(ctrl)
|
||||
if (ctrl)
|
||||
{
|
||||
if (c->LoadClipboard())
|
||||
{
|
||||
if (c->LoadClipboard());
|
||||
selectPoint1 = selectPoint2 = mousePosition;
|
||||
isMouseDown = false;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 'l':
|
||||
@ -1515,6 +1515,7 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
|
||||
}
|
||||
}
|
||||
case 'k':
|
||||
selectMode = SelectNone;
|
||||
selectPoint1 = selectPoint2 = ui::Point(-1, -1);
|
||||
c->OpenStamps();
|
||||
break;
|
||||
@ -1600,6 +1601,8 @@ void GameView::OnTick(float dt)
|
||||
selectMode = SelectNone;
|
||||
if (zoomEnabled && !zoomCursorFixed)
|
||||
c->SetZoomPosition(currentMouse);
|
||||
if (selectMode == SelectNone)
|
||||
{
|
||||
if (drawMode == DrawPoints)
|
||||
{
|
||||
if (isMouseDown)
|
||||
@ -1616,6 +1619,7 @@ void GameView::OnTick(float dt)
|
||||
{
|
||||
c->DrawLine(toolIndex, c->PointTranslate(drawPoint1), lineSnapCoords(c->PointTranslate(drawPoint1), currentMouse));
|
||||
}
|
||||
}
|
||||
|
||||
sign * foundSign = c->GetSignAt(mousePosition.X, mousePosition.Y);
|
||||
if (foundSign)
|
||||
@ -1776,6 +1780,7 @@ void GameView::DoTick(float dt)
|
||||
if (!c->MouseTick())
|
||||
{
|
||||
isMouseDown = false;
|
||||
selectMode = SelectNone;
|
||||
drawMode = DrawPoints;
|
||||
}
|
||||
Window::DoTick(dt);
|
||||
@ -1888,9 +1893,9 @@ void GameView::enableShiftBehaviour()
|
||||
if(!shiftBehaviour)
|
||||
{
|
||||
shiftBehaviour = true;
|
||||
if (!isMouseDown)
|
||||
if (!isMouseDown || selectMode != SelectNone)
|
||||
UpdateDrawMode();
|
||||
if (isMouseDown || (toolBrush && drawMode == DrawPoints))
|
||||
else if (toolBrush && drawMode == DrawPoints)
|
||||
c->SetToolStrength(10.0f);
|
||||
}
|
||||
}
|
||||
@ -1900,7 +1905,7 @@ void GameView::disableShiftBehaviour()
|
||||
if(shiftBehaviour)
|
||||
{
|
||||
shiftBehaviour = false;
|
||||
if (!isMouseDown)
|
||||
if (!isMouseDown || selectMode != SelectNone)
|
||||
UpdateDrawMode();
|
||||
if (!ctrlBehaviour)
|
||||
c->SetToolStrength(1.0f);
|
||||
@ -1932,7 +1937,7 @@ void GameView::enableCtrlBehaviour()
|
||||
if(!ctrlBehaviour)
|
||||
{
|
||||
ctrlBehaviour = true;
|
||||
if (!isMouseDown)
|
||||
if (!isMouseDown || selectMode != SelectNone)
|
||||
UpdateDrawMode();
|
||||
|
||||
//Show HDD save & load buttons
|
||||
@ -1948,7 +1953,7 @@ void GameView::enableCtrlBehaviour()
|
||||
searchButton->SetToolTip("Open a simulation from your hard drive.");
|
||||
if (currentSaveType == 2)
|
||||
((SplitButton*)saveSimulationButton)->SetShowSplit(true);
|
||||
if(isMouseDown || (toolBrush && drawMode == DrawPoints))
|
||||
if ((isMouseDown && selectMode == SelectNone) || (toolBrush && drawMode == DrawPoints))
|
||||
{
|
||||
if(!shiftBehaviour)
|
||||
c->SetToolStrength(.1f);
|
||||
@ -1963,7 +1968,7 @@ void GameView::disableCtrlBehaviour()
|
||||
if(ctrlBehaviour)
|
||||
{
|
||||
ctrlBehaviour = false;
|
||||
if (!isMouseDown)
|
||||
if (!isMouseDown || selectMode != SelectNone)
|
||||
UpdateDrawMode();
|
||||
|
||||
//Hide HDD save & load buttons
|
||||
|
||||
Loading…
Reference in New Issue
Block a user