YourDax/PIbd-23_Tikhonenkov_A.E_AntiAircraftGun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Добавил 2 свойства-признака

Browse Source
This commit is contained in:
Алексей Тихоненков 2023-10-11 03:25:57 +04:00
parent 9512284e54
commit cb138fd554
3 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
AntiAirCraftGun/AntiAirCraftGun/DrawingAntiAirCraftGun.cs
View File

@ -52,13 +52,13 @@ namespace AntiAircraftGun
/// <returns>true - объект создан, false - проверка не пройдена,
///нельзя создать объект в этих размерах</returns>
public bool Init(int speed, double weight, Color bodyColor, Color
additionalColor, int width, int height)
additionalColor, Color dopColor, bool rocket, bool radar, int width, int height)
{
// TODO: Продумать проверки
_pictureWidth = width;
_pictureHeight = height;
AntiAircraftGun = new EntityAntiAircraftGun();
AntiAircraftGun.Init(speed, weight, bodyColor, additionalColor);
AntiAircraftGun.Init(speed, weight, bodyColor, additionalColor,dopColor,rocket,radar);
return true;
}
/// <summary>
@ -136,24 +136,13 @@ namespace AntiAircraftGun
Brush bodyBrush = new SolidBrush(AntiAircraftGun.BodyColor);
Brush additionalBrush = new SolidBrush(AntiAircraftGun.AdditionalColor);
// Нарисовать гусеницы
g.FillEllipse(additionalBrush, _startPosX, _startPosY+40, 110, 10);
g.DrawEllipse(pen, _startPosX, _startPosY+40, 110, 10);
g.FillRectangle(bodyBrush, _startPosX, _startPosY+30, 110, 10);
g.DrawRectangle(pen, _startPosX, _startPosY+30, 110, 10);
g.FillRectangle(bodyBrush, _startPosX+80, _startPosY+10, 30, 20);
g.DrawRectangle(pen, _startPosX+80, _startPosY+10, 30, 20);
points[0] = new Point(_startPosX, _startPosY+30);
points[1] = new Point(_startPosX+95, _startPosY+5);
points[2] = new Point(_startPosX+92, _startPosY);
points[3] = new Point(_startPosX, _startPosY+25);
g.FillPolygon(additionalBrush, points);
g.DrawPolygon(pen, points);
//g.DrawLine(pen, _startPosX, _startPosY+30, _startPosX+95,_startPosY+5 );
//g.DrawLine(pen, _startPosX+95, _startPosY+5, _startPosX+92, _startPosY);
//g.DrawLine(pen, _startPosX+92, _startPosY, _startPosX, _startPosY+26);
//g.DrawLine(pen, _startPosX, _startPosY+26, _startPosX, _startPosY+30);
for (int i = 0; i < 4; i++)
{
Rectangle trackRect = new Rectangle(_startPosX+20 + i*19, _startPosY+40, 10, 10);
@ -162,6 +151,29 @@ namespace AntiAircraftGun
}
Brush dopBrush = new SolidBrush(AntiAircraftGun.DopColor);
Pen dopPen = new Pen(AntiAircraftGun.DopColor);
if (AntiAircraftGun.Rocket)
{
points[0] = new Point(_startPosX, _startPosY + 30);
points[1] = new Point(_startPosX + 95, _startPosY + 5);
points[2] = new Point(_startPosX + 92, _startPosY);
points[3] = new Point(_startPosX, _startPosY + 25);
g.FillPolygon(dopBrush, points);
g.DrawPolygon(pen, points);
}
if (AntiAircraftGun.Radar)
{
g.DrawLine(dopPen, _startPosX + 105, _startPosY + 20, _startPosX +105, _startPosY + 5);
g.FillPie(dopBrush, _startPosX + 81, _startPosY-15, 30, 30, -45, 180);
g.DrawLine(dopPen, _startPosX + 98, _startPosY, _startPosX + 93, _startPosY + 10);
g.FillEllipse(dopBrush, _startPosX + 88, _startPosY -10, 10, 10);
}
}
}

11
AntiAirCraftGun/AntiAirCraftGun/EntityAntiAircraftGun.cs
View File

@ -28,6 +28,12 @@ namespace AntiAircraftGun
/// Шаг перемещения автомобиля
/// </summary>
public double Step => (double)Speed * 100 / Weight;
public Color DopColor { get; private set; }
public bool Rocket { get; private set; }
public bool Radar { get; private set; }
/// <summary>
/// Инициализация полей объекта-класса спортивного автомобиля
/// </summary>
@ -35,12 +41,15 @@ namespace AntiAircraftGun
/// <param name="weight">Вес автомобиля</param>
/// <param name="bodyColor">Основной цвет</param>
public void Init(int speed, double weight, Color bodyColor, Color additionalColor)
public void Init(int speed, double weight, Color bodyColor, Color additionalColor, Color dopColor, bool rocket, bool radar)
{
Speed = speed;
Weight = weight;
BodyColor = bodyColor;
AdditionalColor = additionalColor;
DopColor = dopColor;
Rocket = rocket;
Radar = radar;
}
}
}

4
AntiAirCraftGun/AntiAirCraftGun/FormAntiAirCraftGun.cs
View File

@ -103,6 +103,10 @@ namespace AntiAircraftGun
Color.FromArgb(random.Next(0, 256), random.Next(0, 256),//äîï. öâåò
random.Next(0, 256)),
Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), // Äîï. öâåò2
Convert.ToBoolean(random.Next(2)), // Rocket
Convert.ToBoolean(random.Next(2)), // Radar
pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height);
_drawing.SetPosition(random.Next(10, 100),
random.Next(10, 100));