Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 16 additions & 7 deletions Game.Server/PhysicsMain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Source.Common.Engine;
using Source.Common.Formats.BSP;
using Source.Common.Mathematics;
using Source.Common.Physics;
using Source.Engine;

using Steamworks;
Expand Down Expand Up @@ -398,23 +399,31 @@ void PhysicsStep() {
PhysicsStepRunTimestep(gpGlobals.FrameTime);
// PhysicsCheckWaterTransition();
SetLastThink(-1, gpGlobals.CurTime);
// UpdatePhysicsShadowToCurrentPosition(gpGlobals.FrameTime);
// PhysicsRelinkChildren(gpGlobals.FrameTime);
UpdatePhysicsShadowToCurrentPosition(gpGlobals.FrameTime);
PhysicsRelinkChildren(gpGlobals.FrameTime);
return;
}

Vector3 oldOrigin = GetAbsOrigin();

bool updateFromVPhysics = Physics.npc_vphysics.GetBool();
if (HasDataObjectType(DataObjectType.VPhysicsUpdateAI)) {
// todo
VPhysicsUpdateAI update = GetDataObject<VPhysicsUpdateAI>(DataObjectType.VPhysicsUpdateAI);
if (update.StopUpdateTime > gpGlobals.CurTime)
updateFromVPhysics = true;
else {
IPhysicsShadowController controller = VPhysicsGetObject()!.GetShadowController();
controller.GetMaxSpeed(out _, out float maxAngular);
controller.MaxSpeed(update.SavedShadowControllerMaxSpeed, maxAngular);
DestroyDataObject(DataObjectType.VPhysicsUpdateAI);
}
}

