fix: Cleans up Point checks and removes statics (#966)

- [X] Removes static freezing/unfreezing. Use other tools for this.
- [X] Cleans up IPoint3D allocations
- [X] Removes IPoint3D constructors since the compiler may not optimize the constructor path and allow allocations.


Note: Instead of `new Point3D(m)`, do something like `new Point3D(m.Location)`. Sorry for the inconvenience. In the long run this will prevent abuse of hot paths that will cause performance issues.
This commit is contained in:
Kamron Batman 2022-03-20 23:15:59 -07:00 committed by GitHub
parent 23532db603
commit 0925a2d435
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 184 additions and 958 deletions

View file

@ -47,7 +47,7 @@ namespace Server
m_Y = y;
}
public Point2D(IPoint2D p) : this(p.X, p.Y)
public Point2D(Point2D p) : this(p.X, p.Y)
{
}

View file

@ -14,6 +14,7 @@
*************************************************************************/
using System;
using System.Runtime.CompilerServices;
namespace Server
{
@ -49,11 +50,16 @@ namespace Server
set => m_Z = value;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public Point3D(IPoint3D p) : this(p.X, p.Y, p.Z)
{
}
public Point3D(IPoint2D p, int z) : this(p.X, p.Y, z)
public Point3D(Point3D p) : this(p.X, p.Y, p.Z)
{
}
public Point3D(Point2D p, int z) : this(p.X, p.Y, z)
{
}

View file

@ -4,6 +4,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Runtime.CompilerServices;
using Server.Items;
using Server.Logging;
using Server.Network;
@ -809,17 +810,22 @@ namespace Server
return surface;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Bound(int x, int y, out int newX, out int newY)
{
newX = Math.Clamp(x, 0, Width - 1);
newY = Math.Clamp(y, 0, Height - 1);
}
public Point2D Bound(Point3D p)
{
Bound(p.m_X, p.m_Y, out var x, out var y);
return new Point2D(x, y);
}
public Point2D Bound(Point2D p)
{
var x = Math.Clamp(p.m_X, 0, Width - 1);
var y = Math.Clamp(p.m_Y, 0, Height - 1);
Bound(p.m_X, p.m_Y, out var x, out var y);
return new Point2D(x, y);
}
@ -1086,7 +1092,7 @@ namespace Server
}
else if (o is IPoint3D d)
{
p = new Point3D(d);
p = new Point3D(d.X, d.Y, d.Z);
}
else
{

View file

@ -330,8 +330,8 @@ namespace Server
{
var rect = Area[i];
var start = Map.Bound(new Point2D(rect.Start));
var end = Map.Bound(new Point2D(rect.End));
var start = Map.Bound(new Point2D(rect.Start.X, rect.Start.Y));
var end = Map.Bound(new Point2D(rect.End.X, rect.Start.Y));
var startSector = Map.GetSector(start);
var endSector = Map.GetSector(end);