ValAnn/PIbd-23_Valova_A.D._DumpTruck._Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finish

Browse Source
This commit is contained in:
ValAnn 2023-11-03 16:13:39 +04:00
parent aa2788a3ac
commit 6ffdf8d9a4
6 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DumpTruck/DumpTruck/DrawingDumpCar.cs
View File

@ -14,8 +14,6 @@ namespace DumpTruck.DrawningObjects
{ {
public class DrawningDumpTruck : DrawningCar public class DrawningDumpTruck : DrawningCar
{ {
public DrawningDumpTruck(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool tent, int width, int height): base(speed, weight, bodyColor, width, height, 110, 60) public DrawningDumpTruck(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool tent, int width, int height): base(speed, weight, bodyColor, width, height, 110, 60)
{ {
if (EntityCar != null) if (EntityCar != null)
@ -23,8 +21,7 @@ namespace DumpTruck.DrawningObjects
EntityCar = new EntityDumpTruck(speed, weight, bodyColor,additionalColor, bodyKit, tent); EntityCar = new EntityDumpTruck(speed, weight, bodyColor,additionalColor, bodyKit, tent);
} }
} }
public override void DrawTransport(Graphics g) public override void DrawTransport(Graphics g)
{ {
if (EntityCar is not EntityDumpTruck dumpTruck) if (EntityCar is not EntityDumpTruck dumpTruck)

6
DumpTruck/DumpTruck/DrawningCar.cs
View File

@ -41,7 +41,6 @@ namespace DumpTruck.DrawningObjects
/// </summary> /// </summary>
public int GetHeight => _carHeight; public int GetHeight => _carHeight;
public DrawningCar(int speed, double weight, Color bodyColor, int width, int height) public DrawningCar(int speed, double weight, Color bodyColor, int width, int height)
{ {
if(width < _carWidth || height < _carHeight) if(width < _carWidth || height < _carHeight)
@ -52,9 +51,6 @@ namespace DumpTruck.DrawningObjects
_pictureHeight = height; _pictureHeight = height;
EntityCar = new EntityCar(speed, weight, bodyColor); EntityCar = new EntityCar(speed, weight, bodyColor);
} }
protected DrawningCar(int speed, double weight, Color bodyColor, int protected DrawningCar(int speed, double weight, Color bodyColor, int
@ -129,7 +125,6 @@ width, int height, int carWidth, int carHeight)
}; };
} }
public virtual void DrawTransport(Graphics g) public virtual void DrawTransport(Graphics g)
{ {
if (EntityCar == null) if (EntityCar == null)
@ -146,7 +141,6 @@ width, int height, int carWidth, int carHeight)
g.FillEllipse(brush, _startPosX, _startPosY + 35 + 10, 15, 15); g.FillEllipse(brush, _startPosX, _startPosY + 35 + 10, 15, 15);
g.FillEllipse(brush, _startPosX + 15, _startPosY + 35 + 10, 15, 15); g.FillEllipse(brush, _startPosX + 15, _startPosY + 35 + 10, 15, 15);
g.FillEllipse(brush, _startPosX + 95, _startPosY + 35 + 10, 15, 15); g.FillEllipse(brush, _startPosX + 95, _startPosY + 35 + 10, 15, 15);
} }
} }

4
DumpTruck/DumpTruck/EntityDumpTruck.cs
View File

@ -26,12 +26,10 @@ namespace DumpTruck.Entities
/// Признак (опция) наличия tent /// Признак (опция) наличия tent
/// </summary> /// </summary>
public bool Tent { get; private set; } public bool Tent { get; private set; }
public EntityDumpTruck(int speed, double weight, Color bodyColor, Color public EntityDumpTruck(int speed, double weight, Color bodyColor, Color
additionalColor, bool bodyKit, bool tent) : base(speed, weight, bodyColor) additionalColor, bool bodyKit, bool tent) : base(speed, weight, bodyColor)
{ {
AdditionalColor = additionalColor; AdditionalColor = additionalColor;
BodyKit = bodyKit; BodyKit = bodyKit;
Tent = tent; Tent = tent;

2
DumpTruck/DumpTruck/Form1.Designer.cs generated
View File

@ -142,7 +142,7 @@
this.comboBoxStrategy.Name = "comboBoxStrategy"; this.comboBoxStrategy.Name = "comboBoxStrategy";
this.comboBoxStrategy.Size = new System.Drawing.Size(164, 23); this.comboBoxStrategy.Size = new System.Drawing.Size(164, 23);
this.comboBoxStrategy.TabIndex = 9; this.comboBoxStrategy.TabIndex = 9;
this.comboBoxStrategy.SelectedIndexChanged += new System.EventHandler(this.comboBoxStrategy_SelectedIndexChanged);
// //
// buttonStep // buttonStep
// //

13
DumpTruck/DumpTruck/Form1.cs
View File

@ -15,12 +15,6 @@ namespace DumpTruck
InitializeComponent(); InitializeComponent();
} }
private void button_Click(object sender, EventArgs e)
{
}
private void Draw() private void Draw()
{ {
if (_drawningCar == null) if (_drawningCar == null)
@ -69,7 +63,6 @@ namespace DumpTruck
_drawningCar.SetPosition(random.Next(10, 100), random.Next(10, _drawningCar.SetPosition(random.Next(10, 100), random.Next(10,
100)); 100));
Draw(); Draw();
} }
private void buttonDumpTruck_Click(object sender, EventArgs e) private void buttonDumpTruck_Click(object sender, EventArgs e)
@ -124,12 +117,6 @@ namespace DumpTruck
comboBoxStrategy.Enabled = true; comboBoxStrategy.Enabled = true;
_abstractStrategy = null; _abstractStrategy = null;
} }
}
private void comboBoxStrategy_SelectedIndexChanged(object sender, EventArgs e)
{
} }
} }
} }

22
DumpTruck/DumpTruck/MoveToBorder.cs
View File

@ -29,19 +29,29 @@ namespace DumpTruck.MovementStrategy
{ {
return; return;
} }
var diffX = FieldWidth - objParams.ObjectMiddleHorizontal; var diffX = objParams.RightBorder - FieldWidth;
if (Math.Abs(diffX) > GetStep()) if (Math.Abs(diffX) > GetStep())
{ {
if (diffX > 0)
{
MoveLeft();
}
else
{
MoveRight(); MoveRight();
}
} }
var diffY = FieldHeight - objParams.ObjectMiddleVertical; var diffY = objParams.DownBorder - FieldHeight;
if (Math.Abs(diffY) > GetStep()) if (Math.Abs(diffY) > GetStep())
{ {
if (diffY > 0)
{
MoveUp();
}
else
{
MoveDown(); MoveDown();
}
} }
} }