YourDax/PIbd-23_Tikhonenkov_A.E_AntiAircraftGun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ПИбд-23 Тихоненков А.Е. Лабораторная №3 #10

Closed
YourDax wants to merge 8 commits from Lab3 into Lab2
pull from: Lab3
merge into: YourDax:Lab2
Conversation 0 Commits 8 Files Changed 10 +39 -56
6 changed files with 39 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4c46170f09 - Show all commits

12
AntiAirCraftGun/AntiAirCraftGun/DrawingObjects/AdvancedDrawingAntAirCraftGun.cs → AntiAirCraftGun/AntiAirCraftGun/DrawingObjects/AdvancedDrawingAntiAirCraftGun.cs
View File

@ -9,26 +9,26 @@ using static System.Windows.Forms.AxHost;
namespace AntiAircraftGun.DrawingObjects
{
public class AdvancedDrawingAntAirCraftGun : BaseDrawingAntiAirCraftGun
public class AdvancedDrawingAntiAirCraftGun : BaseDrawingAntiAirCraftGun
{
private Point[] points = new Point[4];
public AdvancedDrawingAntAirCraftGun(int speed, double weight, Color bodyColor, Color additionalColor, Color dopColor, bool rocket,bool radar, int width, int height) :
public AdvancedDrawingAntiAirCraftGun(int speed, double weight, Color bodyColor, Color additionalColor, Color dopColor, bool rocket,bool radar, int width, int height) :
base(speed, weight, bodyColor, additionalColor, width, height)
{
EntityAntiAirСraftGun = new EntityAdvancedAntiAircraftGun(speed, weight, bodyColor, additionalColor, dopColor, rocket,radar);
AntiAirСraftGun = new EntityAdvancedAntiAirCraftGun(speed, weight, bodyColor, additionalColor, dopColor, rocket,radar);
}
public override void DrawTransport(Graphics g)
{
if (EntityAntiAirСraftGun is not EntityAdvancedAntiAircraftGun advancedGun)
if (AntiAirСraftGun is not EntityAdvancedAntiAirCraftGun advancedGun)
{
return;
}
Pen pen = new Pen(Color.Black);
Brush bodyBrush = new SolidBrush(EntityAntiAirСraftGun.BodyColor);
Brush additionalBrush = new SolidBrush(EntityAntiAirСraftGun.AdditionalColor);
Brush bodyBrush = new SolidBrush(AntiAirСraftGun.BodyColor);
Brush additionalBrush = new SolidBrush(AntiAirСraftGun.AdditionalColor);
base.DrawTransport(g);
Brush dopBrush = new SolidBrush(advancedGun.DopColor);
Pen dopPen = new Pen(advancedGun.DopColor);

45
AntiAirCraftGun/AntiAirCraftGun/DrawingObjects/BaseDrawingAntiAirCraftGun.cs
View File

@ -10,7 +10,7 @@ namespace AntiAircraftGun.DrawingObjects
{
public class BaseDrawingAntiAirCraftGun
{
public EntityAntiAirCraftGun? EntityAntiAirСraftGun { get; protected set; }
public EntityAntiAirCraftGun? AntiAirСraftGun { get; protected set; }
private readonly int _pictureWidth;
private readonly int _pictureHeight;
protected int _startPosX;
@ -22,7 +22,7 @@ namespace AntiAircraftGun.DrawingObjects
{
_pictureWidth = width;
_pictureHeight = height;
EntityAntiAirСraftGun = new EntityAntiAirCraftGun(speed, weight, bodyColor, additionalColor);
AntiAirСraftGun = new EntityAntiAirCraftGun(speed, weight, bodyColor, additionalColor);
}
protected BaseDrawingAntiAirCraftGun(int speed, double weight, Color bodyColor, Color additionalColor, int width, int height, int carWidth, int carHeight)
@ -31,21 +31,20 @@ namespace AntiAircraftGun.DrawingObjects
_pictureHeight = height;
_zenitWidth = carWidth;
_zenitHeight = carHeight;
EntityAntiAirСraftGun = new EntityAntiAirCraftGun(speed, weight, bodyColor, additionalColor);
AntiAirСraftGun = new EntityAntiAirCraftGun(speed, weight, bodyColor, additionalColor);
}
public void SetPosition(int x, int y)
{
if (x < 0 || y < 0)
if (AntiAirСraftGun == null) return;
_startPosX = x;
_startPosY = y;
if (x < 0 || y < 0 || x + _zenitWidth >= _pictureWidth || y + _zenitHeight >= _pictureHeight)
{
_startPosX = 10;
_startPosY = 10;
}
else
{
_startPosX = x;
_startPosY = y;
_startPosX = 1;
_startPosY = 1;
}
}
/// <summary>
/// Координата X объекта
@ -71,20 +70,20 @@ namespace AntiAircraftGun.DrawingObjects
/// <returns>true - можно переместится по указанному направлению</returns>
public bool CanMove(DirectionType direction)
{
if (EntityAntiAirСraftGun == null)
if (AntiAirСraftGun == null)
{
return false;
}
return direction switch
{
//влево
DirectionType.Left => _startPosX - EntityAntiAirСraftGun.Step > 0,
DirectionType.Left => _startPosX - AntiAirСraftGun.Step > 0,
//вверх
DirectionType.Up => _startPosY - EntityAntiAirСraftGun.Step > 0,
DirectionType.Up => _startPosY - AntiAirСraftGun.Step > 0,
// вправо
DirectionType.Right =>_startPosX + EntityAntiAirСraftGun.Step < _pictureWidth - 110,
DirectionType.Right =>_startPosX + AntiAirСraftGun.Step < _pictureWidth - 110,
//вниз
DirectionType.Down => _startPosY + EntityAntiAirСraftGun.Step < _pictureHeight - 60,
DirectionType.Down => _startPosY + AntiAirСraftGun.Step < _pictureHeight - 60,
_ => false,
};
}
@ -94,7 +93,7 @@ namespace AntiAircraftGun.DrawingObjects
/// <param name="direction">Направление</param>
public void MoveTransport(DirectionType direction)
{
if (!CanMove(direction) || EntityAntiAirСraftGun == null)
if (!CanMove(direction) || AntiAirСraftGun == null)
{
return;
}
@ -102,19 +101,19 @@ namespace AntiAircraftGun.DrawingObjects
{
//влево
case DirectionType.Left:
_startPosX -= (int)EntityAntiAirСraftGun.Step;
_startPosX -= (int)AntiAirСraftGun.Step;
break;
//вверх
case DirectionType.Up:
_startPosY -= (int)EntityAntiAirСraftGun.Step;
_startPosY -= (int)AntiAirСraftGun.Step;
break;
// вправо
case DirectionType.Right:
_startPosX += (int)EntityAntiAirСraftGun.Step;
_startPosX += (int)AntiAirСraftGun.Step;
break;
//вниз
case DirectionType.Down:
_startPosY += (int)EntityAntiAirСraftGun.Step;
_startPosY += (int)AntiAirСraftGun.Step;
break;
}
}
@ -124,8 +123,8 @@ namespace AntiAircraftGun.DrawingObjects
Pen pen = Pens.Black;
Brush bodyBrush = new SolidBrush(EntityAntiAirСraftGun.BodyColor);
Brush additionalBrush = new SolidBrush(EntityAntiAirСraftGun.AdditionalColor);
Brush bodyBrush = new SolidBrush(AntiAirСraftGun.BodyColor);
Brush additionalBrush = new SolidBrush(AntiAirСraftGun.AdditionalColor);
g.FillEllipse(additionalBrush, _startPosX, _startPosY + 40, 110, 10);
g.DrawEllipse(pen, _startPosX, _startPosY + 40, 110, 10);

4
AntiAirCraftGun/AntiAirCraftGun/Enitites/EntityAdvancedAntiAircraftGun.cs
View File

@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace AntiAircraftGun.Enitites
{
public class EntityAdvancedAntiAircraftGun : EntityAntiAirCraftGun
public class EntityAdvancedAntiAirCraftGun : EntityAntiAirCraftGun
{
public Color DopColor { get; private set; }
@ -17,7 +17,7 @@ namespace AntiAircraftGun.Enitites
public EntityAdvancedAntiAircraftGun(int speed, double weight, Color bodyColor, Color additionalColor,Color dopColor, bool rocket, bool radar)
public EntityAdvancedAntiAirCraftGun(int speed, double weight, Color bodyColor, Color additionalColor,Color dopColor, bool rocket, bool radar)
: base(speed, weight, bodyColor, additionalColor)
{
DopColor = dopColor;

2
AntiAirCraftGun/AntiAirCraftGun/FormAntiAirCraftGun.cs
View File

@ -65,7 +65,7 @@ namespace AntiAircraftGun
bodyColor = dialog.Color;
if (dialog.ShowDialog() == DialogResult.OK)
dopColor = dialog.Color;
_drawing = new AdvancedDrawingAntAirCraftGun(
_drawing = new AdvancedDrawingAntiAirCraftGun(
random.Next(100, 300), // Ńęîđîńňü
random.Next(1000, 3000), // Âĺń
bodyColor, additionalColor, dopColor,

16
AntiAirCraftGun/AntiAirCraftGun/MovementStrategy/BorderDirection.cs
View File

@ -1,16 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AntiAircraftGun.MovementStrategy
{
public enum BorderDirection
{
Left,
Right,
Top,
Bottom
}
}

16
AntiAirCraftGun/AntiAirCraftGun/MovementStrategy/DrawingObjectAntiAirCraftGun.cs
View File

@ -9,28 +9,28 @@ namespace AntiAircraftGun.MovementStrategy
{
public class DrawingObjectAntiAirCraftGun : IMoveableObject
{
private readonly BaseDrawingAntiAirCraftGun? _drawningCar = null;
private readonly BaseDrawingAntiAirCraftGun? _drawningAntiAirCraftGun = null;
public DrawingObjectAntiAirCraftGun(BaseDrawingAntiAirCraftGun drawningCar)
{
_drawningCar = drawningCar;
_drawningAntiAirCraftGun = drawningCar;
}
public ObjectParameters? GetObjectPosition
{
get
{
if (_drawningCar == null || _drawningCar.EntityAntiAirСraftGun ==
if (_drawningAntiAirCraftGun == null || _drawningAntiAirCraftGun.AntiAirСraftGun ==
null)
{
return null;
}
return new ObjectParameters(_drawningCar.GetPosX,
_drawningCar.GetPosY, _drawningCar.GetWidth, _drawningCar.GetHeight);
return new ObjectParameters(_drawningAntiAirCraftGun.GetPosX,
_drawningAntiAirCraftGun.GetPosY, _drawningAntiAirCraftGun.GetWidth, _drawningAntiAirCraftGun.GetHeight);
}
}
public int GetStep => (int)(_drawningCar?.EntityAntiAirСraftGun?.Step ?? 0);
public int GetStep => (int)(_drawningAntiAirCraftGun?.AntiAirСraftGun?.Step ?? 0);
public bool CheckCanMove(DirectionType direction) =>
_drawningCar?.CanMove(direction) ?? false;
_drawningAntiAirCraftGun?.CanMove(direction) ?? false;
public void MoveObject(DirectionType direction) =>
_drawningCar?.MoveTransport(direction);
_drawningAntiAirCraftGun?.MoveTransport(direction);
}
}