Zyzf/PIbd-22_Kalyshev_Y_V_MotorBoat_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2_Laba Kalyshev Y V PIbd-22 #3

Merged
eegov merged 6 commits from 2_Laba into 1_Laba 2022-09-30 11:28:06 +04:00
Conversation 0 Commits 6 Files Changed 16 +7 -15
6 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 99aa437848 - Show all commits

2
PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/AbstractMap.cs
View File

@ -32,7 +32,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
public Bitmap MoveObject(Direction direction)
{
// TODO проверка, что объект может переместится в требуемом направлении
if (true)
if (true)
{
_drawningObject.MoveObject(direction);
}

2
PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningBoat.cs
View File

@ -174,7 +174,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
}
public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
{
return (_startPosX, _startPosY, _startPosX + _boatWidth, _startPosY + _boatHeight);
return (_startPosX, _startPosX + _boatWidth, _startPosY, _startPosY + _boatHeight);
}
}
}

6
PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/DrawningObjectBoat.cs
View File

@ -14,22 +14,18 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
_boat = boat;
}
public float Step => _boat?.Boat?.Step ?? 0;
public void DrawningObject(Graphics g)
{
// TODO
_boat?.DrawTransport(g);
}
public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
{
return _boat?.GetCurrentPosition() ?? default;
}
public void MoveObject(Direction direction)
{
_boat.MoveTransport(direction);
}
public void SetObject(int x, int y, int width, int height)
{
_boat.SetPosition(x, y, width, height);

1
PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormBoat.cs
View File

@ -86,7 +86,6 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base.git
{
Random rnd = new();
_boat = new DrawningSportBoat(rnd.Next(5, 30), rnd.Next(30, 100), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
SetData();
Draw();
}

5
PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/FormMap.cs
View File

@ -37,9 +37,8 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
private void ButtonCreate_Click(object sender, EventArgs e)
{
Random rnd = new();
var car = new DrawningBoat(rnd.Next(100, 300), rnd.Next(1000, 2000),
Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
SetData(car);
var boat = new DrawningBoat(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
SetData(boat);
}
/// <summary>
/// Изменение размеров формы

6
PIbd-22_Kalyshev_Y_V_MotorBoat_Base.git/SimpleMap.cs
View File

@ -18,13 +18,11 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
private readonly Brush roadColor = new SolidBrush(Color.Gray);
protected override void DrawBarrierPart(Graphics g, int i, int j)
{
g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x +
1), j * (_size_y + 1));
g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
}
protected override void DrawRoadPart(Graphics g, int i, int j)
{
g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x +
1), j * (_size_y + 1));
g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
}
protected override void GenerateMap()
{