diff --git a/GasolineTanker/GasolineTanker/AbstractMap.cs b/GasolineTanker/GasolineTanker/AbstractMap.cs
new file mode 100644
index 0000000..7217b99
--- /dev/null
+++ b/GasolineTanker/GasolineTanker/AbstractMap.cs
@@ -0,0 +1,139 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+ internal abstract class AbstractMap
+ {
+ private IDrawningObject _drawningObject = null;
+ protected int[,] _map = null;
+ protected int _width;
+ protected int _height;
+ protected float _size_x;
+ protected float _size_y;
+ protected readonly Random _random = new();
+ protected readonly int _freeRoad = 0;
+ protected readonly int _barrier = 1;
+
+ public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject)
+ {
+ _width = width;
+ _height = height;
+ _drawningObject = drawningObject;
+ GenerateMap();
+ while (!SetObjectOnMap())
+ {
+ GenerateMap();
+ }
+ return DrawMapWithObject();
+ }
+ public Bitmap MoveObject(Direction direction)
+ {
+ (float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition();
+
+ for (int i = 0; i < _map.GetLength(0); i++)
+ {
+ for (int j = 0; j < _map.GetLength(1); j++)
+ {
+ if (_map[i, j] == _barrier)
+ {
+ switch (direction)
+ {
+ case Direction.Up:
+ if (_size_y * (j + 1) >= topY - _drawningObject.Step && _size_y * (j + 1) < topY && _size_x * (i + 1) > leftX
+ && _size_x * (i + 1) <= rightX)
+ {
+ return DrawMapWithObject();
+ }
+ break;
+ case Direction.Down:
+ if (_size_y * j <= bottomY + _drawningObject.Step && _size_y * j > bottomY && _size_x * (i + 1) > leftX
+ && _size_x * (i + 1) <= rightX)
+ {
+ return DrawMapWithObject();
+ }
+ break;
+ case Direction.Left:
+ if (_size_x * (i + 1) >= leftX - _drawningObject.Step && _size_x * (i + 1) < leftX && _size_y * (j + 1) < bottomY
+ && _size_y * (j + 1) >= topY)
+ {
+ return DrawMapWithObject();
+ }
+ break;
+ case Direction.Right:
+ if (_size_x * i <= rightX + _drawningObject.Step && _size_x * i > leftX && _size_y * (j + 1) < bottomY
+ && _size_y * (j + 1) >= topY)
+ {
+ return DrawMapWithObject();
+ }
+ break;
+ }
+ }
+ }
+ }
+ _drawningObject.MoveObject(direction);
+ return DrawMapWithObject();
+ }
+ private bool SetObjectOnMap()
+ {
+ (float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition();
+ if (_drawningObject == null || _map == null)
+ {
+ return false;
+ }
+
+ float airplaneWidth = rightX - leftX;
+ float airplaneHeight = bottomY - topY;
+
+ int x = _random.Next(0, 10);
+ int y = _random.Next(0, 10);
+ for (int i = 0; i < _map.GetLength(0); ++i)
+ {
+ for (int j = 0; j < _map.GetLength(1); ++j)
+ {
+ if (_map[i, j] == _barrier)
+ {
+ if (x + airplaneWidth >= _size_x * i && x <= _size_x * i && y + airplaneHeight > _size_y * j && y <= _size_y * j)
+ {
+ return false;
+ }
+ }
+ }
+ }
+ _drawningObject.SetObject(x, y, _width, _height);
+ return true;
+ }
+ private Bitmap DrawMapWithObject()
+ {
+ Bitmap bmp = new(_width, _height);
+ if (_drawningObject == null || _map == null)
+ {
+ return bmp;
+ }
+ Graphics gr = Graphics.FromImage(bmp);
+ for (int i = 0; i < _map.GetLength(0); ++i)
+ {
+ for (int j = 0; j < _map.GetLength(1); ++j)
+ {
+ if (_map[i, j] == _freeRoad)
+ {
+ DrawRoadPart(gr, i, j);
+ }
+ else if (_map[i, j] == _barrier)
+ {
+ DrawBarrierPart(gr, i, j);
+ }
+ }
+ }
+ _drawningObject.DrawningObject(gr);
+ return bmp;
+ }
+
+ protected abstract void GenerateMap();
+ protected abstract void DrawRoadPart(Graphics g, int i, int j);
+ protected abstract void DrawBarrierPart(Graphics g, int i, int j);
+ }
+}
diff --git a/GasolineTanker/GasolineTanker/Direction.cs b/GasolineTanker/GasolineTanker/Direction.cs
index 4fcd23d..672554c 100644
--- a/GasolineTanker/GasolineTanker/Direction.cs
+++ b/GasolineTanker/GasolineTanker/Direction.cs
@@ -8,6 +8,7 @@ namespace GasolineTanker
{
internal enum Direction
{
+ None = 0,
Up = 1,
Down = 2,
Left = 3,
diff --git a/GasolineTanker/GasolineTanker/DrawningGasolineTanker.cs b/GasolineTanker/GasolineTanker/DrawningGasolineTanker.cs
new file mode 100644
index 0000000..e20cf53
--- /dev/null
+++ b/GasolineTanker/GasolineTanker/DrawningGasolineTanker.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+ internal class DrawningGasolineTanker : DrawningTanker
+ {
+ ///
+ /// Инициализация свойств
+ ///
+ /// Скорость
+ /// Вес автомобиля
+ /// Цвет кузова
+ /// Дополнительный цвет
+ /// Признак наличия обвеса
+ /// Признак наличия антикрыла
+ /// Признак наличия гоночной полосы
+ public DrawningGasolineTanker(int speed, float weight, Color bodyColor, Color dopColor, bool Cabin, bool Signal, bool BenzoBack) :
+ base(speed, weight, bodyColor, 160, 125)
+ {
+ Tanker = new EntityGasolineTanker(speed, weight, bodyColor, dopColor, Cabin, Signal, BenzoBack);
+ }
+ public override void DrawTransport(Graphics g)
+ {
+ if (Tanker is not EntityGasolineTanker GasolineTanker)
+ {
+ return;
+ }
+
+ _startPosX += 10;
+ _startPosY += 5;
+ base.DrawTransport(g);
+ _startPosX -= 10;
+ _startPosY -= 5;
+
+ Pen pen = new(Color.Black);
+ Brush dopBrush = new SolidBrush(GasolineTanker.DopColor);
+ Brush WindowBrush = new SolidBrush(Color.LightBlue);
+
+ if (GasolineTanker.Cabin)
+ {
+ g.DrawRectangle(pen, _startPosX + 115, _startPosY + 29, 40, 25);
+ g.FillEllipse(dopBrush, _startPosX + 143, _startPosY + 35, 10, 10);
+ g.FillRectangle(WindowBrush, _startPosX + 116, _startPosY + 10, 39, 18);
+ }
+
+ //Бензобак
+ if (GasolineTanker.BenzoBack)
+ {
+ g.FillEllipse(dopBrush, _startPosX+10, _startPosY+5, 100, 50);
+ }
+ //Сигналка
+ if (GasolineTanker.Signal)
+ {
+ g.FillRectangle(dopBrush, _startPosX + 122, _startPosY - 1, 25, 6);
+ g.FillEllipse(dopBrush, _startPosX + 124, _startPosY - 16, 20, 20);
+ }
+ }
+ }
+}
diff --git a/GasolineTanker/GasolineTanker/DrawningObjectTanker.cs b/GasolineTanker/GasolineTanker/DrawningObjectTanker.cs
new file mode 100644
index 0000000..365ae33
--- /dev/null
+++ b/GasolineTanker/GasolineTanker/DrawningObjectTanker.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+ internal class DrawningObjectTanker : IDrawningObject
+ {
+ private DrawningTanker _Tanker = null;
+
+ public DrawningObjectTanker(DrawningTanker Tanker)
+ {
+ _Tanker = Tanker;
+ }
+
+ public float Step => _Tanker?.Tanker?.Step ?? 0;
+
+ public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+ {
+ return _Tanker?.GetCurrentPosition() ?? default;
+ }
+
+ public void MoveObject(Direction direction)
+ {
+ _Tanker?.MoveTransport(direction);
+ }
+
+ public void SetObject(int x, int y, int width, int height)
+ {
+ _Tanker.SetPosition(x, y, width, height);
+ }
+
+ void IDrawningObject.DrawningObject(Graphics g)
+ {
+ _Tanker.DrawTransport(g);
+ }
+ }
+}
diff --git a/GasolineTanker/GasolineTanker/DrawningTanker.cs b/GasolineTanker/GasolineTanker/DrawningTanker.cs
index 0641afc..69dc302 100644
--- a/GasolineTanker/GasolineTanker/DrawningTanker.cs
+++ b/GasolineTanker/GasolineTanker/DrawningTanker.cs
@@ -14,15 +14,15 @@ namespace GasolineTanker
///
/// Класс-сущность
///
- public EntityTanker Tanker { get; private set; }
+ public EntityTanker Tanker { get; protected set; }
///
/// Левая координата отрисовки танкера
///
- private float _startPosX;
+ protected float _startPosX;
///
/// Верхняя кооридната отрисовки танкер
///
- private float _startPosY;
+ protected float _startPosY;
///
/// Ширина окна отрисовки
///
@@ -45,10 +45,9 @@ namespace GasolineTanker
/// Скорость
/// Вес танкера
/// Цвет кузова
- public void Init(int speed, float weight, Color bodyColor)
+ public DrawningTanker(int speed, float weight, Color bodyColor)
{
- Tanker = new EntityTanker();
- Tanker.Init(speed, weight, bodyColor);
+ Tanker = new EntityTanker(speed, weight, bodyColor);
}
///
/// Установка позиции танкера
@@ -57,6 +56,20 @@ namespace GasolineTanker
/// Координата Y
/// Ширина картинки
/// Высота картинки
+
+ protected DrawningTanker(int speed, float weight, Color bodyColor, int carWidth, int carHeight) :
+ this(speed, weight, bodyColor)
+ {
+ _TankerWidth = carWidth;
+ _TankerHeight = carHeight;
+ }
+ ///
+ /// Установка позиции автомобиля
+ ///
+ /// Координата X
+ /// Координата Y
+ /// Ширина картинки
+ /// Высота картинки
public void SetPosition(int x, int y, int width, int height)
{
if (x + _TankerWidth <= width && y + _TankerHeight <= height && x >= 0 && y >= 0)
@@ -88,10 +101,6 @@ namespace GasolineTanker
break;
//влево
case Direction.Left:
- //if (_startPosX + _TankerWidth + Tanker.Step < _pictureWidth)
- //{
- // _startPosX -= Tanker.Step;
- // }
if (_startPosX - Tanker.Step > 0)
{
_startPosX -= Tanker.Step;
@@ -115,13 +124,11 @@ namespace GasolineTanker
}
}
-
-
///
/// Отрисовка танкера
///
///
- public void DrawTransport(Graphics g)
+ public virtual void DrawTransport(Graphics g)
{
if (_startPosX < 0 || _startPosY < 0
|| !_pictureHeight.HasValue || !_pictureWidth.HasValue)
@@ -134,22 +141,13 @@ namespace GasolineTanker
Brush br = new SolidBrush(Tanker?.BodyColor ?? Color.Gray);
g.FillRectangle(br, _startPosX + 100, _startPosY, 50, 60);
g.FillRectangle(br, _startPosX, _startPosY+50, 100, 10);
- //Цесцерна
- //g.FillEllipse(br, _startPosX, _startPosY, 100, 50);
-
- //стекла и двери
- //Brush brBlue = new SolidBrush(Color.LightBlue);
- //g.FillRectangle(brBlue, _startPosX + 105, _startPosY + 5, 40, 20);
- //g.FillEllipse(brBlue, _startPosX + 130, _startPosY + 30, 10, 10);
//Колёса
Brush brBlack = new SolidBrush(Color.Black);
g.FillEllipse(brBlack, _startPosX, _startPosY + 58, 40, 40);
g.FillEllipse(brBlack, _startPosX + 40, _startPosY + 58, 40, 40);
g.FillEllipse(brBlack, _startPosX + 110, _startPosY + 58, 40, 40);
- //Дверь
- //g.DrawRectangle(pen, _startPosX + 105, _startPosY + 25, 40, 25);
- //выделяем рамкой крышу
+
}
///
/// Смена границ формы отрисовки
@@ -177,7 +175,14 @@ namespace GasolineTanker
{
_startPosY = _pictureHeight.Value - _TankerHeight;
}
-
+ }
+ ///
+ /// Получение текущей позиции объекта
+ ///
+ ///
+ public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+ {
+ return (_startPosX, _startPosY, _startPosX + _TankerWidth, _startPosY + _TankerHeight);
}
}
}
diff --git a/GasolineTanker/GasolineTanker/EntityGasolineTanker.cs b/GasolineTanker/GasolineTanker/EntityGasolineTanker.cs
new file mode 100644
index 0000000..e7407c3
--- /dev/null
+++ b/GasolineTanker/GasolineTanker/EntityGasolineTanker.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+ internal class EntityGasolineTanker : EntityTanker
+ {
+ ///
+ /// Дополнительный цвет
+ ///
+ public Color DopColor { get; private set; }
+ ///
+ /// Признак наличия обвеса
+ ///
+ public bool Cabin { get; private set; }
+ ///
+ /// Признак наличия антикрыла
+ ///
+ public bool Signal { get; private set; }
+ ///
+ /// Признак наличия гоночной полосы
+ ///
+ public bool BenzoBack { get; private set; }
+ ///
+ /// Инициализация свойств
+ ///
+ /// Скорость
+ /// Вес автомобиля
+ /// Цвет кузова
+ /// Дополнительный цвет
+ /// Признак наличия обвеса
+ /// Признак наличия антикрыла
+ /// Признак наличия гоночной полосы
+ public EntityGasolineTanker(int speed, float weight, Color bodyColor, Color dopColor, bool сabin, bool signal, bool benzoBack) :
+ base(speed, weight, bodyColor)
+ {
+ DopColor = dopColor;
+ Cabin = сabin;
+ Signal = signal;
+ BenzoBack = benzoBack;
+ }
+ }
+}
diff --git a/GasolineTanker/GasolineTanker/EntityTanker.cs b/GasolineTanker/GasolineTanker/EntityTanker.cs
index e2be096..225ee24 100644
--- a/GasolineTanker/GasolineTanker/EntityTanker.cs
+++ b/GasolineTanker/GasolineTanker/EntityTanker.cs
@@ -31,7 +31,7 @@ namespace GasolineTanker
///
///
///
- public void Init(int speed, float weight, Color bodyColor)
+ public EntityTanker(int speed, float weight, Color bodyColor)
{
Random rnd = new Random();
Speed = speed <= 0 ? rnd.Next(50, 150) : speed;
diff --git a/GasolineTanker/GasolineTanker/FormLawn.cs b/GasolineTanker/GasolineTanker/FormLawn.cs
new file mode 100644
index 0000000..656f1c2
--- /dev/null
+++ b/GasolineTanker/GasolineTanker/FormLawn.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+ internal class FormLawn : AbstractMap
+ {
+ private readonly Brush tankColor = new SolidBrush(Color.Yellow);
+ private readonly Pen logoPen = new Pen(Color.DarkGreen, 5);
+ private readonly Brush roadColor = new SolidBrush(Color.Green);
+
+ protected override void DrawBarrierPart(Graphics g, int i, int j)
+ {
+ g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y);
+ g.FillEllipse(tankColor, i * _size_x, j * _size_y, _size_x, _size_y);
+ g.DrawEllipse(logoPen, i * _size_x, j * _size_y, _size_x, _size_y);
+ }
+ protected override void DrawRoadPart(Graphics g, int i, int j)
+ {
+ g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y);
+ }
+
+ protected override void GenerateMap()
+ {
+ _map = new int[39, 26];
+ _size_x = (float)_width / _map.GetLength(0);
+ _size_y = (float)_height / _map.GetLength(1);
+ int counter = 0;
+ for (int i = 0; i < _map.GetLength(0); ++i)
+ {
+ for (int j = 0; j < _map.GetLength(1); ++j)
+ {
+ _map[i, j] = _freeRoad;
+ }
+ }
+ while (counter < 20)
+ {
+ int x = _random.Next(0, 39);
+ int y = _random.Next(0, 26);
+ if (_map[x, y] == _freeRoad)
+ {
+ _map[x, y] = _barrier;
+ counter++;
+ }
+ }
+ }
+ }
+}
+
+
diff --git a/GasolineTanker/GasolineTanker/FormMap.Designer.cs b/GasolineTanker/GasolineTanker/FormMap.Designer.cs
new file mode 100644
index 0000000..bd1f0bd
--- /dev/null
+++ b/GasolineTanker/GasolineTanker/FormMap.Designer.cs
@@ -0,0 +1,209 @@
+namespace GasolineTanker
+{
+ partial class FormMap
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.pictureBoxTanker = new System.Windows.Forms.PictureBox();
+ this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+ this.toolStripStatusSpeed = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolStripStatusWeight = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
+ this.Create = new System.Windows.Forms.Button();
+ this.buttonUp = new System.Windows.Forms.Button();
+ this.buttonLeft = new System.Windows.Forms.Button();
+ this.buttonRight = new System.Windows.Forms.Button();
+ this.buttonDown = new System.Windows.Forms.Button();
+ this.buttonCreateModif = new System.Windows.Forms.Button();
+ this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTanker)).BeginInit();
+ this.statusStrip1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // pictureBoxTanker
+ //
+ this.pictureBoxTanker.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBoxTanker.Location = new System.Drawing.Point(0, 0);
+ this.pictureBoxTanker.Name = "pictureBoxTanker";
+ this.pictureBoxTanker.Size = new System.Drawing.Size(821, 429);
+ this.pictureBoxTanker.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+ this.pictureBoxTanker.TabIndex = 0;
+ this.pictureBoxTanker.TabStop = false;
+ //
+ // statusStrip1
+ //
+ this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripStatusSpeed,
+ this.toolStripStatusWeight,
+ this.toolStripStatusLabelBodyColor});
+ this.statusStrip1.Location = new System.Drawing.Point(0, 407);
+ this.statusStrip1.Name = "statusStrip1";
+ this.statusStrip1.Size = new System.Drawing.Size(821, 22);
+ this.statusStrip1.TabIndex = 1;
+ this.statusStrip1.Text = "statusStrip1";
+ //
+ // toolStripStatusSpeed
+ //
+ this.toolStripStatusSpeed.Name = "toolStripStatusSpeed";
+ this.toolStripStatusSpeed.Size = new System.Drawing.Size(59, 17);
+ this.toolStripStatusSpeed.Text = "Скорость";
+ //
+ // toolStripStatusWeight
+ //
+ this.toolStripStatusWeight.Name = "toolStripStatusWeight";
+ this.toolStripStatusWeight.Size = new System.Drawing.Size(26, 17);
+ this.toolStripStatusWeight.Text = "Вес";
+ //
+ // toolStripStatusLabelBodyColor
+ //
+ this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
+ this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(33, 17);
+ this.toolStripStatusLabelBodyColor.Text = "Цвет";
+ //
+ // Create
+ //
+ this.Create.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.Create.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.Create.Location = new System.Drawing.Point(12, 370);
+ this.Create.Name = "Create";
+ this.Create.Size = new System.Drawing.Size(75, 32);
+ this.Create.TabIndex = 2;
+ this.Create.Text = "Создать";
+ this.Create.UseVisualStyleBackColor = true;
+ this.Create.Click += new System.EventHandler(this.ButtonCreate_Click);
+ //
+ // buttonUp
+ //
+ this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonUp.BackgroundImage = global::GasolineTanker.Properties.Resources.arrowUp;
+ this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.buttonUp.Location = new System.Drawing.Point(738, 336);
+ this.buttonUp.Name = "buttonUp";
+ this.buttonUp.Size = new System.Drawing.Size(30, 30);
+ this.buttonUp.TabIndex = 3;
+ this.buttonUp.UseVisualStyleBackColor = true;
+ this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+ //
+ // buttonLeft
+ //
+ this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonLeft.BackgroundImage = global::GasolineTanker.Properties.Resources.arrowLeft;
+ this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.buttonLeft.Location = new System.Drawing.Point(702, 372);
+ this.buttonLeft.Name = "buttonLeft";
+ this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+ this.buttonLeft.TabIndex = 4;
+ this.buttonLeft.UseVisualStyleBackColor = true;
+ this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+ //
+ // buttonRight
+ //
+ this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonRight.BackgroundImage = global::GasolineTanker.Properties.Resources.arrowRight;
+ this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.buttonRight.Location = new System.Drawing.Point(774, 372);
+ this.buttonRight.Name = "buttonRight";
+ this.buttonRight.Size = new System.Drawing.Size(30, 30);
+ this.buttonRight.TabIndex = 5;
+ this.buttonRight.UseVisualStyleBackColor = true;
+ this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+ //
+ // buttonDown
+ //
+ this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonDown.BackgroundImage = global::GasolineTanker.Properties.Resources.arrowDown;
+ this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.buttonDown.Location = new System.Drawing.Point(738, 372);
+ this.buttonDown.Name = "buttonDown";
+ this.buttonDown.Size = new System.Drawing.Size(30, 30);
+ this.buttonDown.TabIndex = 6;
+ this.buttonDown.UseVisualStyleBackColor = true;
+ this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+ //
+ // buttonCreateModif
+ //
+ this.buttonCreateModif.Location = new System.Drawing.Point(93, 370);
+ this.buttonCreateModif.Name = "buttonCreateModif";
+ this.buttonCreateModif.Size = new System.Drawing.Size(97, 32);
+ this.buttonCreateModif.TabIndex = 7;
+ this.buttonCreateModif.Text = "Модификация";
+ this.buttonCreateModif.UseVisualStyleBackColor = true;
+ this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
+ //
+ // comboBoxSelectorMap
+ //
+ this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxSelectorMap.FormattingEnabled = true;
+ this.comboBoxSelectorMap.Items.AddRange(new object[] {
+ "Простая карта",
+ "Минное поле",
+ "Лужайка"});
+ this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12);
+ this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+ this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23);
+ this.comboBoxSelectorMap.TabIndex = 8;
+ this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.comboBoxSelectorMap_SelectedIndexChanged);
+ //
+ // FormMap
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(821, 429);
+ this.Controls.Add(this.comboBoxSelectorMap);
+ this.Controls.Add(this.buttonCreateModif);
+ this.Controls.Add(this.buttonDown);
+ this.Controls.Add(this.buttonRight);
+ this.Controls.Add(this.buttonLeft);
+ this.Controls.Add(this.buttonUp);
+ this.Controls.Add(this.Create);
+ this.Controls.Add(this.statusStrip1);
+ this.Controls.Add(this.pictureBoxTanker);
+ this.Name = "FormMap";
+ this.Text = "Карта";
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTanker)).EndInit();
+ this.statusStrip1.ResumeLayout(false);
+ this.statusStrip1.PerformLayout();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+ private PictureBox pictureBoxTanker;
+ private StatusStrip statusStrip1;
+ private ToolStripStatusLabel toolStripStatusSpeed;
+ private ToolStripStatusLabel toolStripStatusWeight;
+ private ToolStripStatusLabel toolStripStatusLabelBodyColor;
+ private Button Create;
+ private Button buttonUp;
+ private Button buttonLeft;
+ private Button buttonRight;
+ private Button buttonDown;
+ private Button buttonCreateModif;
+ private ComboBox comboBoxSelectorMap;
+ }
+}
\ No newline at end of file
diff --git a/GasolineTanker/GasolineTanker/FormMap.cs b/GasolineTanker/GasolineTanker/FormMap.cs
new file mode 100644
index 0000000..c48a556
--- /dev/null
+++ b/GasolineTanker/GasolineTanker/FormMap.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace GasolineTanker
+{
+ public partial class FormMap : Form
+ {
+ private AbstractMap _abstractMap;
+ public FormMap()
+ {
+ InitializeComponent();
+ _abstractMap = new SimpleMap();
+ }
+
+ ///
+ /// Метод установки данных
+ ///
+ private void SetData(DrawningTanker Tanker)
+ {
+ toolStripStatusSpeed.Text = $"Скорость: {Tanker.Tanker.Speed}";
+ toolStripStatusWeight.Text = $"Вес: {Tanker.Tanker.Weight}";
+ toolStripStatusLabelBodyColor.Text = $"Цвет: {Tanker.Tanker.BodyColor.Name}";
+ pictureBoxTanker.Image = _abstractMap.CreateMap(pictureBoxTanker.Width, pictureBoxTanker.Height,
+ new DrawningObjectTanker(Tanker));
+ }
+ ///
+ /// Обработка нажатия кнопки "Создать"
+ ///
+ ///
+ ///
+ ///
+ /// Обработка нажатия кнопки "Создать"
+ ///
+ ///
+ ///
+
+ private void ButtonCreate_Click(object sender, EventArgs e)
+ {
+ Random rnd = new();
+ var Tanker = new DrawningTanker(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+ SetData(Tanker);
+ }
+ ///
+ /// Изменение размеров формы
+ ///
+ ///
+ ///
+ private void ButtonMove_Click(object sender, EventArgs e)
+ {
+ //получаем имя кнопки
+ string name = ((Button)sender)?.Name ?? string.Empty;
+ Direction dir = Direction.None;
+ switch (name)
+ {
+ case "buttonUp":
+ dir = Direction.Up;
+ break;
+ case "buttonDown":
+ dir = Direction.Down;
+ break;
+ case "buttonLeft":
+ dir = Direction.Left;
+ break;
+ case "buttonRight":
+ dir = Direction.Right;
+ break;
+ }
+ pictureBoxTanker.Image = _abstractMap?.MoveObject(dir);
+ }
+ ///
+ /// Обработка нажатия кнопки "Модификация"
+ ///
+ ///
+ ///
+ private void buttonCreateModif_Click(object sender, EventArgs e)
+ {
+ Random rnd = new();
+ var Tanker = new DrawningGasolineTanker(rnd.Next(100, 300), rnd.Next(1000, 2000),
+ 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(Tanker);
+ }
+
+ private void comboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ switch (comboBoxSelectorMap.Text)
+ {
+ case "Простая карта":
+ _abstractMap = new SimpleMap();
+ break;
+ case "Минное поле":
+ _abstractMap = new MineField();
+ break;
+ case "Лужайка":
+ _abstractMap = new FormLawn();
+ break;
+ }
+ }
+ }
+}
diff --git a/GasolineTanker/GasolineTanker/FormMap.resx b/GasolineTanker/GasolineTanker/FormMap.resx
new file mode 100644
index 0000000..5cb320f
--- /dev/null
+++ b/GasolineTanker/GasolineTanker/FormMap.resx
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/GasolineTanker/GasolineTanker/FormTanker.Designer.cs b/GasolineTanker/GasolineTanker/FormTanker.Designer.cs
index 1da6faf..5a6bb12 100644
--- a/GasolineTanker/GasolineTanker/FormTanker.Designer.cs
+++ b/GasolineTanker/GasolineTanker/FormTanker.Designer.cs
@@ -38,6 +38,7 @@
this.buttonLeft = new System.Windows.Forms.Button();
this.buttonRight = new System.Windows.Forms.Button();
this.buttonDown = new System.Windows.Forms.Button();
+ this.buttonCreateModif = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxTanker)).BeginInit();
this.statusStrip1.SuspendLayout();
this.SuspendLayout();
@@ -143,11 +144,22 @@
this.buttonDown.UseVisualStyleBackColor = true;
this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
//
+ // buttonCreateModif
+ //
+ this.buttonCreateModif.Location = new System.Drawing.Point(93, 370);
+ this.buttonCreateModif.Name = "buttonCreateModif";
+ this.buttonCreateModif.Size = new System.Drawing.Size(97, 32);
+ this.buttonCreateModif.TabIndex = 7;
+ this.buttonCreateModif.Text = "Модификация";
+ this.buttonCreateModif.UseVisualStyleBackColor = true;
+ this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
+ //
// FormTanker
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(821, 429);
+ this.Controls.Add(this.buttonCreateModif);
this.Controls.Add(this.buttonDown);
this.Controls.Add(this.buttonRight);
this.Controls.Add(this.buttonLeft);
@@ -177,5 +189,6 @@
private Button buttonLeft;
private Button buttonRight;
private Button buttonDown;
+ private Button buttonCreateModif;
}
}
\ No newline at end of file
diff --git a/GasolineTanker/GasolineTanker/FormTanker.cs b/GasolineTanker/GasolineTanker/FormTanker.cs
index 4b0057c..fb0db6f 100644
--- a/GasolineTanker/GasolineTanker/FormTanker.cs
+++ b/GasolineTanker/GasolineTanker/FormTanker.cs
@@ -18,6 +18,17 @@ namespace GasolineTanker
pictureBoxTanker.Image = bmp;
}
///
+ ///
+ ///
+ private void SetData()
+ {
+ Random rnd = new();
+ _Tanker.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxTanker.Width, pictureBoxTanker.Height);
+ toolStripStatusSpeed.Text = $": {_Tanker.Tanker.Speed}";
+ toolStripStatusWeight.Text = $": {_Tanker.Tanker.Weight}";
+ toolStripStatusLabelBodyColor.Text = $": {_Tanker.Tanker.BodyColor.Name}";
+ }
+ ///
/// ""
///
///
@@ -26,12 +37,8 @@ namespace GasolineTanker
private void ButtonCreate_Click(object sender, EventArgs e)
{
Random rnd = new();
- _Tanker = new DrawningTanker();
- _Tanker.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
- _Tanker.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxTanker.Width, pictureBoxTanker.Height);
- toolStripStatusSpeed.Text = $": {_Tanker.Tanker.Speed}";
- toolStripStatusWeight.Text = $": {_Tanker.Tanker.Weight}";
- toolStripStatusLabelBodyColor.Text = $": {_Tanker.Tanker.BodyColor.Name}";
+ _Tanker = new DrawningTanker(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+ SetData();
Draw();
}
///
@@ -60,11 +67,30 @@ namespace GasolineTanker
}
Draw();
}
-
+ ///
+ ///
+ ///
+ ///
+ ///
private void pictureBoxTanker_Resize(object sender, EventArgs e)
{
_Tanker?.ChangeBorders(pictureBoxTanker.Width, pictureBoxTanker.Height);
Draw();
}
+ ///
+ /// ""
+ ///
+ ///
+ ///
+ private void buttonCreateModif_Click(object sender, EventArgs e)
+ {
+ Random rnd = new();
+ _Tanker = new DrawningGasolineTanker(rnd.Next(100, 300), rnd.Next(1000, 2000),
+ 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();
+ }
}
}
\ No newline at end of file
diff --git a/GasolineTanker/GasolineTanker/IDrawningObject.cs b/GasolineTanker/GasolineTanker/IDrawningObject.cs
new file mode 100644
index 0000000..e15cf61
--- /dev/null
+++ b/GasolineTanker/GasolineTanker/IDrawningObject.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+ internal interface IDrawningObject
+ {
+ ///
+ /// Шаг перемещения объекта
+ ///
+ public float Step { get; }
+ ///
+ /// Установка позиции объекта
+ ///
+ /// Координата X
+ /// Координата Y
+ /// Ширина полотна
+ /// Высота полотна
+ void SetObject(int x, int y, int width, int height);
+ ///
+ /// Изменение направления пермещения объекта
+ ///
+ /// Направление
+ ///
+ void MoveObject(Direction direction);
+ ///
+ /// Отрисовка объекта
+ ///
+ ///
+ void DrawningObject(Graphics g);
+ ///
+ /// Получение текущей позиции объекта
+ ///
+ ///
+ (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
+ }
+}
diff --git a/GasolineTanker/GasolineTanker/MineField.cs b/GasolineTanker/GasolineTanker/MineField.cs
new file mode 100644
index 0000000..3a9affb
--- /dev/null
+++ b/GasolineTanker/GasolineTanker/MineField.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+ internal class MineField : AbstractMap
+ {
+ private readonly Brush tankColor = new SolidBrush(Color.WhiteSmoke);
+ private readonly Pen logoPen = new Pen(Color.Yellow, 1);
+ private readonly Brush roadColor = new SolidBrush(Color.DarkGray);
+
+ protected override void DrawBarrierPart(Graphics g, int i, int j)
+ {
+ g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y);
+ g.FillEllipse(tankColor, i * _size_x, j * _size_y, _size_x, _size_y);
+ g.DrawEllipse(logoPen, i * _size_x, j * _size_y, _size_x, _size_y);
+ }
+ protected override void DrawRoadPart(Graphics g, int i, int j)
+ {
+ g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y);
+ }
+
+ protected override void GenerateMap()
+ {
+ _map = new int[39, 26];
+ _size_x = (float)_width / _map.GetLength(0);
+ _size_y = (float)_height / _map.GetLength(1);
+ int counter = 0;
+ for (int i = 0; i < _map.GetLength(0); ++i)
+ {
+ for (int j = 0; j < _map.GetLength(1); ++j)
+ {
+ _map[i, j] = _freeRoad;
+ }
+ }
+ while (counter < 20)
+ {
+ int x = _random.Next(0, 39);
+ int y = _random.Next(0, 26);
+ if (_map[x, y] == _freeRoad)
+ {
+ _map[x, y] = _barrier;
+ counter++;
+ }
+ }
+ }
+ }
+}
diff --git a/GasolineTanker/GasolineTanker/Program.cs b/GasolineTanker/GasolineTanker/Program.cs
index 55f22a4..b920f1e 100644
--- a/GasolineTanker/GasolineTanker/Program.cs
+++ b/GasolineTanker/GasolineTanker/Program.cs
@@ -11,7 +11,7 @@ namespace GasolineTanker
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
- Application.Run(new FormTanker());
+ Application.Run(new FormMap());
}
}
}
\ No newline at end of file
diff --git a/GasolineTanker/GasolineTanker/SimpleMap.cs b/GasolineTanker/GasolineTanker/SimpleMap.cs
new file mode 100644
index 0000000..7ec7eea
--- /dev/null
+++ b/GasolineTanker/GasolineTanker/SimpleMap.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+ internal class SimpleMap : AbstractMap
+ {
+ ///
+ /// Цвет участка закрытого
+ ///
+ private readonly Brush barrierColor = new SolidBrush(Color.Black);
+ ///
+ /// Цвет участка открытого
+ ///
+ 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));
+ }
+ 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));
+ }
+ protected override void GenerateMap()
+ {
+ _map = new int[100, 100];
+ _size_x = (float)_width / _map.GetLength(0);
+ _size_y = (float)_height / _map.GetLength(1);
+ int counter = 0;
+ for (int i = 0; i < _map.GetLength(0); ++i)
+ {
+ for (int j = 0; j < _map.GetLength(1); ++j)
+ {
+ _map[i, j] = _freeRoad;
+ }
+ }
+ while (counter < 50)
+ {
+ int x = _random.Next(0, 100);
+ int y = _random.Next(0, 100);
+ if (_map[x, y] == _freeRoad)
+ {
+ _map[x, y] = _barrier;
+ counter++;
+ }
+ }
+ }
+ }
+}