Added paddings. Added rename to vars. Deleted unused constructor

This commit is contained in:
Absolutely disgusting
2026-03-07 22:43:08 +04:00
parent 2497ba16bc
commit 59ab0dd893
3 changed files with 72 additions and 53 deletions

View File

@@ -19,11 +19,9 @@ namespace _2DGAMELIB
protected double displayUnitScale;
protected double hitUnitScale;
private int DrawCals = 0;
protected Size WH = System.Drawing.Size.Empty;
protected Size WHH = System.Drawing.Size.Empty;
protected Size WHA = System.Drawing.Size.Empty;
protected Size displayOutputSize = System.Drawing.Size.Empty;
protected Size hitBufferSize = System.Drawing.Size.Empty;
protected Size displayBufferSize = System.Drawing.Size.Empty;
public Vector2D BasePoint = Dat.Vec2DZero;
public Vector2D Position = Dat.Vec2DZero;
@@ -34,7 +32,6 @@ namespace _2DGAMELIB
public double UnitScale => unitScale;
public double DisplayUnitScale => displayUnitScale;
public RenderArea() { }
public RenderArea(double Unit, double XRatio, double YRatio, double Size, double DisMag, double HitMag)
{
Setting(Unit, XRatio, YRatio, Size, DisMag, HitMag);
@@ -58,11 +55,11 @@ namespace _2DGAMELIB
base.Size = Size;
unitScale = Unit;
displayUnitScale = Unit * DisMag;
WH.Width = (int)(base.LocalWidth * Unit);
WH.Height = (int)(base.LocalHeight * Unit);
WHA.Width = (int)(base.LocalWidth * displayUnitScale);
WHA.Height = (int)(base.LocalHeight * displayUnitScale);
DisplayLayer = new Bitmap((int)((double)WH.Width * DisMag), (int)((double)WH.Height * DisMag));
displayOutputSize.Width = (int)(base.LocalWidth * Unit);
displayOutputSize.Height = (int)(base.LocalHeight * Unit);
displayBufferSize.Width = (int)(base.LocalWidth * displayUnitScale);
displayBufferSize.Height = (int)(base.LocalHeight * displayUnitScale);
DisplayLayer = new Bitmap((int)((double)displayOutputSize.Width * DisMag), (int)((double)displayOutputSize.Height * DisMag));
displayGraphics = Graphics.FromImage(DisplayLayer);
@@ -78,9 +75,9 @@ namespace _2DGAMELIB
Setting(Unit, XRatio, YRatio, Size, DisMag);
hitUnitScale = Unit * HitMag;
WHH.Width = (int)(base.LocalWidth * hitUnitScale);
WHH.Height = (int)(base.LocalHeight * hitUnitScale);
HitLayer = new Bitmap(WHH.Width, WHH.Height);
hitBufferSize.Width = (int)(base.LocalWidth * hitUnitScale);
hitBufferSize.Height = (int)(base.LocalHeight * hitUnitScale);
HitLayer = new Bitmap(hitBufferSize.Width, hitBufferSize.Height);
hitGraphics = Graphics.FromImage(HitLayer);
@@ -131,30 +128,30 @@ namespace _2DGAMELIB
int x = (int)(p.X * Are.displayUnitScale);
int y = (int)(p.Y * Are.displayUnitScale);
if (Are.DisplayLayer.Width == Are.WHA.Width && Are.DisplayLayer.Height == Are.WHA.Height)
if (Are.DisplayLayer.Width == Are.displayBufferSize.Width && Are.DisplayLayer.Height == Are.displayBufferSize.Height)
DisplayGraphics.DrawImageUnscaled(Are.DisplayLayer, x, y);
else
DisplayGraphics.DrawImage(Are.DisplayLayer, x, y, Are.WHA.Width, Are.WHA.Height);
DisplayGraphics.DrawImage(Are.DisplayLayer, x, y, Are.displayBufferSize.Width, Are.displayBufferSize.Height);
if (Are.hitGraphics != null && HitGraphics != null)
{
HitGraphics.DrawImage(Are.HitLayer, (int)(p.X * Are.hitUnitScale), (int)(p.Y * Are.hitUnitScale), Are.WHH.Width, Are.WHH.Height);
HitGraphics.DrawImage(Are.HitLayer, (int)(p.X * Are.hitUnitScale), (int)(p.Y * Are.hitUnitScale), Are.hitBufferSize.Width, Are.hitBufferSize.Height);
}
}
public void DrawTo(Graphics GD)
{
Vector2D p = GetPosition();
GD.DrawImage(DisplayLayer, (int)(p.X * unitScale), (int)(p.Y * unitScale), WH.Width, WH.Height);
GD.DrawImage(DisplayLayer, (int)(p.X * unitScale), (int)(p.Y * unitScale), displayOutputSize.Width, displayOutputSize.Height);
}
public void DrawTo(Graphics displayGraphics, Graphics hitGraphics)
{
Vector2D p = GetPosition();
displayGraphics.DrawImage(DisplayLayer, (int)(p.X * unitScale), (int)(p.Y * unitScale), WH.Width, WH.Height);
displayGraphics.DrawImage(DisplayLayer, (int)(p.X * unitScale), (int)(p.Y * unitScale), displayOutputSize.Width, displayOutputSize.Height);
if (this.hitGraphics != null)
{
hitGraphics.DrawImage(HitLayer, (int)(p.X * hitUnitScale), (int)(p.Y * hitUnitScale), WHH.Width, WHH.Height);
hitGraphics.DrawImage(HitLayer, (int)(p.X * hitUnitScale), (int)(p.Y * hitUnitScale), hitBufferSize.Width, hitBufferSize.Height);
}
}