malimova/ISEbd-22_Alimova_M.S._AirBomber_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ISEbd-22 Alimova M.S. Lab Work 02 #2

Closed
malimova wants to merge 21 commits from Lab2 into Lab1
pull from: Lab2
merge into: malimova:Lab1
Conversation 0 Commits 21 Files Changed 14 +6 -46
6 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8cd9bd77c1 - Show all commits

38
AirBomber/AirBomber/DrawningAirPlane.cs
View File

@ -88,44 +88,6 @@ namespace AirBomber
/// Изменение направления перемещения
/// </summary>
/// <param name="direction">Направление</param>
public void MoveTransport(DirectionType direction)
{
if (EntityAirPlane == null)
{
return;
}
switch (direction)
{
//влево
case DirectionType.Left:
if (_startPosX - EntityAirPlane.Step > 0)
{
_startPosX -= (int)EntityAirPlane.Step;
}
break;
//вверх
case DirectionType.Up:
if (_startPosY - EntityAirPlane.Step > 0)
{
_startPosY -= (int)EntityAirPlane.Step;
}
break;
// вправо
case DirectionType.Right:
if (_startPosX + EntityAirPlane.Step + _airPlaneWidth < _pictureWidth)
{
_startPosX += (int)EntityAirPlane.Step;
}
break;
//вниз
case DirectionType.Down:
if (_startPosY + EntityAirPlane.Step + _airPlaneHeight < _pictureHeight)
{
_startPosY += (int)EntityAirPlane.Step;
}
break;
}
}
/// <summary>
/// Прорисовка объекта
/// </summary>

2
AirBomber/AirBomber/DrawningObjectAirPlane.cs
View File

@ -30,6 +30,6 @@ namespace AirBomber
public bool CheckCanMove(DirectionType direction) =>
_drawningAirPlane?.CanMove(direction) ?? false;
public void MoveObject(DirectionType direction) =>
_drawningAirPlane?.MoveTransport(direction);
_drawningAirPlane?.MovePlane(direction);
}
}

2
AirBomber/AirBomber/FormAirBomber.Designer.cs generated
View File

@ -114,7 +114,7 @@
comboBoxStrategy.Anchor = AnchorStyles.Top | AnchorStyles.Right;
comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxStrategy.FormattingEnabled = true;
comboBoxStrategy.Items.AddRange(new object[] { "MoveToCenter", "MoveToRightEdge" });
comboBoxStrategy.Items.AddRange(new object[] { "MoveToCenter", "MoveToBorder" });
comboBoxStrategy.Location = new Point(755, 26);
comboBoxStrategy.Name = "comboBoxStrategy";
comboBoxStrategy.Size = new Size(219, 33);

8
AirBomber/AirBomber/FormAirBomber.cs
View File

@ -55,16 +55,16 @@
switch (name)
{
case "buttonUp":
_drawningAirPlane.MoveTransport(DirectionType.Up);
_drawningAirPlane.MovePlane(DirectionType.Up);
break;
case "buttonDown":
_drawningAirPlane.MoveTransport(DirectionType.Down);
_drawningAirPlane.MovePlane(DirectionType.Down);
break;
case "buttonLeft":
_drawningAirPlane.MoveTransport(DirectionType.Left);
_drawningAirPlane.MovePlane(DirectionType.Left);
break;
case "buttonRight":
_drawningAirPlane.MoveTransport(DirectionType.Right);
_drawningAirPlane.MovePlane(DirectionType.Right);
break;
}
Draw();

1
AirBomber/AirBomber/IMoveableObject.cs
View File

@ -27,6 +27,5 @@ namespace AirBomber
/// </summary>
/// <param name="direction">Направление</param>
void MoveObject(DirectionType direction);
}
}

1
AirBomber/AirBomber/MoveToBorder.cs
View File

@ -21,7 +21,6 @@ namespace AirBomber
var objParams = GetObjectParameters;
if (objParams == null) return;
if (objParams.RightBorder < FieldWidth - GetStep()) MoveRight();
}
}
}