diff --git a/ProjectStormtrooper/ProjectStormtrooper/DrawingStormTrooper.cs b/ProjectStormtrooper/ProjectStormtrooper/DrawingStormTrooper.cs
index 080b29d..8a3a2ad 100644
--- a/ProjectStormtrooper/ProjectStormtrooper/DrawingStormTrooper.cs
+++ b/ProjectStormtrooper/ProjectStormtrooper/DrawingStormTrooper.cs
@@ -57,6 +57,10 @@ namespace ProjectStormtrooper
int width, int height)
{
// TODO: продумать проверки
+ if (width < _stormtrooperWidth && height < _stormtrooperHeight)
+ {
+ return false;
+ }
_pictureWidth = width;
_pictureHeight = height;
EntityStormtrooper = new EntityStormtrooper();
@@ -71,7 +75,24 @@ namespace ProjectStormtrooper
public void SetPosition(int x, int y)
{
// TODO: изменение X и Y
+ if (x < 0)
+ {
+ x = 0;
+ }
+ else if (x > _pictureWidth - _stormtrooperWidth)
+ {
+ x = _pictureWidth - _stormtrooperWidth;
+ }
_startPosX = x;
+
+ if (y < 0)
+ {
+ y = 0;
+ }
+ else if (y > _pictureHeight - _stormtrooperHeight)
+ {
+ y = _pictureHeight - _stormtrooperHeight;
+ }
_startPosY = y;
}
///
@@ -88,7 +109,7 @@ namespace ProjectStormtrooper
{
// Вверх
case DirectionType.Up:
- if (_startPosY - EntityStormtrooper.Step > 0)
+ if (_startPosY - EntityStormtrooper.Step >= 0)
{
_startPosY -= (int)EntityStormtrooper.Step;
}
@@ -96,10 +117,14 @@ namespace ProjectStormtrooper
// Вниз
case DirectionType.Down:
// TODO: Продумать логику
+ if (_startPosY + _stormtrooperHeight + EntityStormtrooper.Step <= _pictureHeight)
+ {
+ _startPosY += (int)EntityStormtrooper.Step;
+ }
break;
// Влево
case DirectionType.Left:
- if (_startPosX - EntityStormtrooper.Step > 0)
+ if (_startPosX - EntityStormtrooper.Step >= 0)
{
_startPosX -= (int)EntityStormtrooper.Step;
}
@@ -107,6 +132,10 @@ namespace ProjectStormtrooper
// Вправо
case DirectionType.Right:
// TODO: Продумать логику
+ if (_startPosX + _stormtrooperWidth + EntityStormtrooper.Step <= _pictureWidth)
+ {
+ _startPosX += (int)EntityStormtrooper.Step;
+ }
break;
}
}
diff --git a/ProjectStormtrooper/ProjectStormtrooper/EntityStormtrooper.cs b/ProjectStormtrooper/ProjectStormtrooper/EntityStormtrooper.cs
index 735349b..3f963b2 100644
--- a/ProjectStormtrooper/ProjectStormtrooper/EntityStormtrooper.cs
+++ b/ProjectStormtrooper/ProjectStormtrooper/EntityStormtrooper.cs
@@ -36,7 +36,7 @@ namespace ProjectStormtrooper
///
/// Шаг перемещения
///
- public double Step => (double)Speed * 100 / Weight;
+ public double Step => (double)Speed * 500 / Weight;
///
/// Инициализация полей объекта-класса штурмовика
///
diff --git a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.Designer.cs b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.Designer.cs
index 3f4e1cb..9b11491 100644
--- a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.Designer.cs
+++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.Designer.cs
@@ -28,12 +28,110 @@
///
private void InitializeComponent()
{
- components = new System.ComponentModel.Container();
+ pictureBoxStormtrooper = new PictureBox();
+ buttonCreate = new Button();
+ buttonUp = new Button();
+ buttonDown = new Button();
+ buttonLeft = new Button();
+ buttonRight = new Button();
+ ((System.ComponentModel.ISupportInitialize)pictureBoxStormtrooper).BeginInit();
+ SuspendLayout();
+ //
+ // pictureBoxStormtrooper
+ //
+ pictureBoxStormtrooper.Dock = DockStyle.Fill;
+ pictureBoxStormtrooper.Location = new Point(0, 0);
+ pictureBoxStormtrooper.Name = "pictureBoxStormtrooper";
+ pictureBoxStormtrooper.Size = new Size(882, 453);
+ pictureBoxStormtrooper.SizeMode = PictureBoxSizeMode.AutoSize;
+ pictureBoxStormtrooper.TabIndex = 0;
+ pictureBoxStormtrooper.TabStop = false;
+ //
+ // buttonCreate
+ //
+ buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+ buttonCreate.Location = new Point(12, 412);
+ buttonCreate.Name = "buttonCreate";
+ buttonCreate.Size = new Size(94, 29);
+ buttonCreate.TabIndex = 1;
+ buttonCreate.Text = "Создать";
+ buttonCreate.UseVisualStyleBackColor = true;
+ buttonCreate.Click += buttonCreate_Click;
+ //
+ // buttonUp
+ //
+ buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonUp.BackgroundImage = Properties.Resources.arrowUP;
+ buttonUp.BackgroundImageLayout = ImageLayout.Zoom;
+ buttonUp.Location = new Point(804, 375);
+ buttonUp.Name = "buttonUp";
+ buttonUp.Size = new Size(30, 30);
+ buttonUp.TabIndex = 2;
+ buttonUp.UseVisualStyleBackColor = true;
+ buttonUp.Click += buttonMove_Click;
+ //
+ // buttonDown
+ //
+ buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonDown.BackgroundImage = Properties.Resources.arrowDOWN;
+ buttonDown.BackgroundImageLayout = ImageLayout.Zoom;
+ buttonDown.Location = new Point(804, 411);
+ buttonDown.Name = "buttonDown";
+ buttonDown.Size = new Size(30, 30);
+ buttonDown.TabIndex = 3;
+ buttonDown.UseVisualStyleBackColor = true;
+ buttonDown.Click += buttonMove_Click;
+ //
+ // buttonLeft
+ //
+ buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonLeft.BackgroundImage = Properties.Resources.arrowLEFT;
+ buttonLeft.BackgroundImageLayout = ImageLayout.Zoom;
+ buttonLeft.Location = new Point(768, 411);
+ buttonLeft.Name = "buttonLeft";
+ buttonLeft.Size = new Size(30, 30);
+ buttonLeft.TabIndex = 4;
+ buttonLeft.UseVisualStyleBackColor = true;
+ buttonLeft.Click += buttonMove_Click;
+ //
+ // buttonRight
+ //
+ buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonRight.BackgroundImage = Properties.Resources.arrowRIGHT;
+ buttonRight.BackgroundImageLayout = ImageLayout.Zoom;
+ buttonRight.Location = new Point(840, 411);
+ buttonRight.Name = "buttonRight";
+ buttonRight.Size = new Size(30, 30);
+ buttonRight.TabIndex = 5;
+ buttonRight.UseVisualStyleBackColor = true;
+ buttonRight.Click += buttonMove_Click;
+ //
+ // FormStormtrooper
+ //
+ AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(800, 450);
- Text = "Form1";
+ ClientSize = new Size(882, 453);
+ Controls.Add(buttonRight);
+ Controls.Add(buttonLeft);
+ Controls.Add(buttonDown);
+ Controls.Add(buttonUp);
+ Controls.Add(buttonCreate);
+ Controls.Add(pictureBoxStormtrooper);
+ Name = "FormStormtrooper";
+ StartPosition = FormStartPosition.CenterScreen;
+ Text = "Штурмовик";
+ ((System.ComponentModel.ISupportInitialize)pictureBoxStormtrooper).EndInit();
+ ResumeLayout(false);
+ PerformLayout();
}
#endregion
+
+ private PictureBox pictureBoxStormtrooper;
+ private Button buttonCreate;
+ private Button buttonUp;
+ private Button buttonDown;
+ private Button buttonLeft;
+ private Button buttonRight;
}
}
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.cs b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.cs
index 88ddd10..d8b7972 100644
--- a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.cs
+++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooper.cs
@@ -1,10 +1,85 @@
namespace ProjectStormtrooper
{
+ ///
+ /// ""
+ ///
public partial class FormStormtrooper : Form
{
+ ///
+ /// -
+ ///
+ private DrawingStormtrooper? _drawingStormtrooper;
+ ///
+ ///
+ ///
public FormStormtrooper()
{
InitializeComponent();
}
+ ///
+ ///
+ ///
+ private void Draw()
+ {
+ if (_drawingStormtrooper == null)
+ {
+ return;
+ }
+ Bitmap bmp = new(pictureBoxStormtrooper.Width, pictureBoxStormtrooper.Height);
+ Graphics g = Graphics.FromImage(bmp);
+ _drawingStormtrooper.DrawTransport(g);
+ pictureBoxStormtrooper.Image = bmp;
+ }
+ ///
+ /// ""
+ ///
+ ///
+ ///
+ private void buttonCreate_Click(object sender, EventArgs e)
+ {
+ Random random = new();
+ _drawingStormtrooper = new DrawingStormtrooper();
+ _drawingStormtrooper.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)),
+ pictureBoxStormtrooper.Width,
+ pictureBoxStormtrooper.Height
+ );
+ _drawingStormtrooper.SetPosition(random.Next(10, 100), random.Next(10, 100));
+ Draw();
+ }
+ ///
+ ///
+ ///
+ ///
+ ///
+ private void buttonMove_Click(object sender, EventArgs e)
+ {
+ if (_drawingStormtrooper == null)
+ {
+ return;
+ }
+ string buttonName = ((Button)sender)?.Name ?? string.Empty;
+ switch (buttonName)
+ {
+ case "buttonUp":
+ _drawingStormtrooper.MoveTransport(DirectionType.Up);
+ break;
+ case "buttonDown":
+ _drawingStormtrooper.MoveTransport(DirectionType.Down);
+ break;
+ case "buttonLeft":
+ _drawingStormtrooper.MoveTransport(DirectionType.Left);
+ break;
+ case "buttonRight":
+ _drawingStormtrooper.MoveTransport(DirectionType.Right);
+ break;
+ }
+ Draw();
+ }
}
}
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/ProjectStormtrooper.csproj b/ProjectStormtrooper/ProjectStormtrooper/ProjectStormtrooper.csproj
index b57c89e..13ee123 100644
--- a/ProjectStormtrooper/ProjectStormtrooper/ProjectStormtrooper.csproj
+++ b/ProjectStormtrooper/ProjectStormtrooper/ProjectStormtrooper.csproj
@@ -8,4 +8,19 @@
enable
+
+
+ True
+ True
+ Resources.resx
+
+
+
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Properties/Resources.Designer.cs b/ProjectStormtrooper/ProjectStormtrooper/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..945bb3d
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/Properties/Resources.Designer.cs
@@ -0,0 +1,103 @@
+//------------------------------------------------------------------------------
+//
+// Этот код создан программой.
+// Исполняемая версия:4.0.30319.42000
+//
+// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+// повторной генерации кода.
+//
+//------------------------------------------------------------------------------
+
+namespace ProjectStormtrooper.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("ProjectStormtrooper.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/ProjectStormtrooper/ProjectStormtrooper/Properties/Resources.resx b/ProjectStormtrooper/ProjectStormtrooper/Properties/Resources.resx
new file mode 100644
index 0000000..d5898a2
--- /dev/null
+++ b/ProjectStormtrooper/ProjectStormtrooper/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\arrowLEFT.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\arrowDOWN.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\arrowRIGHT.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\arrowUP.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
\ No newline at end of file
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowDOWN.png b/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowDOWN.png
new file mode 100644
index 0000000..7ef7c08
Binary files /dev/null and b/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowDOWN.png differ
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowLEFT.png b/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowLEFT.png
new file mode 100644
index 0000000..92ca017
Binary files /dev/null and b/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowLEFT.png differ
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowRIGHT.png b/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowRIGHT.png
new file mode 100644
index 0000000..563b1b9
Binary files /dev/null and b/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowRIGHT.png differ
diff --git a/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowUP.png b/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowUP.png
new file mode 100644
index 0000000..c5a432c
Binary files /dev/null and b/ProjectStormtrooper/ProjectStormtrooper/Resources/arrowUP.png differ