diff --git a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/DirectionType.cs b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/DirectionType.cs new file mode 100644 index 0000000..69dc67d --- /dev/null +++ b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/DirectionType.cs @@ -0,0 +1,23 @@ +namespace ProjectSelfPropelledArtilleryUnit; +/// +/// Направление перемещения +/// +public enum DirectionType +{ + /// + /// Вверх + /// + Up = 1, + /// + /// Вниз + /// + Down = 2, + /// + /// Влево + /// + Left = 3, + /// + /// Вправо + /// + Right = 4 +} diff --git a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/DrawingSelfPropelledArtilleryUnit.cs b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/DrawingSelfPropelledArtilleryUnit.cs new file mode 100644 index 0000000..94b3f69 --- /dev/null +++ b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/DrawingSelfPropelledArtilleryUnit.cs @@ -0,0 +1,251 @@ +using System.Diagnostics; + +namespace ProjectSelfPropelledArtilleryUnit; + +public class DrawingSelfPropelledArtilleryUnit +{ + /// + /// Класс-сущность + /// + public EntitySelfPropelledArtilleryUnit? EntitySelfPropelledArtilleryUnit { get; private set; } + /// + /// Ширина окна + /// + private int? _pictureWidth; + /// + /// Высота окна + /// + private int? _pictureHeight; + /// + /// Левая координата прорисовки САУ + /// + private int? _startPosX; + /// + /// Верхняя кооридната прорисовки САУ + /// + private int? _startPosY; + /// + /// Ширина прорисовки САУ + /// + private readonly int _drawingSelfPropelledArtilleryUnitWidth = 110; + /// + /// Высота прорисовки САУ + /// + private readonly int _drawingSelfPropelledArtilleryUnitHeight = 56; + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия пушки + /// Признак наличия зенитной батареи + /// Признак наличия люка + public void Init(int speed, double weight, Color bodyColor, Color + additionalColor, bool mainCannon, bool rocketLauncher, bool hatch) + { + EntitySelfPropelledArtilleryUnit = new EntitySelfPropelledArtilleryUnit(); + EntitySelfPropelledArtilleryUnit.Init(speed, weight, bodyColor, additionalColor, + mainCannon, rocketLauncher, hatch); + _pictureWidth = null; + _pictureHeight = null; + _startPosX = null; + _startPosY = null; + } + /// + /// Установка границ поля + /// + /// Ширина поля + /// Высота поля + /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерахWidth = 110; + public void SetPictureSize(int width, int height) + { + if (_drawingSelfPropelledArtilleryUnitHeight > height || _drawingSelfPropelledArtilleryUnitWidth > width) return; + _pictureWidth = width; + _pictureHeight = height; + } + /// + /// Установка позиции + /// + /// Координата X + /// Координата Y + public void SetPosition(int x, int y) + { + if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) return; + if (x < 0 || y < 0 || + x + _drawingSelfPropelledArtilleryUnitWidth > _pictureWidth || + y + _drawingSelfPropelledArtilleryUnitHeight > _pictureHeight) return; + _startPosX = x; + _startPosY = y; + } + /// + /// Изменение направления перемещения + /// + /// Направление + /// true - перемещене выполнено, false - перемещениеневозможно + public bool MoveTransport(DirectionType direction) + { + if (EntitySelfPropelledArtilleryUnit == null || !_startPosX.HasValue || + !_startPosY.HasValue) + { + return false; + } + switch (direction) + { + //влево + case DirectionType.Left: + if (_startPosX.Value - EntitySelfPropelledArtilleryUnit.Step > 0) + { + _startPosX -= (int)EntitySelfPropelledArtilleryUnit.Step; + } + return true; + //вверх + case DirectionType.Up: + if (_startPosY.Value - EntitySelfPropelledArtilleryUnit.Step > 3) + { + _startPosY -= (int)EntitySelfPropelledArtilleryUnit.Step; + } + return true; + // вправо + case DirectionType.Right: + if (_startPosX.Value + EntitySelfPropelledArtilleryUnit.Step + _drawingSelfPropelledArtilleryUnitWidth< _pictureWidth) + { + _startPosX += (int)EntitySelfPropelledArtilleryUnit.Step; + } + return true; + //вниз + case DirectionType.Down: + if (_startPosY.Value + EntitySelfPropelledArtilleryUnit.Step + _drawingSelfPropelledArtilleryUnitHeight < _pictureHeight) + { + _startPosY += (int)EntitySelfPropelledArtilleryUnit.Step; + } + return true; + default: + return false; + } + } + /// + /// Прорисовка объекта + /// + /// + public void DrawTransport(Graphics g) + { + if (EntitySelfPropelledArtilleryUnit == null || !_startPosX.HasValue || + !_startPosY.HasValue) + { + return; + } + Brush green = new SolidBrush(EntitySelfPropelledArtilleryUnit.BodyColor); + Brush black = new SolidBrush(Color.Black); + + Pen pen = new(Color.Black); + Brush additionalBrush = new + SolidBrush(EntitySelfPropelledArtilleryUnit.AdditionalColor); + if (EntitySelfPropelledArtilleryUnit.MainCannon) + { + int cannonWidth = 30; // Tiny rectangle width + int cannonHeight = 10; // Tiny rectangle height + g.FillRectangle(additionalBrush, _startPosX.Value, _startPosY.Value + 5, cannonWidth, cannonHeight); // Tiny rectangle on the left of the top element + g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 5, cannonWidth, cannonHeight); + + } + + //кузов + //Brush br = new SolidBrush(EntitySelfPropelledArtilleryUnit.BodyColor); + //g.FillRectangle(br, _startPosX.Value + 20, _startPosY.Value + 10, 60, 30); // Main body + //g.DrawRectangle(pen, _startPosX.Value + 20, _startPosY.Value + 10, 60, 30); + //g.FillRectangle(br, _startPosX.Value + 10, _startPosY.Value + 15, 80, 20); // Tracks + //g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 15, 80, 20); + //g.FillEllipse(br, _startPosX.Value + 15, _startPosY.Value + 10, 20, 20); // Front wheel + //g.FillEllipse(br, _startPosX.Value + 65, _startPosY.Value + 10, 20, 20); // Rear wheel + //g.DrawEllipse(pen, _startPosX.Value + 15, _startPosY.Value + 10, 20, 20); + //g.DrawEllipse(pen, _startPosX.Value + 65, _startPosY.Value + 10, 20, 20); + + // Top part: 1:2 rectangle in the middle + int topWidth = 40; + int topHeight = 20; + g.FillRectangle(green, _startPosX.Value + 30, _startPosY.Value, topWidth, topHeight); // Top rectangle + g.DrawRectangle(pen, _startPosX.Value + 30, _startPosY.Value, topWidth, topHeight); + + // Middle part: long, short rectangle below the top part + int middleWidth = 80; + int middleHeight = 10; + g.FillRectangle(green, _startPosX.Value + 10, _startPosY.Value + topHeight, middleWidth, middleHeight); // Middle rectangle + g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + topHeight, middleWidth, middleHeight); + + // Bottom part: long rectangle with half-circles at each end + int bottomWidth = 80; + int bottomHeight = 20; + int bottomY = _startPosY.Value + topHeight + middleHeight; + // Draw the long rectangle + g.DrawRectangle(pen, _startPosX.Value + 10, bottomY, bottomWidth, bottomHeight); + + // Draw half-circles at each end + int halfCircleDiameter = bottomHeight; + + g.DrawArc(pen, _startPosX.Value + 10 - halfCircleDiameter / 2, bottomY, halfCircleDiameter, halfCircleDiameter, 90, 180); + g.DrawArc(pen, _startPosX.Value + 10 + bottomWidth - halfCircleDiameter / 2, bottomY, halfCircleDiameter, halfCircleDiameter, 270, 180); + + // Draw two circles inside the bottom part (wheels) + int wheelDiameter = 20; + g.FillEllipse(green, _startPosX.Value, bottomY + (bottomHeight - wheelDiameter) / 2, wheelDiameter, wheelDiameter); // Left wheel + g.DrawEllipse(pen, _startPosX.Value, bottomY + (bottomHeight - wheelDiameter) / 2, wheelDiameter, wheelDiameter); + g.FillEllipse(green, _startPosX.Value + 80, bottomY + (bottomHeight - wheelDiameter) / 2, wheelDiameter, wheelDiameter); // Right wheel + g.DrawEllipse(pen, _startPosX.Value + 80, bottomY + (bottomHeight - wheelDiameter) / 2, wheelDiameter, wheelDiameter); + g.FillEllipse(green, _startPosX.Value + 25, bottomY + (bottomHeight - wheelDiameter) / 2, wheelDiameter, wheelDiameter); // Left wheel + g.DrawEllipse(pen, _startPosX.Value + 25, bottomY + (bottomHeight - wheelDiameter) / 2, wheelDiameter, wheelDiameter); + g.FillEllipse(green, _startPosX.Value + 55, bottomY + (bottomHeight - wheelDiameter) / 2, wheelDiameter, wheelDiameter); // Right wheel + g.DrawEllipse(pen, _startPosX.Value + 55, bottomY + (bottomHeight - wheelDiameter) / 2, wheelDiameter, wheelDiameter); + + if (EntitySelfPropelledArtilleryUnit.RocketLauncher) + { + // Define the dimensions of the rocket launcher + int rocketWidth = 30; // Long side + int rocketHeight = 10; // Short side + + // Define the center of rotation (closer to the right edge and just on top of the long rectangle) + int centerX = _startPosX.Value + 85; // Adjusted to move further to the right edge + int centerY = _startPosY.Value + 10; // Adjusted to move upwards, just on top of the long rectangle + + // Define the angle of rotation (70 degrees in radians) + double angle = 70 * Math.PI / 180; + + // Define the four corners of the rocket launcher rectangle before rotation + Point[] rocketLauncherPoints = new Point[] + { + new Point(-rocketWidth / 2, -rocketHeight / 2), // Top-left + new Point(rocketWidth / 2, -rocketHeight / 2), // Top-right + new Point(rocketWidth / 2, rocketHeight / 2), // Bottom-right + new Point(-rocketWidth / 2, rocketHeight / 2) // Bottom-left + }; + + // Rotate and translate the points + for (int i = 0; i < rocketLauncherPoints.Length; i++) + { + int x = rocketLauncherPoints[i].X; + int y = rocketLauncherPoints[i].Y; + + // Apply rotation + int rotatedX = (int)(x * Math.Cos(angle) - (int)(y * Math.Sin(angle))); + int rotatedY = (int)(x * Math.Sin(angle) + (int)(y * Math.Cos(angle))); + + // Translate to the correct position + rocketLauncherPoints[i] = new Point(rotatedX + centerX, rotatedY + centerY); + } + + // Draw the rotated rocket launcher + g.FillPolygon(additionalBrush, rocketLauncherPoints); + g.DrawPolygon(pen, rocketLauncherPoints); + } + + // крыло + if (EntitySelfPropelledArtilleryUnit.Hatch) + { + int hatchWidth = 20; + int hatchHeight = 5; + g.FillRectangle(additionalBrush, _startPosX.Value + 40, _startPosY.Value - hatchHeight, hatchWidth, hatchHeight); // Hatch positioned higher + g.DrawRectangle(pen, _startPosX.Value + 40, _startPosY.Value - hatchHeight, hatchWidth, hatchHeight); + } + } +} \ No newline at end of file diff --git a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/EntitySelfPropelledArtilleryUnit.cs b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/EntitySelfPropelledArtilleryUnit.cs new file mode 100644 index 0000000..aeee354 --- /dev/null +++ b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/EntitySelfPropelledArtilleryUnit.cs @@ -0,0 +1,66 @@ +namespace ProjectSelfPropelledArtilleryUnit; + +public class EntitySelfPropelledArtilleryUnit +{ + /// + /// Скорость + /// + public int Speed { get; private set; } + + /// + /// Вес + /// + public double Weight { get; private set; } + + /// + /// Основной цвет + /// + public Color BodyColor { get; private set; } + + /// + /// Дополнительный цвет (для опциональных элементов) + /// + public Color AdditionalColor { get; private set; } + + /// + /// Признак (опция) наличия основной пушки + /// + public bool MainCannon { get; private set; } + + /// + /// Признак (опция) наличия зенитной батареи + /// + public bool RocketLauncher { get; private set; } + + /// + /// Признак (опция) наличия обзорного люка + /// + public bool Hatch { get; private set; } + + /// + /// Шаг перемещения автомобиля + /// + public double Step => Speed * 100 / Weight; + + /// + /// Инициализация полей объекта-класса спортивного автомобиля + /// + /// Скорость + /// Вес автомобиля + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия обвеса + /// Признак наличия антикрыла + /// Признак наличия гоночной полосы + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool mainCannon, bool rocketLauncher, bool hatch) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + AdditionalColor = additionalColor; + MainCannon = mainCannon; + RocketLauncher = rocketLauncher; + Hatch = hatch; + + } +} diff --git a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Form1.Designer.cs b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Form1.Designer.cs deleted file mode 100644 index e4ca9ea..0000000 --- a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace ProjectSelfPropelledArtilleryUnit -{ - partial class Form1 - { - /// - /// 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.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "Form1"; - } - - #endregion - } -} diff --git a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Form1.cs b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Form1.cs deleted file mode 100644 index 37af3bc..0000000 --- a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace ProjectSelfPropelledArtilleryUnit -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} diff --git a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnit.Designer.cs b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnit.Designer.cs new file mode 100644 index 0000000..e5c4d78 --- /dev/null +++ b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnit.Designer.cs @@ -0,0 +1,134 @@ +namespace ProjectSelfPropelledArtilleryUnit +{ + partial class FormSelfPropelledArtilleryUnit + { + /// + /// 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() + { + pictureBoxSelfPropelledArtilleryUnit = new PictureBox(); + buttonCreate = new Button(); + buttonRight = new Button(); + buttonUp = new Button(); + buttonLeft = new Button(); + buttonDown = new Button(); + ((System.ComponentModel.ISupportInitialize)pictureBoxSelfPropelledArtilleryUnit).BeginInit(); + SuspendLayout(); + // + // pictureBoxSelfPropelledArtilleryUnit + // + pictureBoxSelfPropelledArtilleryUnit.Dock = DockStyle.Fill; + pictureBoxSelfPropelledArtilleryUnit.Location = new Point(0, 0); + pictureBoxSelfPropelledArtilleryUnit.Name = "pictureBoxSelfPropelledArtilleryUnit"; + pictureBoxSelfPropelledArtilleryUnit.Size = new Size(1414, 772); + pictureBoxSelfPropelledArtilleryUnit.TabIndex = 0; + pictureBoxSelfPropelledArtilleryUnit.TabStop = false; + // + // buttonCreate + // + buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreate.Location = new Point(12, 714); + buttonCreate.Name = "buttonCreate"; + buttonCreate.Size = new Size(150, 46); + buttonCreate.TabIndex = 1; + buttonCreate.Text = "Создать"; + buttonCreate.UseVisualStyleBackColor = true; + buttonCreate.Click += ButtonCreate_Click; + // + // buttonRight + // + buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonRight.BackgroundImage = Properties.Resources.arrowRight; + buttonRight.BackgroundImageLayout = ImageLayout.Stretch; + buttonRight.Location = new Point(1367, 725); + buttonRight.Name = "buttonRight"; + buttonRight.Size = new Size(35, 35); + buttonRight.TabIndex = 2; + buttonRight.UseVisualStyleBackColor = true; + buttonRight.Click += ButtonMove_Click; + // + // buttonUp + // + buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonUp.BackgroundImage = Properties.Resources.arrowUp; + buttonUp.BackgroundImageLayout = ImageLayout.Stretch; + buttonUp.Location = new Point(1326, 684); + buttonUp.Name = "buttonUp"; + buttonUp.Size = new Size(35, 35); + buttonUp.TabIndex = 3; + buttonUp.UseVisualStyleBackColor = true; + buttonUp.Click += ButtonMove_Click; + // + // buttonLeft + // + buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonLeft.BackgroundImage = Properties.Resources.arrowLeft; + buttonLeft.BackgroundImageLayout = ImageLayout.Stretch; + buttonLeft.Location = new Point(1285, 725); + buttonLeft.Name = "buttonLeft"; + buttonLeft.Size = new Size(35, 35); + buttonLeft.TabIndex = 4; + buttonLeft.UseVisualStyleBackColor = true; + buttonLeft.Click += ButtonMove_Click; + // + // buttonDown + // + buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonDown.BackgroundImage = Properties.Resources.arrowDown; + buttonDown.BackgroundImageLayout = ImageLayout.Stretch; + buttonDown.Location = new Point(1326, 725); + buttonDown.Name = "buttonDown"; + buttonDown.Size = new Size(35, 35); + buttonDown.TabIndex = 5; + buttonDown.UseVisualStyleBackColor = true; + buttonDown.Click += ButtonMove_Click; + // + // FormSelfPropelledArtilleryUnit + // + AutoScaleDimensions = new SizeF(13F, 32F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1414, 772); + Controls.Add(buttonDown); + Controls.Add(buttonLeft); + Controls.Add(buttonUp); + Controls.Add(buttonRight); + Controls.Add(buttonCreate); + Controls.Add(pictureBoxSelfPropelledArtilleryUnit); + Name = "FormSelfPropelledArtilleryUnit"; + Text = " Самоходная артиллерийская установка"; + ((System.ComponentModel.ISupportInitialize)pictureBoxSelfPropelledArtilleryUnit).EndInit(); + ResumeLayout(false); + } + + #endregion + + private PictureBox pictureBoxSelfPropelledArtilleryUnit; + private Button buttonCreate; + private Button buttonRight; + private Button buttonUp; + private Button buttonLeft; + private Button buttonDown; + } +} \ No newline at end of file diff --git a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnit.cs b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnit.cs new file mode 100644 index 0000000..328f818 --- /dev/null +++ b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnit.cs @@ -0,0 +1,67 @@ +namespace ProjectSelfPropelledArtilleryUnit; + +public partial class FormSelfPropelledArtilleryUnit : Form +{ + private DrawingSelfPropelledArtilleryUnit? _drawingSelfPropelledArtilleryUnit; + public FormSelfPropelledArtilleryUnit() + { + InitializeComponent(); + } + + private void Draw() + { + if (_drawingSelfPropelledArtilleryUnit == null) + { + return; + } + + Bitmap bmp = new(pictureBoxSelfPropelledArtilleryUnit.Width, pictureBoxSelfPropelledArtilleryUnit.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawingSelfPropelledArtilleryUnit.DrawTransport(gr); + pictureBoxSelfPropelledArtilleryUnit.Image = bmp; + } + + private void ButtonCreate_Click(object sender, EventArgs e) + { + + Random random = new(); + _drawingSelfPropelledArtilleryUnit = new DrawingSelfPropelledArtilleryUnit(); + _drawingSelfPropelledArtilleryUnit.Init(random.Next(100, 300), random.Next(1000, 3000), + 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)), + Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); + _drawingSelfPropelledArtilleryUnit.SetPictureSize(pictureBoxSelfPropelledArtilleryUnit.Width, pictureBoxSelfPropelledArtilleryUnit.Height); + _drawingSelfPropelledArtilleryUnit.SetPosition(random.Next(10, 100), random.Next(10, 100)); + Draw(); + } + private void ButtonMove_Click(object sender, EventArgs e) + { + if (_drawingSelfPropelledArtilleryUnit == null) + { + return; + } + + string name = ((Button)sender)?.Name ?? string.Empty; + bool result = false; + switch (name) + { + case "buttonUp": + result = _drawingSelfPropelledArtilleryUnit.MoveTransport(DirectionType.Up); + break; + case "buttonDown": + result = _drawingSelfPropelledArtilleryUnit.MoveTransport(DirectionType.Down); + break; + case "buttonLeft": + result = _drawingSelfPropelledArtilleryUnit.MoveTransport(DirectionType.Left); + break; + case "buttonRight": + result = _drawingSelfPropelledArtilleryUnit.MoveTransport(DirectionType.Right); + break; + } + + if (result) + { + Draw(); + } + } +} diff --git a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Form1.resx b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnit.resx similarity index 92% rename from ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Form1.resx rename to ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnit.resx index 1af7de1..8b2ff64 100644 --- a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Form1.resx +++ b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/FormSelfPropelledArtilleryUnit.resx @@ -1,17 +1,17 @@  - diff --git a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Program.cs b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Program.cs index c039a56..7f3db1f 100644 --- a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Program.cs +++ b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Program.cs @@ -11,7 +11,7 @@ namespace ProjectSelfPropelledArtilleryUnit // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new Form1()); + Application.Run(new FormSelfPropelledArtilleryUnit()); } } } \ No newline at end of file diff --git a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit.csproj b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit.csproj index 663fdb8..af03d74 100644 --- a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit.csproj +++ b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit.csproj @@ -8,4 +8,19 @@ enable + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + \ No newline at end of file diff --git a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Properties/Resources.Designer.cs b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Properties/Resources.Designer.cs new file mode 100644 index 0000000..d9f51e1 --- /dev/null +++ b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Properties/Resources.Designer.cs @@ -0,0 +1,103 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace ProjectSelfPropelledArtilleryUnit.Properties { + using System; + + + /// + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. + /// + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProjectSelfPropelledArtilleryUnit.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrowDown { + get { + object obj = ResourceManager.GetObject("arrowDown", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrowLeft { + get { + object obj = ResourceManager.GetObject("arrowLeft", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrowRight { + get { + object obj = ResourceManager.GetObject("arrowRight", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrowUp { + get { + object obj = ResourceManager.GetObject("arrowUp", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} diff --git a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Properties/Resources.resx b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Properties/Resources.resx new file mode 100644 index 0000000..293419e --- /dev/null +++ b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Properties/Resources.resx @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + ..\Resources\arrowDown.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrowLeft.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrowRight.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrowUp.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file diff --git a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Resources/arrowDown.jpg b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Resources/arrowDown.jpg new file mode 100644 index 0000000..f21002e Binary files /dev/null and b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Resources/arrowDown.jpg differ diff --git a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Resources/arrowLeft.jpg b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Resources/arrowLeft.jpg new file mode 100644 index 0000000..61b8dae Binary files /dev/null and b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Resources/arrowLeft.jpg differ diff --git a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Resources/arrowRight.jpg b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Resources/arrowRight.jpg new file mode 100644 index 0000000..b440197 Binary files /dev/null and b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Resources/arrowRight.jpg differ diff --git a/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Resources/arrowUp.jpg b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Resources/arrowUp.jpg new file mode 100644 index 0000000..e630cea Binary files /dev/null and b/ProjectSelfPropelledArtilleryUnit/ProjectSelfPropelledArtilleryUnit/Resources/arrowUp.jpg differ