diff --git a/Game.Client/C_Func_LOD.cs b/Game.Client/C_Func_LOD.cs index 045b8fac..7690fe60 100644 --- a/Game.Client/C_Func_LOD.cs +++ b/Game.Client/C_Func_LOD.cs @@ -17,7 +17,7 @@ public class C_Func_LOD : C_BaseEntity public static readonly new ClientClass ClientClass = new ClientClass(DT_Func_LOD); [NetworkName("m_fDisappearMinDist")] - public float DisappearMinDist; + public float DisappearMinDist = 5000.0f; [NetworkName("m_fDisappearMaxDist")] - public float DisappearMaxDist; + public float DisappearMaxDist = 5800.0f; } diff --git a/Game.Server/BaseEntity.cs b/Game.Server/BaseEntity.cs index 956dca97..a0cbd7f2 100644 --- a/Game.Server/BaseEntity.cs +++ b/Game.Server/BaseEntity.cs @@ -2420,7 +2420,33 @@ public virtual int OnTakeDamage(in TakeDamageInfo info) { public virtual void DeathNotice(BaseEntity victim) { } - public IPhysicsObject? VPhysicsInitStatic() => throw new NotImplementedException(); + public IPhysicsObject? VPhysicsInitStatic() { + if (!VPhysicsInitSetup()) + return null; + + if (GetMoveParent() != null) { + if (GetSolid() == SolidType.BSP && GetRootMoveParent().GetSolid() != SolidType.BSP) + SetSolid(SolidType.VPhysics); + + VPhysicsInitShadow(false, false); + return VPhysicsGetObject(); + } + + if (GetSolid() == SolidType.None) + return null; + + IPhysicsObject? physicsObject; + if (GetSolid() == SolidType.BBox) + physicsObject = PhysModelCreateBox(this, WorldAlignMins(), WorldAlignMaxs(), GetAbsOrigin(), true); + else + physicsObject = PhysModelCreateUnmoveable(this, GetModelIndex(), GetAbsOrigin(), GetAbsAngles()); + + if (PhysicsObject != null) + Error("VPhysicsInitStatic got a physics object at unexpected time!\n"); + + VPhysicsSetObject(physicsObject); + return physicsObject; + } public virtual void Event_KilledOther(BaseEntity killed, in TakeDamageInfo info) { diff --git a/Game.Server/Func_LOD.cs b/Game.Server/Func_LOD.cs index 7108eb00..b98051d6 100644 --- a/Game.Server/Func_LOD.cs +++ b/Game.Server/Func_LOD.cs @@ -6,6 +6,7 @@ namespace Game.Server; using FIELD = FIELD; +using DEFINE = Source.DEFINE; [LinkEntityToClass("func_lod")] [NetworkName("CFunc_LOD")] @@ -17,8 +18,41 @@ public class Func_LOD : BaseEntity ]); public static readonly new ServerClass ServerClass = new ServerClass(DT_Func_LOD); + public static readonly new DataMap DataDesc = new(typeof(Func_LOD), BaseEntity.DataDesc, [ + DEFINE.KEYFIELD(nameof(DisappearMinDist), FieldType.Float, "DisappearMinDist"), + DEFINE.KEYFIELD(nameof(DisappearMaxDist), FieldType.Float, "DisappearMaxDist"), + ]); + public override DataMap? GetDataDescMap() => DataDesc; + [NetworkName("m_fDisappearMinDist")] public float DisappearMinDist; [NetworkName("m_fDisappearMaxDist")] public float DisappearMaxDist; + + public override void Spawn() { + SetModel(GetModelName()); + SetSolid(SolidType.BSP); + base.Spawn(); + CreateVPhysics(); + } + + public bool CreateVPhysics() { + VPhysicsInitStatic(); + return true; + } + + public override bool KeyValue(ReadOnlySpan keyName, ReadOnlySpan value) { + if (FStrEq(keyName, "DisappearDist")) { + DisappearMinDist = atoi(value); + DisappearMaxDist = DisappearMinDist + 800.0f; + } + else if (FStrEq(keyName, "Solid")) { + if (atoi(value) != 0) + AddSolidFlags(SolidFlags.NotSolid); + } + else + return base.KeyValue(keyName, value); + + return true; + } } diff --git a/Game.Shared/PhysicsShared.cs b/Game.Shared/PhysicsShared.cs index 2b2260a8..c4475843 100644 --- a/Game.Shared/PhysicsShared.cs +++ b/Game.Shared/PhysicsShared.cs @@ -407,7 +407,7 @@ public static bool PhysModelParseSolidByIndex(ref Solid solid, BaseEntity entity solid.Params.EnableCollisions = true; solid.Params.GameData = entity; - solid.Params.Name = new string(((ReadOnlySpan)entity.GetModelName()).SliceNullTerminatedString()); + solid.Params.Name = new string(entity.GetModelName()); return parsed; } @@ -432,6 +432,43 @@ public static bool PhysModelParseSolidByIndex(ref Solid solid, BaseEntity entity return PhysModelCreateInternal(entity, collide, in origin, in angles, ref solid); } + public static IPhysicsObject? PhysModelCreateUnmoveable(BaseEntity entity, int modelIndex, in Vector3 origin, in QAngle angles) { + if (physenv == null) + return null; + + VCollide? collide = modelinfo.GetVCollide(modelIndex); + if (collide == null || collide.SolidCount == 0 || collide.Solids == null) + return null; + + Solid solid = default; + if (!PhysModelParseSolidByIndex(ref solid, entity, collide, -1)) + return null; + + solid.Params.EnableCollisions = true; + + int surfaceProp = -1; + ReadOnlySpan surfacePropName = ((ReadOnlySpan)solid.SurfaceProp).SliceNullTerminatedString(); + if (!surfacePropName.IsEmpty) + surfaceProp = (int)physprops.GetSurfaceIndex(surfacePropName); + + solid.Params.GameData = entity; + solid.Params.Name = new string(entity.GetModelName()); + IPhysicsObject? obj = physenv.CreatePolyObjectStatic(collide.Solids[0]!, surfaceProp, origin, angles, ref solid.Params); + + if (obj != null) { + if (modelinfo.GetModelType(modelinfo.GetModel(modelIndex)) == ModelType.Brush) { + uint contents = (uint)modelinfo.GetModelContents(modelIndex); + Assert(contents != 0); + if (contents != obj.GetContents() && contents != 0) { + obj.SetContents(contents); + obj.RecheckCollisionFilter(); + } + } + } + + return obj; + } + static IPhysicsObject? PhysModelCreateInternal(BaseEntity entity, VCollide collide, in Vector3 origin, in QAngle angles, ref Solid solid) { int surfaceProp = -1; ReadOnlySpan surfacePropName = ((ReadOnlySpan)solid.SurfaceProp).SliceNullTerminatedString(); diff --git a/Source.Engine/CollisionModelSubsystem.cs b/Source.Engine/CollisionModelSubsystem.cs index 39f24b33..c53d8d8a 100644 --- a/Source.Engine/CollisionModelSubsystem.cs +++ b/Source.Engine/CollisionModelSubsystem.cs @@ -901,6 +901,36 @@ private static void DispTreeLeafnum(CollisionBSPData bspData) { return (bspData.MapCollisionModels[index]); } + static Contents BrushContents_r(CollisionBSPData bspData, int nodenum) { + Contents contents = 0; + + while (true) { + if (nodenum < 0) { + int leafIndex = -1 - nodenum; + ref CollisionLeaf leaf = ref bspData.MapLeafs.AsSpan()[leafIndex]; + + for (int i = 0; i < leaf.NumLeafBrushes; i++) { + ushort brushIndex = bspData.MapLeafBrushes[leaf.FirstLeafBrush + i]; + contents |= bspData.MapBrushes.AsSpan()[brushIndex].Contents; + } + + return contents; + } + + ref CollisionNode node = ref bspData.MapNodes.AsSpan()[bspData.MapRootNode + nodenum]; + contents |= BrushContents_r(bspData, node.Children[0]); + nodenum = node.Children[1]; + } + } + + public static Contents InlineModelContents(int index) { + CollisionModel? model = InlineModelNumber(index); + if (model == null) + return 0; + + return BrushContents_r(GetCollisionBSPData(), model.HeadNode); + } + internal static void ClearTrace(ref Trace trace) { trace = default; trace.Fraction = 1; diff --git a/Source.Engine/ModelInfo.cs b/Source.Engine/ModelInfo.cs index 75f6a555..e1a5b49b 100644 --- a/Source.Engine/ModelInfo.cs +++ b/Source.Engine/ModelInfo.cs @@ -2,6 +2,7 @@ using Source.Common.DataCache; using Source.Common.Engine; using Source.Common.Filesystem; +using Source.Common.Formats.BSP; using Source.Common.MaterialSystem; using Source.Common.Mathematics; using Source.Common.Physics; @@ -317,7 +318,16 @@ public void GetIlluminationPoint(Model? model, IClientRenderable? renderable, in } public int GetModelContents(int modelIndex) { - throw new NotImplementedException(); + Model? model = GetModel(modelIndex); + if (model != null) { + switch (model.Type) { + case ModelType.Brush: + return (int)CM.InlineModelContents(modelIndex - 1); + case ModelType.Studio: + return (int)Contents.Solid; + } + } + return 0; } public void SetLevelScreenFadeRange(float minSize, float maxSize) {