PIBD-13_Baryshev_D.A._LabWork01_Base #1

Closed
xysiboi wants to merge 2 commits from LabWork01 into main
Showing only changes of commit 665d472714 - Show all commits

View File

@ -34,11 +34,11 @@ internal class DrawningDumpTruck
/// <summary>
/// Ширина прорисовки автомобиля
/// </summary>
private readonly int _drawningTruckWidth = 60;
private readonly int _drawningTruckWidth = 135;
/// <summary>
/// Высота прорисовки автомобиля
/// </summary>
private readonly int _drawningTruckHeight = 110;
private readonly int _drawningTruckHeight = 85;
/// <summary>
/// Инициализация свойств
/// </summary>
@ -99,30 +99,27 @@ internal class DrawningDumpTruck
{
_startPosX = x;
_startPosY=y;
if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
{
return;
}
else
{
_startPosX = x;
_startPosY = y;
//if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
//{
// return;
//}
//else
//{
// _startPosX = x;
// _startPosY = y;
if (_startPosX < 0) _startPosX = 0;
if (_startPosY < 0) _startPosY = 0;
// if (_startPosX < 0) _startPosX = 0;
// if (_startPosY < 0) _startPosY = 0;
// if (_startPosX + _drawningTruckWidth > _pictureWidth.Value)
// {
// _startPosX = _pictureWidth.Value - _drawningTruckWidth;
// }
// if (_startPosY + _drawningTruckHeight > _pictureHeight.Value)
// {
// _startPosY = _pictureHeight.Value - _drawningTruckHeight;
// }
//}
if (_startPosX + _drawningTruckWidth > _pictureWidth.Value)
{
_startPosX = _pictureWidth.Value - _drawningTruckWidth;
}
if (_startPosY + _drawningTruckHeight > _pictureHeight.Value)
{
_startPosY = _pictureHeight.Value - _drawningTruckHeight;
}
}
}
public bool MoveTransport(DirectionType direction)