* Fixes a bug with the main loop. Removes unnecessary optimizations for RDRand. * WIP - Rewriting packets. * Cleanup and updates README * Converts more packets * Fixes header * Converts Effects packets. * Forgot the send command * Adds the start of containers packets. * Adds message packets with caching * Extends the send methods * Starts to add Acquire methods * Converted the packets * Cleanup * Cleanup * Adds more packets * Adds more packets * Fixes clearing arrays from pool. Adds Mobile Incoming * Converts more packets. * Moves more packets * Moves more packets * Test compression * Merges * Migrating to an idiomatic syntax that also supports compression, and proxying. * Optimize the stack alloc. Changes attributes * Converted container packets * Visual Studio doesn't auto save files. I am still getting used to subpar IDEs. * Adds static packet caching. Will profile later. Converts more packets * Fixes packets and changes how compression is configured * WIP - Adds basics for Gumps. Not finished though. * Fix file * Fixes formatting * Changed SpanWriter to be more idiomatic. * Fixes Span vs RawSpan and missing stackallocs * Converts over some more gumps * WIP - Deletes 32bit support. * Drops RDRand32 support. * Fixes gump compilation * Converting gump components * Removes old huffman compression function * Revert signature for backwards compatibility * WIP - Converting more gump components * Creates ArraySet for the strings. Updates AppendTo to reference that. * Converts the maining gump components * Cleans up gump components * Cleans up directives * Cleans up ArraySet and moves it. Adds null-coalescing-assignment * Cleanup, Target Packets, and C# 8 changes. * Removed OPL Packet * World packets * Fixing packet uses * Cleans up code. Fixes packet uses in various places. * More cleanup for packets * Code cleanup * Converts more packet uses and cleans up more code * More code cleanup * Finishes fixing the packets in Item * Updates secure trade packets * Updates core and gets it to compile. * Moved packets to scripts. Fixed account handler use of packets * Code cleanup * Updates chat packets * Code cleanuo * Adds party packets, but need to implement them. * Party packets WIP * Finishes party packets * Rearrange movement namespaces and classes * Finishes plant packets * Code Formatting * Fixes moving effects * Code cleanup, eliminates equipinfo * Adds more packets. Fixes bugs with various packets. * Finishes mahjon packets * Fixes mahjong packet * Code cleanup * Finishes mahjong packets * Adds Map packets * Add multifacet maps and charts * Cleans up some packets with UTF8 * Optimizes packets * Cleans up more packets. Moves the MessageHelper * Removes assistant support. Removes extended protocol. Incorporates MapUO packets as normal packets. * Updates protocol extensions packet receiver * Fixes a few bugs. Fixes a few more packets. * Code cleanup and fixing more packets * Fixes packet effects * Cleaned up more code * Buff Icon cleanup * Removed unused constructors * Code Cleanup. Adds BoatHS Packets * Moves house files. Updates house foundation packets. * Deployment cleanup * Fixes: * Code cleanup * More code cleanup * More code cleanup * Cleaned up BaseHouse * Enforces styling * Converts foreach to linq where possible. * Dont need that * Goals/Readme updates * Removes 32bit support at the highest level. Turns on HRT by default. * Code cleanup. Fixes extended features packet. * Fixes various bugs * Code cleanup * Code cleanup * Code cleanup. Fixes gump X/Y assignment. * Code cleanup using |= operator * More code cleanup * Cleanup * Fixes spacing issues. Thanks Visual Studio. You suck. * Compiler error * Fixes NPE from RunUO 2.7 * Renames ScriptCompiler to AssemblyHandler. Fixes packets. Updates README * Fixes more packets. Stupid trailing nulls. * Fixes various bugs. * Fixes for gumps * Fixes more gump stuff. Going to split it out later since it is getting insane * Recoded the gump writing * WIP * *Added output path of scripts project to dev branch *Activated debugging in code
381 lines
10 KiB
C#
381 lines
10 KiB
C#
/***************************************************************************
|
|
* Geometry.cs
|
|
* -------------------
|
|
* begin : May 1, 2002
|
|
* copyright : (C) The RunUO Software Team
|
|
* email : info@runuo.com
|
|
*
|
|
* $Id$
|
|
*
|
|
***************************************************************************/
|
|
|
|
/***************************************************************************
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
***************************************************************************/
|
|
|
|
using System;
|
|
|
|
namespace Server
|
|
{
|
|
[Parsable]
|
|
public struct Point2D : IPoint2D, IComparable<Point2D>
|
|
{
|
|
internal int m_X;
|
|
internal int m_Y;
|
|
|
|
public static readonly Point2D Zero = new Point2D(0, 0);
|
|
|
|
public Point2D(int x, int y)
|
|
{
|
|
m_X = x;
|
|
m_Y = y;
|
|
}
|
|
|
|
public Point2D(IPoint2D p) : this(p.X, p.Y)
|
|
{
|
|
}
|
|
|
|
[CommandProperty(AccessLevel.Counselor)]
|
|
public int X
|
|
{
|
|
get => m_X;
|
|
set => m_X = value;
|
|
}
|
|
|
|
[CommandProperty(AccessLevel.Counselor)]
|
|
public int Y
|
|
{
|
|
get => m_Y;
|
|
set => m_Y = value;
|
|
}
|
|
|
|
public override string ToString() => $"({m_X}, {m_Y})";
|
|
|
|
public static Point2D Parse(string value)
|
|
{
|
|
int start = value.IndexOf('(');
|
|
int end = value.IndexOf(',', start + 1);
|
|
|
|
string param1 = value.Substring(start + 1, end - (start + 1)).Trim();
|
|
|
|
start = end;
|
|
end = value.IndexOf(')', start + 1);
|
|
|
|
string param2 = value.Substring(start + 1, end - (start + 1)).Trim();
|
|
|
|
return new Point2D(Convert.ToInt32(param1), Convert.ToInt32(param2));
|
|
}
|
|
|
|
public int CompareTo(Point2D other)
|
|
{
|
|
int v = m_X.CompareTo(other.m_X);
|
|
|
|
if (v == 0)
|
|
v = m_Y.CompareTo(other.m_Y);
|
|
|
|
return v;
|
|
}
|
|
|
|
public override bool Equals(object o) => o is IPoint2D p && m_X == p.X && m_Y == p.Y;
|
|
|
|
public override int GetHashCode() => m_X ^ m_Y;
|
|
|
|
public static bool operator ==(Point2D l, Point2D r) => l.m_X == r.m_X && l.m_Y == r.m_Y;
|
|
|
|
public static bool operator !=(Point2D l, Point2D r) => l.m_X != r.m_X || l.m_Y != r.m_Y;
|
|
|
|
public static bool operator ==(Point2D l, IPoint2D r) => !ReferenceEquals(r, null) && l.m_X == r.X && l.m_Y == r.Y;
|
|
|
|
public static bool operator !=(Point2D l, IPoint2D r) => !ReferenceEquals(r, null) && (l.m_X != r.X || l.m_Y != r.Y);
|
|
|
|
public static bool operator >(Point2D l, Point2D r) => l.m_X > r.m_X && l.m_Y > r.m_Y;
|
|
|
|
public static bool operator >(Point2D l, Point3D r) => l.m_X > r.m_X && l.m_Y > r.m_Y;
|
|
|
|
public static bool operator >(Point2D l, IPoint2D r) => !ReferenceEquals(r, null) && l.m_X > r.X && l.m_Y > r.Y;
|
|
|
|
public static bool operator <(Point2D l, Point2D r) => l.m_X < r.m_X && l.m_Y < r.m_Y;
|
|
|
|
public static bool operator <(Point2D l, Point3D r) => l.m_X < r.m_X && l.m_Y < r.m_Y;
|
|
|
|
public static bool operator <(Point2D l, IPoint2D r) => !ReferenceEquals(r, null) && l.m_X < r.X && l.m_Y < r.Y;
|
|
|
|
public static bool operator >=(Point2D l, Point2D r) => l.m_X >= r.m_X && l.m_Y >= r.m_Y;
|
|
|
|
public static bool operator >=(Point2D l, Point3D r) => l.m_X >= r.m_X && l.m_Y >= r.m_Y;
|
|
|
|
public static bool operator >=(Point2D l, IPoint2D r) => !ReferenceEquals(r, null) && l.m_X >= r.X && l.m_Y >= r.Y;
|
|
|
|
public static bool operator <=(Point2D l, Point2D r) => l.m_X <= r.m_X && l.m_Y <= r.m_Y;
|
|
|
|
public static bool operator <=(Point2D l, Point3D r) => l.m_X <= r.m_X && l.m_Y <= r.m_Y;
|
|
|
|
public static bool operator <=(Point2D l, IPoint2D r) => !ReferenceEquals(r, null) && l.m_X <= r.X && l.m_Y <= r.Y;
|
|
}
|
|
|
|
[Parsable]
|
|
public struct Point3D : IPoint3D, IComparable<Point3D>
|
|
{
|
|
internal int m_X;
|
|
internal int m_Y;
|
|
internal int m_Z;
|
|
|
|
public static readonly Point3D Zero = new Point3D(0, 0, 0);
|
|
|
|
public Point3D(int x, int y, int z)
|
|
{
|
|
m_X = x;
|
|
m_Y = y;
|
|
m_Z = z;
|
|
}
|
|
|
|
public Point3D(IPoint3D p) : this(p.X, p.Y, p.Z)
|
|
{
|
|
}
|
|
|
|
public Point3D(IPoint2D p, int z) : this(p.X, p.Y, z)
|
|
{
|
|
}
|
|
|
|
[CommandProperty(AccessLevel.Counselor)]
|
|
public int X
|
|
{
|
|
get => m_X;
|
|
set => m_X = value;
|
|
}
|
|
|
|
[CommandProperty(AccessLevel.Counselor)]
|
|
public int Y
|
|
{
|
|
get => m_Y;
|
|
set => m_Y = value;
|
|
}
|
|
|
|
[CommandProperty(AccessLevel.Counselor)]
|
|
public int Z
|
|
{
|
|
get => m_Z;
|
|
set => m_Z = value;
|
|
}
|
|
|
|
public override string ToString() => $"({m_X}, {m_Y}, {m_Z})";
|
|
|
|
public override bool Equals(object o) => o is IPoint3D p && m_X == p.X && m_Y == p.Y && m_Z == p.Z;
|
|
|
|
public override int GetHashCode() => m_X ^ m_Y ^ m_Z;
|
|
|
|
public static Point3D Parse(string value)
|
|
{
|
|
int start = value.IndexOf('(');
|
|
int end = value.IndexOf(',', start + 1);
|
|
|
|
string param1 = value.Substring(start + 1, end - (start + 1)).Trim();
|
|
|
|
start = end;
|
|
end = value.IndexOf(',', start + 1);
|
|
|
|
string param2 = value.Substring(start + 1, end - (start + 1)).Trim();
|
|
|
|
start = end;
|
|
end = value.IndexOf(')', start + 1);
|
|
|
|
string param3 = value.Substring(start + 1, end - (start + 1)).Trim();
|
|
|
|
return new Point3D(Convert.ToInt32(param1), Convert.ToInt32(param2), Convert.ToInt32(param3));
|
|
}
|
|
|
|
public static bool operator ==(Point3D l, Point3D r) => l.m_X == r.m_X && l.m_Y == r.m_Y && l.m_Z == r.m_Z;
|
|
|
|
public static bool operator !=(Point3D l, Point3D r) => l.m_X != r.m_X || l.m_Y != r.m_Y || l.m_Z != r.m_Z;
|
|
|
|
public static bool operator ==(Point3D l, IPoint3D r) => !ReferenceEquals(r, null) && l.m_X == r.X && l.m_Y == r.Y && l.m_Z == r.Z;
|
|
|
|
public static bool operator !=(Point3D l, IPoint3D r) => !ReferenceEquals(r, null) && (l.m_X != r.X || l.m_Y != r.Y || l.m_Z != r.Z);
|
|
|
|
public int CompareTo(Point3D other)
|
|
{
|
|
int v = m_X.CompareTo(other.m_X);
|
|
|
|
if (v == 0)
|
|
{
|
|
v = m_Y.CompareTo(other.m_Y);
|
|
|
|
if (v == 0)
|
|
v = m_Z.CompareTo(other.m_Z);
|
|
}
|
|
|
|
return v;
|
|
}
|
|
}
|
|
|
|
[NoSort]
|
|
[Parsable]
|
|
[PropertyObject]
|
|
public struct Rectangle2D
|
|
{
|
|
private Point2D m_Start;
|
|
private Point2D m_End;
|
|
|
|
public Rectangle2D(IPoint2D start, IPoint2D end)
|
|
{
|
|
m_Start = new Point2D(start);
|
|
m_End = new Point2D(end);
|
|
}
|
|
|
|
public Rectangle2D(int x, int y, int width, int height)
|
|
{
|
|
m_Start = new Point2D(x, y);
|
|
m_End = new Point2D(x + width, y + height);
|
|
}
|
|
|
|
public void Set(int x, int y, int width, int height)
|
|
{
|
|
m_Start = new Point2D(x, y);
|
|
m_End = new Point2D(x + width, y + height);
|
|
}
|
|
|
|
public static Rectangle2D Parse(string value)
|
|
{
|
|
int start = value.IndexOf('(');
|
|
int end = value.IndexOf(',', start + 1);
|
|
|
|
string param1 = value.Substring(start + 1, end - (start + 1)).Trim();
|
|
|
|
start = end;
|
|
end = value.IndexOf(',', start + 1);
|
|
|
|
string param2 = value.Substring(start + 1, end - (start + 1)).Trim();
|
|
|
|
start = end;
|
|
end = value.IndexOf(',', start + 1);
|
|
|
|
string param3 = value.Substring(start + 1, end - (start + 1)).Trim();
|
|
|
|
start = end;
|
|
end = value.IndexOf(')', start + 1);
|
|
|
|
string param4 = value.Substring(start + 1, end - (start + 1)).Trim();
|
|
|
|
return new Rectangle2D(Convert.ToInt32(param1), Convert.ToInt32(param2), Convert.ToInt32(param3),
|
|
Convert.ToInt32(param4));
|
|
}
|
|
|
|
[CommandProperty(AccessLevel.Counselor)]
|
|
public Point2D Start
|
|
{
|
|
get => m_Start;
|
|
set => m_Start = value;
|
|
}
|
|
|
|
[CommandProperty(AccessLevel.Counselor)]
|
|
public Point2D End
|
|
{
|
|
get => m_End;
|
|
set => m_End = value;
|
|
}
|
|
|
|
[CommandProperty(AccessLevel.Counselor)]
|
|
public int X
|
|
{
|
|
get => m_Start.m_X;
|
|
set => m_Start.m_X = value;
|
|
}
|
|
|
|
[CommandProperty(AccessLevel.Counselor)]
|
|
public int Y
|
|
{
|
|
get => m_Start.m_Y;
|
|
set => m_Start.m_Y = value;
|
|
}
|
|
|
|
[CommandProperty(AccessLevel.Counselor)]
|
|
public int Width
|
|
{
|
|
get => m_End.m_X - m_Start.m_X;
|
|
set => m_End.m_X = m_Start.m_X + value;
|
|
}
|
|
|
|
[CommandProperty(AccessLevel.Counselor)]
|
|
public int Height
|
|
{
|
|
get => m_End.m_Y - m_Start.m_Y;
|
|
set => m_End.m_Y = m_Start.m_Y + value;
|
|
}
|
|
|
|
public void MakeHold(Rectangle2D r)
|
|
{
|
|
if (r.m_Start.m_X < m_Start.m_X)
|
|
m_Start.m_X = r.m_Start.m_X;
|
|
|
|
if (r.m_Start.m_Y < m_Start.m_Y)
|
|
m_Start.m_Y = r.m_Start.m_Y;
|
|
|
|
if (r.m_End.m_X > m_End.m_X)
|
|
m_End.m_X = r.m_End.m_X;
|
|
|
|
if (r.m_End.m_Y > m_End.m_Y)
|
|
m_End.m_Y = r.m_End.m_Y;
|
|
}
|
|
|
|
public bool Contains(Point3D p) => m_Start.m_X <= p.m_X && m_Start.m_Y <= p.m_Y && m_End.m_X > p.m_X && m_End.m_Y > p.m_Y;
|
|
|
|
public bool Contains(Point2D p) => m_Start.m_X <= p.m_X && m_Start.m_Y <= p.m_Y && m_End.m_X > p.m_X && m_End.m_Y > p.m_Y;
|
|
|
|
public bool Contains(IPoint2D p) => m_Start <= p && m_End > p;
|
|
|
|
public override string ToString() => $"({X}, {Y})+({Width}, {Height})";
|
|
}
|
|
|
|
[NoSort]
|
|
[PropertyObject]
|
|
public struct Rectangle3D
|
|
{
|
|
public Rectangle3D(Point3D start, Point3D end)
|
|
{
|
|
Start = start;
|
|
End = end;
|
|
}
|
|
|
|
public Rectangle3D(int x, int y, int z, int width, int height, int depth)
|
|
{
|
|
Start = new Point3D(x, y, z);
|
|
End = new Point3D(x + width, y + height, z + depth);
|
|
}
|
|
|
|
[CommandProperty(AccessLevel.Counselor)]
|
|
public Point3D Start{ get; set; }
|
|
|
|
[CommandProperty(AccessLevel.Counselor)]
|
|
public Point3D End{ get; set; }
|
|
|
|
[CommandProperty(AccessLevel.Counselor)]
|
|
public int Width => End.X - Start.X;
|
|
|
|
[CommandProperty(AccessLevel.Counselor)]
|
|
public int Height => End.Y - Start.Y;
|
|
|
|
[CommandProperty(AccessLevel.Counselor)]
|
|
public int Depth => End.Z - Start.Z;
|
|
|
|
public bool Contains(Point3D p) =>
|
|
p.m_X >= Start.m_X
|
|
&& p.m_X < End.m_X
|
|
&& p.m_Y >= Start.m_Y
|
|
&& p.m_Y < End.m_Y
|
|
&& p.m_Z >= Start.m_Z
|
|
&& p.m_Z < End.m_Z;
|
|
|
|
public bool Contains(IPoint3D p) =>
|
|
p.X >= Start.m_X
|
|
&& p.X < End.m_X
|
|
&& p.Y >= Start.m_Y
|
|
&& p.Y < End.m_Y
|
|
&& p.Z >= Start.m_Z
|
|
&& p.Z < End.m_Z;
|
|
}
|
|
}
|