Make pTraceResult as pass arg
This commit is contained in:
SlynxCZ
parent
fde876b4e1
commit
fb519778e7
5 changed files with 140 additions and 293 deletions
|
|
@ -64,133 +64,53 @@ namespace RayTraceAPI
|
|||
MASK_NPC_MOVE = Solid | Window | NPCClip | PassBullets
|
||||
}
|
||||
|
||||
[StructLayout(LayoutKind.Sequential, Pack = 8)]
|
||||
[StructLayout(LayoutKind.Explicit, Size = 24)]
|
||||
public struct TraceOptions
|
||||
{
|
||||
public ulong InteractsAs;
|
||||
public ulong InteractsWith;
|
||||
public ulong InteractsExclude;
|
||||
public int DrawBeam;
|
||||
|
||||
private int _pad;
|
||||
[FieldOffset(0)] public ulong InteractsWith;
|
||||
[FieldOffset(8)] public ulong InteractsExclude;
|
||||
[FieldOffset(16)] public int DrawBeam;
|
||||
|
||||
public TraceOptions()
|
||||
{
|
||||
InteractsAs = 0;
|
||||
InteractsWith = (ulong)InteractionLayers.MASK_SHOT_PHYSICS;
|
||||
InteractsExclude = 0;
|
||||
DrawBeam = 0;
|
||||
}
|
||||
|
||||
public TraceOptions(InteractionLayers interactsAs, InteractionLayers interactsWith,
|
||||
InteractionLayers interactsExclude = 0, bool drawBeam = false)
|
||||
public TraceOptions(InteractionLayers interactsWith, InteractionLayers interactsExclude = 0, bool drawBeam = false)
|
||||
{
|
||||
InteractsAs = (ulong)interactsAs;
|
||||
InteractsWith = (ulong)interactsWith;
|
||||
InteractsExclude = (ulong)interactsExclude;
|
||||
DrawBeam = drawBeam ? 1 : 0;
|
||||
}
|
||||
}
|
||||
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
public unsafe struct TraceResult
|
||||
[StructLayout(LayoutKind.Explicit, Size = 44)]
|
||||
public struct TraceResult
|
||||
{
|
||||
public Vector3 StartPos;
|
||||
public Vector3 EndPos;
|
||||
public Vector3 HitPoint;
|
||||
public Vector3 Normal;
|
||||
[FieldOffset(0)] public float EndPosX;
|
||||
[FieldOffset(4)] public float EndPosY;
|
||||
[FieldOffset(8)] public float EndPosZ;
|
||||
[FieldOffset(16)] public nint HitEntity;
|
||||
[FieldOffset(24)] public float Fraction;
|
||||
[FieldOffset(28)] public int AllSolid;
|
||||
[FieldOffset(32)] public float NormalX;
|
||||
[FieldOffset(36)] public float NormalY;
|
||||
[FieldOffset(40)] public float NormalZ;
|
||||
|
||||
public float Fraction;
|
||||
public float HitOffset;
|
||||
|
||||
public int TriangleIndex;
|
||||
public short HitboxBoneIndex;
|
||||
private short _pad;
|
||||
|
||||
public int Contents;
|
||||
public int RayType;
|
||||
|
||||
public bool StartInSolid;
|
||||
public bool ExactHitPoint;
|
||||
|
||||
public nint HitEntity;
|
||||
public nint Hitbox;
|
||||
public nint Surface;
|
||||
public nint Body;
|
||||
public nint Shape;
|
||||
|
||||
public nint BodyTransform;
|
||||
public nint ShapeAttributes;
|
||||
|
||||
public readonly bool DidHit() => Fraction < 1.0f;
|
||||
public readonly bool IsAllSolid() => StartInSolid;
|
||||
public readonly bool HasExactHit() => ExactHitPoint;
|
||||
|
||||
public readonly int GetTriangleIndex() => TriangleIndex;
|
||||
public readonly int GetHitboxBoneIndex() => HitboxBoneIndex;
|
||||
public readonly int GetContents() => Contents;
|
||||
public readonly int GetRayType() => RayType;
|
||||
|
||||
public readonly Vector3 GetStartPos() => StartPos;
|
||||
public readonly Vector3 GetEndPos() => EndPos;
|
||||
public readonly Vector3 GetHitPoint() => HitPoint;
|
||||
public readonly Vector3 GetNormal() => Normal;
|
||||
|
||||
public readonly float GetFraction() => Fraction;
|
||||
public readonly float GetHitOffset() => HitOffset;
|
||||
|
||||
public readonly T* GetPtr<T>(nint ptr) where T : unmanaged
|
||||
{
|
||||
return (T*)ptr;
|
||||
}
|
||||
|
||||
public readonly ref T GetRef<T>(nint ptr) where T : unmanaged
|
||||
{
|
||||
if (ptr == 0)
|
||||
throw new NullReferenceException();
|
||||
|
||||
return ref *(T*)ptr;
|
||||
}
|
||||
|
||||
public readonly bool TryGetRef<T>(nint ptr, out T* value) where T : unmanaged
|
||||
{
|
||||
if (ptr == 0)
|
||||
{
|
||||
value = null;
|
||||
return false;
|
||||
}
|
||||
|
||||
value = (T*)ptr;
|
||||
return true;
|
||||
}
|
||||
|
||||
public readonly CEntityInstance HitEntityPtr() => new(HitEntity);
|
||||
|
||||
public readonly CTransform BodyTransformPtr() => new(BodyTransform);
|
||||
}
|
||||
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
public struct VectorNative
|
||||
{
|
||||
public float X;
|
||||
public float Y;
|
||||
public float Z;
|
||||
}
|
||||
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
public struct QAngleNative
|
||||
{
|
||||
public float X;
|
||||
public float Y;
|
||||
public float Z;
|
||||
public Vector3 EndPos => new(EndPosX, EndPosY, EndPosZ);
|
||||
public Vector3 Normal => new(NormalX, NormalY, NormalZ);
|
||||
public bool DidHit => Fraction < 1.0f;
|
||||
public bool IsAllSolid => AllSolid != 0;
|
||||
}
|
||||
#endregion
|
||||
|
||||
public interface CRayTraceInterface
|
||||
{
|
||||
public TraceResult TraceShape(Vector start, QAngle angles, CEntityInstance ignore, TraceOptions options);
|
||||
public TraceResult TraceEndShape(Vector start, Vector end, CEntityInstance ignore, TraceOptions options);
|
||||
public TraceResult TraceHullShape(Vector start, Vector end, Vector mins, Vector maxs, CEntityInstance ignore, TraceOptions options);
|
||||
public TraceResult TraceShapeEx(Vector start, Vector end, nint filter, nint ray);
|
||||
public bool TraceShape(Vector start, QAngle angles, CEntityInstance? ignore, TraceOptions options, out TraceResult result);
|
||||
public bool TraceEndShape(Vector start, Vector end, CEntityInstance? ignore, TraceOptions options, out TraceResult result);
|
||||
public bool TraceHullShape(Vector start, Vector end, Vector mins, Vector maxs, CEntityInstance? ignore, TraceOptions options, out TraceResult result);
|
||||
public bool TraceShapeEx(Vector start, Vector end, nint filter, nint ray, out TraceResult result);
|
||||
}
|
||||
}
|
||||
|
|
@ -60,90 +60,100 @@ public class RayTraceImpl : BasePlugin
|
|||
|
||||
public class CRayTrace : CRayTraceInterface
|
||||
{
|
||||
public TraceResult TraceShape(Vector start, QAngle angles, CEntityInstance ignore, TraceOptions options)
|
||||
public bool TraceShape(Vector start, QAngle angles, CEntityInstance? ignore, TraceOptions options, out TraceResult result)
|
||||
{
|
||||
unsafe
|
||||
{
|
||||
result = default;
|
||||
|
||||
if (!NativeBridge.Loaded)
|
||||
return default;
|
||||
return false;
|
||||
|
||||
VectorNative startNative = new() { X = start.X, Y = start.Y, Z = start.Z };
|
||||
QAngleNative angNative = new() { X = angles.X, Y = angles.Y, Z = angles.Z };
|
||||
TraceOptions optCopy = options;
|
||||
TraceResult resultBuffer = default;
|
||||
TraceOptions optionsBuffer = options;
|
||||
|
||||
return NativeBridge.TraceShape!(
|
||||
NativeBridge.Handle,
|
||||
(nint)(&startNative),
|
||||
(nint)(&angNative),
|
||||
ignore.Handle,
|
||||
(nint)(&optCopy)
|
||||
);
|
||||
bool success = NativeBridge.TraceShape!(NativeBridge.Handle,
|
||||
start.Handle,
|
||||
angles.Handle,
|
||||
ignore?.Handle ?? nint.Zero,
|
||||
(nint)(&optionsBuffer),
|
||||
(nint)(&resultBuffer));
|
||||
|
||||
result = resultBuffer;
|
||||
return success;
|
||||
}
|
||||
}
|
||||
|
||||
public TraceResult TraceEndShape(Vector start, Vector end, CEntityInstance ignore, TraceOptions options)
|
||||
public bool TraceEndShape(Vector start, Vector end, CEntityInstance? ignore, TraceOptions options, out TraceResult result)
|
||||
{
|
||||
unsafe
|
||||
{
|
||||
result = default;
|
||||
|
||||
if (!NativeBridge.Loaded)
|
||||
return default;
|
||||
return false;
|
||||
|
||||
VectorNative s = new() { X = start.X, Y = start.Y, Z = start.Z };
|
||||
VectorNative e = new() { X = end.X, Y = end.Y, Z = end.Z };
|
||||
TraceOptions opt = options;
|
||||
TraceResult resultBuffer = default;
|
||||
TraceOptions optionsBuffer = options;
|
||||
|
||||
return NativeBridge.TraceEndShape!(
|
||||
NativeBridge.Handle,
|
||||
(nint)(&s),
|
||||
(nint)(&e),
|
||||
ignore.Handle,
|
||||
(nint)(&opt)
|
||||
);
|
||||
bool success = NativeBridge.TraceEndShape!(NativeBridge.Handle,
|
||||
start.Handle,
|
||||
end.Handle,
|
||||
ignore?.Handle ?? nint.Zero,
|
||||
(nint)(&optionsBuffer),
|
||||
(nint)(&resultBuffer));
|
||||
|
||||
result = resultBuffer;
|
||||
return success;
|
||||
}
|
||||
}
|
||||
|
||||
public TraceResult TraceHullShape(Vector start, Vector end, Vector mins, Vector maxs, CEntityInstance ignore, TraceOptions options)
|
||||
public bool TraceHullShape(Vector start, Vector end, Vector mins, Vector maxs, CEntityInstance? ignore, TraceOptions options, out TraceResult result)
|
||||
{
|
||||
unsafe
|
||||
{
|
||||
result = default;
|
||||
|
||||
if (!NativeBridge.Loaded)
|
||||
return default;
|
||||
return false;
|
||||
|
||||
VectorNative s = new() { X = start.X, Y = start.Y, Z = start.Z };
|
||||
VectorNative e = new() { X = end.X, Y = end.Y, Z = end.Z };
|
||||
VectorNative mi = new() { X = mins.X, Y = mins.Y, Z = mins.Z };
|
||||
VectorNative ma = new() { X = maxs.X, Y = maxs.Y, Z = maxs.Z };
|
||||
TraceOptions opt = options;
|
||||
TraceResult resultBuffer = default;
|
||||
TraceOptions optionsBuffer = options;
|
||||
|
||||
return NativeBridge.TraceHullShape!(
|
||||
NativeBridge.Handle,
|
||||
(nint)(&s),
|
||||
(nint)(&e),
|
||||
(nint)(&mi),
|
||||
(nint)(&ma),
|
||||
ignore.Handle,
|
||||
(nint)(&opt)
|
||||
);
|
||||
bool success = NativeBridge.TraceHullShape!(NativeBridge.Handle,
|
||||
start.Handle,
|
||||
end.Handle,
|
||||
mins.Handle,
|
||||
maxs.Handle,
|
||||
ignore?.Handle ?? nint.Zero,
|
||||
(nint)(&optionsBuffer),
|
||||
(nint)(&resultBuffer));
|
||||
|
||||
result = resultBuffer;
|
||||
return success;
|
||||
}
|
||||
}
|
||||
|
||||
public TraceResult TraceShapeEx(Vector start, Vector end, nint filter, nint ray)
|
||||
public bool TraceShapeEx(Vector start, Vector end, nint filter, nint ray, out TraceResult result)
|
||||
{
|
||||
unsafe
|
||||
{
|
||||
result = default;
|
||||
|
||||
if (!NativeBridge.Loaded)
|
||||
return default;
|
||||
return false;
|
||||
|
||||
VectorNative s = new() { X = start.X, Y = start.Y, Z = start.Z };
|
||||
VectorNative e = new() { X = end.X, Y = end.Y, Z = end.Z };
|
||||
TraceResult resultBuffer = default;
|
||||
|
||||
return NativeBridge.TraceShapeEx!(
|
||||
NativeBridge.Handle,
|
||||
(nint)(&s),
|
||||
(nint)(&e),
|
||||
bool success = NativeBridge.TraceShapeEx!(NativeBridge.Handle,
|
||||
start.Handle,
|
||||
end.Handle,
|
||||
filter,
|
||||
ray
|
||||
);
|
||||
ray,
|
||||
(nint)(&resultBuffer));
|
||||
|
||||
result = resultBuffer;
|
||||
return success;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -153,10 +163,10 @@ public static class NativeBridge
|
|||
public static nint Handle;
|
||||
public static bool Loaded;
|
||||
|
||||
public static unsafe Func<nint, nint, nint, nint, nint, TraceResult>? TraceShape;
|
||||
public static unsafe Func<nint, nint, nint, nint, nint, TraceResult>? TraceEndShape;
|
||||
public static unsafe Func<nint, nint, nint, nint, nint, nint, nint, TraceResult>? TraceHullShape;
|
||||
public static unsafe Func<nint, nint, nint, nint, nint, TraceResult>? TraceShapeEx;
|
||||
public static unsafe Func<nint, nint, nint, nint, nint, nint, bool>? TraceShape;
|
||||
public static unsafe Func<nint, nint, nint, nint, nint, nint, bool>? TraceEndShape;
|
||||
public static unsafe Func<nint, nint, nint, nint, nint, nint, nint, nint, bool>? TraceHullShape;
|
||||
public static unsafe Func<nint, nint, nint, nint, nint, nint, bool>? TraceShapeEx;
|
||||
|
||||
public static bool Initialize()
|
||||
{
|
||||
|
|
@ -189,10 +199,10 @@ public static class NativeBridge
|
|||
ex = 5;
|
||||
}
|
||||
|
||||
TraceShape = VirtualFunction.Create<nint, nint, nint, nint, nint, TraceResult>(Handle, shape);
|
||||
TraceEndShape = VirtualFunction.Create<nint, nint, nint, nint, nint, TraceResult>(Handle, end);
|
||||
TraceHullShape = VirtualFunction.Create<nint, nint, nint, nint, nint, nint, nint, TraceResult>(Handle, hull);
|
||||
TraceShapeEx = VirtualFunction.Create<nint, nint, nint, nint, nint, TraceResult>(Handle, ex);
|
||||
TraceShape = VirtualFunction.Create<nint, nint, nint, nint, nint, nint, bool>(Handle, shape);
|
||||
TraceEndShape = VirtualFunction.Create<nint, nint, nint, nint, nint, nint, bool>(Handle, end);
|
||||
TraceHullShape = VirtualFunction.Create<nint, nint, nint, nint, nint, nint, nint, nint, bool>(Handle, hull);
|
||||
TraceShapeEx = VirtualFunction.Create<nint, nint, nint, nint, nint, nint, bool>(Handle, ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue