diff --git a/GasolineTanker/GasolineTanker/AbstractMap.cs b/GasolineTanker/GasolineTanker/AbstractMap.cs new file mode 100644 index 0000000..a89cc45 --- /dev/null +++ b/GasolineTanker/GasolineTanker/AbstractMap.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GasolineTanker +{ + internal abstract class AbstractMap + { + private IDrawingObject _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, IDrawingObject drawningObject) + { + _width = width; + _height = height; + _drawningObject = drawningObject; + GenerateMap(); + while (!SetObjectOnMap()) + { + GenerateMap(); + } + return DrawMapWithObject(); + } + public Bitmap MoveObject(Direction direction) + { + // TODO проверка, что объект может переместится в требуемом направлении + if (true) + { + _drawningObject.MoveObject(direction); + } + return DrawMapWithObject(); + } + private bool SetObjectOnMap() + { + if (_drawningObject == null || _map == null) + { + return false; + } + int x = _random.Next(0, 10); + int y = _random.Next(0, 10); + _drawningObject.SetObject(x, y, _width, _height); + // TODO првоерка, что объект не "накладывается" на закрытые участки + 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 8fd3c1c..c76c46a 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/DrawingGasolineTanker.cs b/GasolineTanker/GasolineTanker/DrawingGasolineTanker.cs index 3a16ac1..1922061 100644 --- a/GasolineTanker/GasolineTanker/DrawingGasolineTanker.cs +++ b/GasolineTanker/GasolineTanker/DrawingGasolineTanker.cs @@ -127,5 +127,10 @@ namespace GasolineTanker _startPosY = _pictureHeight.Value - _gasolineTankerHeight; } } + + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return (_startPosX, _startPosY, _startPosX + _gasolineTankerWidth, _startPosY + _gasolineTankerHeight); + } } } diff --git a/GasolineTanker/GasolineTanker/DrawingObjectGasolineTanker.cs b/GasolineTanker/GasolineTanker/DrawingObjectGasolineTanker.cs new file mode 100644 index 0000000..c68eae8 --- /dev/null +++ b/GasolineTanker/GasolineTanker/DrawingObjectGasolineTanker.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 DrawingObjectGasolineTanker : IDrawingObject + { + private DrawingGasolineTanker _gasolineTanker = null; + + public DrawingObjectGasolineTanker(DrawingGasolineTanker gasolineTanker) + { + _gasolineTanker = gasolineTanker; + } + + public float Step => _gasolineTanker?.GasolineTanker?.Step ?? 0; + + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + { + return _gasolineTanker?.GetCurrentPosition() ?? default; + } + + public void MoveObject(Direction direction) + { + _gasolineTanker?.MoveTransport(direction); + } + + public void SetObject(int x, int y, int width, int height) + { + _gasolineTanker.SetPosition(x, y, width, height); + } + + void IDrawingObject.DrawningObject(Graphics g) + { + // TODO + } + } +} diff --git a/GasolineTanker/GasolineTanker/FormMap.Designer.cs b/GasolineTanker/GasolineTanker/FormMap.Designer.cs new file mode 100644 index 0000000..19516ef --- /dev/null +++ b/GasolineTanker/GasolineTanker/FormMap.Designer.cs @@ -0,0 +1,207 @@ +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.pictureBoxGasolineTanker = 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.toolStripStatusBodyColor = new System.Windows.Forms.ToolStripStatusLabel(); + this.buttonCreate = new System.Windows.Forms.Button(); + this.keyDown = new System.Windows.Forms.Button(); + this.keyUp = new System.Windows.Forms.Button(); + this.keyLeft = new System.Windows.Forms.Button(); + this.keyRight = new System.Windows.Forms.Button(); + this.ButtonCreateImproved = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxGasolineTanker)).BeginInit(); + this.statusStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBoxGasolineTanker + // + this.pictureBoxGasolineTanker.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxGasolineTanker.Location = new System.Drawing.Point(0, 0); + this.pictureBoxGasolineTanker.Name = "pictureBoxGasolineTanker"; + this.pictureBoxGasolineTanker.Size = new System.Drawing.Size(807, 428); + this.pictureBoxGasolineTanker.TabIndex = 0; + this.pictureBoxGasolineTanker.TabStop = false; + // + // statusStrip1 + // + this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusSpeed, + this.toolStripStatusWeight, + this.toolStripStatusBodyColor}); + this.statusStrip1.Location = new System.Drawing.Point(0, 428); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(807, 22); + this.statusStrip1.TabIndex = 1; + this.statusStrip1.Text = "statusStrip1"; + // + // toolStripStatusSpeed + // + this.toolStripStatusSpeed.Name = "toolStripStatusSpeed"; + this.toolStripStatusSpeed.Size = new System.Drawing.Size(39, 17); + this.toolStripStatusSpeed.Text = "Speed"; + // + // toolStripStatusWeight + // + this.toolStripStatusWeight.Name = "toolStripStatusWeight"; + this.toolStripStatusWeight.Size = new System.Drawing.Size(45, 17); + this.toolStripStatusWeight.Text = "Weight"; + // + // toolStripStatusBodyColor + // + this.toolStripStatusBodyColor.Name = "toolStripStatusBodyColor"; + this.toolStripStatusBodyColor.Size = new System.Drawing.Size(36, 17); + this.toolStripStatusBodyColor.Text = "Color"; + // + // buttonCreate + // + this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreate.Location = new System.Drawing.Point(12, 393); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(75, 23); + this.buttonCreate.TabIndex = 2; + this.buttonCreate.Text = "Create"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click_1); + // + // keyDown + // + this.keyDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.keyDown.BackgroundImage = global::GasolineTanker.Properties.Resources.KeyDown; + this.keyDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.keyDown.Location = new System.Drawing.Point(724, 386); + this.keyDown.Name = "keyDown"; + this.keyDown.Size = new System.Drawing.Size(30, 30); + this.keyDown.TabIndex = 3; + this.keyDown.UseVisualStyleBackColor = true; + this.keyDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // keyUp + // + this.keyUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.keyUp.BackgroundImage = global::GasolineTanker.Properties.Resources.KeyUp; + this.keyUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.keyUp.Location = new System.Drawing.Point(724, 350); + this.keyUp.Name = "keyUp"; + this.keyUp.Size = new System.Drawing.Size(30, 30); + this.keyUp.TabIndex = 4; + this.keyUp.UseVisualStyleBackColor = true; + this.keyUp.Click += new System.EventHandler(this.ButtonMove_Click); + // + // keyLeft + // + this.keyLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.keyLeft.BackgroundImage = global::GasolineTanker.Properties.Resources.KeyLeft; + this.keyLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.keyLeft.Location = new System.Drawing.Point(688, 386); + this.keyLeft.Name = "keyLeft"; + this.keyLeft.Size = new System.Drawing.Size(30, 30); + this.keyLeft.TabIndex = 5; + this.keyLeft.UseVisualStyleBackColor = true; + this.keyLeft.Click += new System.EventHandler(this.ButtonMove_Click); + // + // keyRight + // + this.keyRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.keyRight.BackgroundImage = global::GasolineTanker.Properties.Resources.KeyRight; + this.keyRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.keyRight.Location = new System.Drawing.Point(760, 386); + this.keyRight.Name = "keyRight"; + this.keyRight.Size = new System.Drawing.Size(30, 30); + this.keyRight.TabIndex = 6; + this.keyRight.UseVisualStyleBackColor = true; + this.keyRight.Click += new System.EventHandler(this.ButtonMove_Click); + // + // ButtonCreateImproved + // + this.ButtonCreateImproved.Location = new System.Drawing.Point(93, 393); + this.ButtonCreateImproved.Name = "ButtonCreateImproved"; + this.ButtonCreateImproved.Size = new System.Drawing.Size(75, 23); + this.ButtonCreateImproved.TabIndex = 7; + this.ButtonCreateImproved.Text = "Improved"; + this.ButtonCreateImproved.UseVisualStyleBackColor = true; + this.ButtonCreateImproved.Click += new System.EventHandler(this.ButtonCreateImproved_Click); + // + // comboBoxSelectorMap + // + this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxSelectorMap.FormattingEnabled = true; + this.comboBoxSelectorMap.Items.AddRange(new object[] { + "Simple map"}); + 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(807, 450); + this.Controls.Add(this.comboBoxSelectorMap); + this.Controls.Add(this.ButtonCreateImproved); + this.Controls.Add(this.keyRight); + this.Controls.Add(this.keyLeft); + this.Controls.Add(this.keyUp); + this.Controls.Add(this.keyDown); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.pictureBoxGasolineTanker); + this.Controls.Add(this.statusStrip1); + this.Name = "FormMap"; + this.Text = "Map"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxGasolineTanker)).EndInit(); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private PictureBox pictureBoxGasolineTanker; + private StatusStrip statusStrip1; + private ToolStripStatusLabel toolStripStatusSpeed; + private ToolStripStatusLabel toolStripStatusWeight; + private ToolStripStatusLabel toolStripStatusBodyColor; + private Button buttonCreate; + private Button keyDown; + private Button keyUp; + private Button keyLeft; + private Button keyRight; + private Button ButtonCreateImproved; + 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..37d5ac9 --- /dev/null +++ b/GasolineTanker/GasolineTanker/FormMap.cs @@ -0,0 +1,83 @@ +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(DrawingGasolineTanker gasolineTanker) + { + toolStripStatusSpeed.Text = $"Speed {gasolineTanker.GasolineTanker.Speed}"; + toolStripStatusWeight.Text = $"Weight {gasolineTanker.GasolineTanker.Weight}"; + toolStripStatusBodyColor.Text = $"Color {gasolineTanker.GasolineTanker.BodyColor.Name}"; + pictureBoxGasolineTanker.Image = _abstractMap.CreateMap(pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height, + new DrawingObjectGasolineTanker(gasolineTanker)); + } + + private void buttonCreate_Click_1(object sender, EventArgs e) + { + Random rnd = new(); + var gasolineTanker = new DrawingGasolineTanker(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + SetData(gasolineTanker); + } + + private void ButtonMove_Click(object sender, EventArgs e) + { + //получаем имя кнопки + string name = ((Button)sender)?.Name ?? string.Empty; + Direction dir = Direction.None; + switch (name) + { + case "keyUp": + dir = Direction.Up; + break; + case "keyDown": + dir = Direction.Down; + break; + case "keyLeft": + dir = Direction.Left; + break; + case "keyRight": + dir = Direction.Right; + break; + } + pictureBoxGasolineTanker.Image = _abstractMap?.MoveObject(dir); + } + + private void ButtonCreateImproved_Click(object sender, EventArgs e) + { + Random rnd = new(); + var gasolineTanker = new DrawingImprovedGasolineTanker(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))); + SetData(gasolineTanker); + } + + private void comboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorMap.Text) + { + case "Simple map": + _abstractMap = new SimpleMap(); + 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/IDrawingObject.cs b/GasolineTanker/GasolineTanker/IDrawingObject.cs new file mode 100644 index 0000000..43f1a65 --- /dev/null +++ b/GasolineTanker/GasolineTanker/IDrawingObject.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GasolineTanker +{ + internal interface IDrawingObject + { + public float Step { get; } + 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/Program.cs b/GasolineTanker/GasolineTanker/Program.cs index 1b6a3e0..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 FormGasolineTanker()); + 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..e3009aa --- /dev/null +++ b/GasolineTanker/GasolineTanker/SimpleMap.cs @@ -0,0 +1,47 @@ +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++; + } + } + } + } +}