Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 46 additions & 1 deletion Game.Shared/PhysicsShared.cs
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,25 @@ public static bool PhysModelParseSolidByIndex(ref Solid solid, BaseEntity entity
return obj;
}

public static void PhysCreateVirtualTerrain(BaseEntity world, in ObjectParams defaultParams) {
if (physenv == null)
return;

for (int i = 0; i < BSPFileCommon.MAX_MAP_DISPINFO; i++) {
PhysCollide? collide = modelinfo.GetCollideForVirtualTerrain(i);
if (collide != null) {
Solid solid = default;
solid.Params = defaultParams;
solid.Params.EnableCollisions = true;
solid.Params.GameData = world;
solid.Params.Name = $"vdisp_{i:D4}";
int surfaceData = (int)physprops.GetSurfaceIndex("default");
IPhysicsObject? obj = physenv.CreatePolyObjectStatic(collide, surfaceData, vec3_origin, vec3_angle, ref solid.Params);
obj!.SetCallbackFlags(obj.GetCallbackFlags() | CallbackFlags.NeverDeleted);
}
}
}

public static IPhysicsObject? PhysCreateWorld_Shared(BaseEntity world, VCollide? worldCollide, in ObjectParams defaultParams) {
Solid solid = default;
Fluid fluid = default;
Expand All @@ -454,9 +473,23 @@ public static bool PhysModelParseSolidByIndex(ref Solid solid, BaseEntity entity
oparams.GameData = world;
oparams.Name = "world";

Span<nint> surfaceTable = stackalloc nint[128];
IVPhysicsKeyParser tableParse = physcollision.VPhysicsKeyParserCreate(worldCollide.KeyValues!);
while (!tableParse.Finished()) {
if (strcmpi(tableParse.GetCurrentBlockName(), "materialtable") == 0) {
tableParse.ParseSurfaceTable(surfaceTable, null);
physprops.SetWorldMaterialIndexTable(surfaceTable);
}
else
tableParse.SkipBlock();
}
physcollision.VPhysicsKeyParserDestroy(tableParse);

IPhysicsObject? worldPhysics = physenv.CreatePolyObjectStatic(worldCollide.Solids[0]!, surfaceData, vec3_origin, vec3_angle, ref oparams);

IVPhysicsKeyParser parse = physcollision.VPhysicsKeyParserCreate(worldCollide.KeyValues!);

bool createVirtualTerrain = false;
while (!parse.Finished()) {
ReadOnlySpan<char> block = parse.GetCurrentBlockName();

Expand All @@ -472,8 +505,13 @@ public static bool PhysModelParseSolidByIndex(ref Solid solid, BaseEntity entity
if (solid.Index == 0)
continue;

if (solid.Index >= worldCollide.SolidCount || worldCollide.Solids[solid.Index] == null)
if (solid.Index >= worldCollide.SolidCount)
continue;

if (worldCollide.Solids[solid.Index] == null) {
createVirtualTerrain = true;
continue;
}

IPhysicsObject? obj = physenv.CreatePolyObjectStatic(worldCollide.Solids[solid.Index]!, surfaceData, vec3_origin, vec3_angle, ref solid.Params);
if (obj == null)
Expand All @@ -487,11 +525,18 @@ public static bool PhysModelParseSolidByIndex(ref Solid solid, BaseEntity entity
else if (strcmpi(block, "fluid") == 0) {
parse.ParseFluid(ref fluid, null);
}
else if (strcmpi(block, "virtualterrain") == 0) {
createVirtualTerrain = true;
parse.SkipBlock();
}
else
parse.SkipBlock();
}
physcollision.VPhysicsKeyParserDestroy(parse);

if (createVirtualTerrain && physcollision.SupportsVirtualMesh())
PhysCreateVirtualTerrain(world, defaultParams);

return worldPhysics;
}
#endif
Expand Down
18 changes: 18 additions & 0 deletions Source.Common/DispCollCommon.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Source.Common.Formats.BSP;
using Source.Common.Mathematics;
using Source.Common.Physics;

using System;
using System.Collections.Generic;
Expand Down Expand Up @@ -811,6 +812,23 @@ ushort Cache_EdgeCrossAxisZ(in Vector3 vecEdge, in Vector3 vecOnEdge, in Vector3
return (ushort)AddPlane(vecNormal);
}

public void GetVirtualMeshList(ref VirtualMeshList list) {
int i;
int triangleCount = GetTriSize();
list.IndexCount = triangleCount * 3;
list.TriangleCount = triangleCount;
list.VertexCount = Verts.Count;
list.Verts = Verts;
list.SurfacePropsIndex = GetSurfaceProps(0);
int index = 0;
for (i = 0; i < triangleCount; i++) {
list.Indices[index + 0] = (ushort)Tris[i].GetVert(0);
list.Indices[index + 1] = (ushort)Tris[i].GetVert(1);
list.Indices[index + 2] = (ushort)Tris[i].GetVert(2);
index += 3;
}
}

[MethodImpl(MethodImplOptions.AggressiveInlining)] public void SetPower(int power) => Power = power;
[MethodImpl(MethodImplOptions.AggressiveInlining)] public int GetPower() => Power;

Expand Down
2 changes: 1 addition & 1 deletion Source.Common/Physics/PhysicsInterface.cs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public interface IPhysicsCollision
IPhysicsCollision ThreadContextCreate();
void ThreadContextDestroy(IPhysicsCollision threadContext);

PhysCollide CreateVirtualMesh(in VirtualMeshParams meshParams);
PhysCollide? CreateVirtualMesh(in VirtualMeshParams meshParams);
bool SupportsVirtualMesh();

bool GetBBoxCacheSize(out uint cachedSize, out nint cachedCount);
Expand Down
8 changes: 4 additions & 4 deletions Source.Common/Physics/VirtualMesh.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ public static class VirtualMeshConstants
public const int MAX_VIRTUAL_TRIANGLES = 1024;
}

[InlineArray(VirtualMeshConstants.MAX_VIRTUAL_TRIANGLES)]
[InlineArray(VirtualMeshConstants.MAX_VIRTUAL_TRIANGLES * 3)]
public struct InlineArrayMaxVirtualTriangles<T> { T first; }

public struct VirtualMeshList
{
public Vector3 Verts;
public List<Vector3>? Verts;
public int IndexCount;
public int TriangleCount;
public int VertexCount;
Expand All @@ -30,9 +30,9 @@ public struct VirtualMeshTriangleList

public interface IVirtualMeshEvent
{
void GetVirtualMesh(object userData, Span<VirtualMeshList> list);
void GetVirtualMesh(object userData, ref VirtualMeshList list);
void GetWorldspaceBounds(object userData, out Vector3 mins, out Vector3 maxs);
void GetTrianglesInSphere(object userData, in Vector3 center, float radius, Span<VirtualMeshTriangleList> list);
void GetTrianglesInSphere(object userData, in Vector3 center, float radius, ref VirtualMeshTriangleList list);
}

public struct VirtualMeshParams
Expand Down
54 changes: 54 additions & 0 deletions Source.Engine/CModel_Private.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Source.Common.Commands;
using Source.Common.Formats.BSP;
using Source.Common.Mathematics;
using Source.Common.Physics;

using System.Numerics;
using System.Runtime.CompilerServices;
Expand Down Expand Up @@ -121,6 +122,23 @@ public void Init(in Vector3 minsIn, in Vector3 maxsIn, int counterIn, Contents c
}
}

class VirtualTerrain : IVirtualMeshEvent
{
public void GetVirtualMesh(object userData, ref VirtualMeshList list) {
int index = (int)userData;
Assert(index >= 0 && index < CM.g_DispCollTreeCount);
g_DispCollTrees![index].GetVirtualMeshList(ref list);
}
public void GetWorldspaceBounds(object userData, out Vector3 mins, out Vector3 maxs) {
int index = (int)userData;
mins = g_DispBounds![index].Mins;
maxs = g_DispBounds[index].Maxs;
}
public void GetTrianglesInSphere(object userData, in Vector3 center, float radius, ref VirtualMeshTriangleList list) {
throw new NotImplementedException();
}
}

public static partial class CM
{
static readonly ObjectPool<TraceInfo> g_TraceInfoPool = new();
Expand Down Expand Up @@ -311,6 +329,42 @@ public static Span<byte> Vis(Span<byte> dest, int destlen, int cluster, int visT

public static nint g_DispCollTreeCount = 0;

static readonly VirtualTerrain g_VirtualTerrain = new();
static PhysCollide?[] g_TerrainList = [];

public static PhysCollide? PhysCollideForDisp(int index) {
if (index < 0 || index >= g_DispCollTreeCount)
return null;

return g_TerrainList[index];
}

public static void CreateDispPhysCollide(int dispLumpSize) {
g_TerrainList = new PhysCollide?[g_DispCollTreeCount];
for (int i = 0; i < g_DispCollTreeCount; i++) {
DispCollTree dispTree = g_DispCollTrees![i];
if (dispTree != null && dispTree.CheckFlags(CoreDispInfo.SURF_NOPHYSICS_COLL)) {
g_TerrainList[i] = null;
continue;
}
VirtualMeshParams meshParams = default;
meshParams.MeshEventHandler = g_VirtualTerrain;
meshParams.UserData = i;
meshParams.BuildOuterHull = dispLumpSize > 0 ? false : true;

g_TerrainList[i] = physcollision.CreateVirtualMesh(meshParams);
}
}

public static void DestroyDispPhysCollide() {
for (int i = g_TerrainList.Length - 1; i >= 0; --i) {
PhysCollide? collide = g_TerrainList[i];
if (collide != null)
physcollision.DestroyCollide(collide);
}
g_TerrainList = [];
}

internal static TraceInfo BeginTrace() {
TraceInfo traceInfo = g_TraceInfoPool.Alloc();

Expand Down
27 changes: 23 additions & 4 deletions Source.Engine/CollisionModelSubsystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ internal void Destroy() {
physcollision.VCollideUnload(MapCollisionModels[i].VCollisionData);

// DispCollTrees_FreeLeafList(this);
// CM.DestroyDispPhysCollide();
CM.DestroyDispPhysCollide();
// DispCollTrees_Free(CM.g_DispCollTrees);
// CM.g_DispCollTrees = null;
// CM.g_DispBounds = null;
Expand Down Expand Up @@ -171,7 +171,7 @@ internal void LoadTextures() {
var = material.FindVar("$surfaceprop", out varFound, false);
if (varFound) {
ReadOnlySpan<char> props = var.GetStringValue();
// TODO: set surface properties.
MapSurfaces.AsSpan()[i].SurfaceProps = (ushort)physprop.GetSurfaceIndex(props);
}
}
}
Expand Down Expand Up @@ -564,6 +564,7 @@ internal void LoadDispInfo() {
BSPDDispInfo[] dispInfos = new MapLoadHelper(LumpIndex.DispInfo).LoadLumpData<BSPDDispInfo>();
DispVert[] dispVerts = new MapLoadHelper(LumpIndex.DispVerts).LoadLumpData<DispVert>();
DispTri[] dispTris = new MapLoadHelper(LumpIndex.DispTris).LoadLumpData<DispTri>();
BSPTexInfo[] texinfos = new MapLoadHelper(LumpIndex.TexInfo).LoadLumpData<BSPTexInfo>();

if (faces.Length == 0)
return;
Expand Down Expand Up @@ -643,12 +644,30 @@ internal void LoadDispInfo() {
tree.GetBounds(out Vector3 treeMins, out Vector3 treeMaxs);
g_DispBounds[i].Init(treeMins, treeMaxs, tree.Counter, tree.GetContents());

// NOTE: surface props are left at their defaults; physprops material lookup
// is not yet wired in the collision subsystem (see LoadTextures TODO).
ref BSPTexInfo tex = ref texinfos[face.TexInfo];
if (tex.TexData >= 0) {
IMaterial material = materials!.FindMaterial(MapSurfaces[tex.TexData].Name, MaterialDefines.TEXTURE_GROUP_WORLD, true);
if (!material.IsErrorMaterial()) {
IMaterialVar var = material.FindVar("$surfaceprop", out bool varFound, false);
if (varFound) {
ReadOnlySpan<char> props = var.GetStringValue();
tree.SetSurfaceProps(0, (short)physprop.GetSurfaceIndex(props));
tree.SetSurfaceProps(1, (short)physprop.GetSurfaceIndex(props));
}

var = material.FindVar("$surfaceprop2", out varFound, false);
if (varFound) {
ReadOnlySpan<char> props = var.GetStringValue();
tree.SetSurfaceProps(1, (short)physprop.GetSurfaceIndex(props));
}
}
}
}

// Link each displacement into the BSP leaves it touches.
CM_DispTreeLeafnum();

CM.CreateDispPhysCollide((int)MapLoadHelper.GetLumpSize(LumpIndex.PhysDisp));
}

// Port of CM_DispTreeLeafnum + CDispLeafBuilder: build the per-leaf displacement lists.
Expand Down
2 changes: 1 addition & 1 deletion Source.Engine/ModelInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ public void SetViewScreenFadeRange(float flMinSize, float flMaxSize) {
public byte ComputeViewScreenFade(in Vector3 absOrigin, float radius, float fadeScale) => 255;// TODO!!

public PhysCollide? GetCollideForVirtualTerrain(int index) {
throw new NotImplementedException();
return CM.PhysCollideForDisp(index);
}

public bool IsUsingFBTexture(Model? model, int nSkin, int nBody, object? pClientRenderable) {
Expand Down
14 changes: 14 additions & 0 deletions Source.Physics/Main.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

using Microsoft.Extensions.DependencyInjection;

using Source.Common.Commands;
using Source.Common.Physics;

using System.Runtime.CompilerServices;
Expand Down Expand Up @@ -77,6 +78,19 @@ public void DestroyEnvironment(IPhysicsEnvironment? env) {
(env as PhysicsEnvironment)?.Destroy();
}

[ConCommand("vbox_dumpcollide", "Dumps collision and mass data of physics objects whose name contains the argument.", FCvar.Cheat)]
void vbox_dumpcollide(in TokenizedCommand args) {
if (args.ArgC() < 2) {
Msg("Usage: vbox_dumpcollide <object name substring>\n");
return;
}

for (int i = 0; i < Environments.Count; i++) {
if (Environments[i] is PhysicsEnvironment environment)
environment.DumpCollide(i, args[1]);
}
}

public IPhysicsEnvironment? GetActiveEnvironmentByIndex(int index) {
if (index < 0 || index >= Environments.Count)
return null;
Expand Down
Loading
Loading