if (updateFromVPhysics && VPhysicsGetObject() != null && GetParent() == null) {
VPhysicsGetObject()!.GetShadowPosition(out Vector3 position, out _);
float delta = (GetAbsOrigin() - position).LengthSqr();
if (delta < 1) {
Physics.TraceEntity(this, GetAbsOrigin(), GetAbsOrigin(), (uint)Mask.Solid, out Trace tr); // PhysicsSolidMaskForEntity
Physics.TraceEntity(this, GetAbsOrigin(), GetAbsOrigin(), (uint)PhysicsSolidMaskForEntity(), out Trace tr);
updateFromVPhysics = tr.StartSolid;
}

Expand All @@ -430,18 +439,18 @@ void PhysicsStep() {
if (thinkTime < gpGlobals.CurTime)
thinkTime = gpGlobals.CurTime;

float dt = (float)(thinkTime - 0);//GetLastThink(); todo
TimeUnit_t dt = thinkTime - GetLastThink(null);

StepSimulationThink(dt);

// PhysicsCheckWaterTransition();

if (VPhysicsGetObject() != null) {
if (!MathLib.VectorCompare(oldOrigin, GetAbsOrigin()))
VPhysicsGetObject()!.UpdateShadow(GetAbsOrigin(), vec3_angle, (GetFlags() & EntityFlags.Fly) != 0, dt);
VPhysicsGetObject()!.UpdateShadow(GetAbsOrigin(), vec3_angle, (GetFlags() & EntityFlags.Fly) != 0, (float)dt);
}

// PhysicsRelinkChildren(dt);
PhysicsRelinkChildren(dt);
}

BaseEntity? PhysicsPushMove(TimeUnit_t movetime) {
Expand Down
29 changes: 29 additions & 0 deletions Game.Shared/BaseEntityShared.cs
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,36 @@ public BaseEntity GetRootMoveParent() {
}

public void VPhysicsInitShadow(bool allowPhysicsMovement, bool allowPhysicsRotation, ref Solid solid) {
#if !CLIENT_DLL
if (!VPhysicsInitSetup())
return;

if (GetSolid() == SolidType.None)
return;

Vector3 origin = GetAbsOrigin();
QAngle angles = GetAbsAngles();
IPhysicsObject? physicsObject;

if (GetSolid() == SolidType.BBox) {
float radius = 0.25f - DIST_EPSILON;
Vector3 mins = WorldAlignMins() + new Vector3(radius, radius, radius);
Vector3 maxs = WorldAlignMaxs() - new Vector3(radius, radius, radius);
physicsObject = PhysModelCreateBox(this, mins, maxs, origin, false);
angles = vec3_angle;
}
else if (GetSolid() == SolidType.OBB)
physicsObject = PhysModelCreateOBB(this, CollisionProp().OBBMins(), CollisionProp().OBBMaxs(), origin, angles, false);
else
physicsObject = PhysModelCreate(this, GetModelIndex(), origin, angles, ref solid);

if (physicsObject == null)
return;

VPhysicsSetObject(physicsObject);
physicsObject.SetShadow(1e4f, 1e4f, allowPhysicsMovement, allowPhysicsRotation);
physicsObject.UpdateShadow(origin, angles, false, 0);
#endif
}
public void VPhysicsInitShadow(bool allowPhysicsMovement, bool allowPhysicsRotation) => VPhysicsInitShadow(allowPhysicsMovement, allowPhysicsRotation, ref Unsafe.NullRef<Solid>());
public void VPhysicsDestroyObject() {
Expand Down
2 changes: 1 addition & 1 deletion Game.Shared/PhysicsMainShared.cs
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ public override void Shutdown() {
//PhysicsPushList
null!,
//VPhysicsUpdateAI
null!,
new EntityDataInstantiator<VPhysicsUpdateAI>(),
//VPhysicsWatcher
new EntityDataInstantiator<WatcherList>(),
];
Expand Down
85 changes: 85 additions & 0 deletions Game.Shared/PhysicsShared.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using Source;
using Source.Common;
using Source.Common.Engine;
using Source.Common.Filesystem;
using Source.Common.Formats.BSP;
using Source.Common.Formats.Keyvalues;
Expand Down Expand Up @@ -441,6 +442,90 @@ public static bool PhysModelParseSolidByIndex(ref Solid solid, BaseEntity entity
return obj;
}

public static PhysCollide? PhysCreateBbox(in Vector3 minsIn, in Vector3 maxsIn) {
Vector3 mins = minsIn;
Vector3 maxs = maxsIn;

return physcollision.BBoxToCollide(mins, maxs);
}

static ReadOnlySpan<char> PhysModelDefaultSurfaceProps(int modelIndex) {
if (modelIndex != 0) {
Model? model = modelinfo.GetModel(modelIndex);
if (model != null) {
StudioHeader? studioHdr = modelinfo.GetStudiomodel(model);
if (studioHdr != null)
return studioHdr.SurfaceProp();
}
}
return "flesh";
}

public static IPhysicsObject? PhysModelCreateBox(BaseEntity entity, in Vector3 mins, in Vector3 maxs, in Vector3 origin, bool isStatic) {
int modelIndex = entity.GetModelIndex();
Solid solid = default;
PhysGetDefaultAABBSolid(ref solid);
Vector3 dims = maxs - mins;
solid.Params.Volume = dims.X * dims.Y * dims.Z;
strcpy(solid.SurfaceProp, PhysModelDefaultSurfaceProps(modelIndex));

#if GMOD_DLL
if (modelIndex != 0)
PhysModelParseSolid(ref solid, entity, modelIndex);

solid.Params = g_PhysDefaultObjectParams;
#endif

PhysCollide? collide = PhysCreateBbox(mins, maxs);
if (collide == null)
return null;

return PhysModelCreateCustom(entity, collide, origin, vec3_angle, ((ReadOnlySpan<char>)entity.GetModelName()).SliceNullTerminatedString(), isStatic, ref solid);
}

public static IPhysicsObject? PhysModelCreateOBB(BaseEntity entity, in Vector3 mins, in Vector3 maxs, in Vector3 origin, in QAngle angle, bool isStatic) {
int modelIndex = entity.GetModelIndex();
Solid solid = default;
PhysGetDefaultAABBSolid(ref solid);
Vector3 dims = maxs - mins;
solid.Params.Volume = dims.X * dims.Y * dims.Z;
strcpy(solid.SurfaceProp, PhysModelDefaultSurfaceProps(modelIndex));

PhysCollide? collide = PhysCreateBbox(mins, maxs);
if (collide == null)
return null;

return PhysModelCreateCustom(entity, collide, origin, angle, ((ReadOnlySpan<char>)entity.GetModelName()).SliceNullTerminatedString(), isStatic, ref solid);
}

public static IPhysicsObject? PhysModelCreateCustom(BaseEntity entity, PhysCollide model, in Vector3 origin, in QAngle angles, ReadOnlySpan<char> name, bool isStatic, ref Solid solid) {
if (physenv == null)
return null;

if (Unsafe.IsNullRef(ref solid)) {
Solid tmpSolid = default;
PhysGetDefaultAABBSolid(ref tmpSolid);
return PhysModelCreateCustom(entity, model, origin, angles, name, isStatic, ref tmpSolid);
}
int surfaceProp = (int)physprops.GetSurfaceIndex(((ReadOnlySpan<char>)solid.SurfaceProp).SliceNullTerminatedString());
solid.Params.GameData = entity;
solid.Params.Name = new string(name);
IPhysicsObject? obj;
if (isStatic)
obj = physenv.CreatePolyObjectStatic(model, surfaceProp, origin, angles, ref solid.Params);
else
obj = physenv.CreatePolyObject(model, surfaceProp, origin, angles, ref solid.Params);

return obj;
}

public static void PhysGetDefaultAABBSolid(ref Solid solid) {
solid.Params = g_PhysDefaultObjectParams;
solid.Params.Mass = 85.0f;
solid.Params.Inertia = 1e24f;
strcpy(solid.SurfaceProp, "default");
}

public static void PhysCreateVirtualTerrain(BaseEntity world, in ObjectParams defaultParams) {
if (physenv == null)
return;
Expand Down
8 changes: 8 additions & 0 deletions Game.Shared/VPhysicsUpdateAI.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace Game.Shared;

public class VPhysicsUpdateAI
{
public TimeUnit_t StartUpdateTime;
public TimeUnit_t StopUpdateTime;
public float SavedShadowControllerMaxSpeed;
}
Loading