diff --git a/Game.Client/C_Rope.cs b/Game.Client/C_Rope.cs index be89ffd4..3ff2da7c 100644 --- a/Game.Client/C_Rope.cs +++ b/Game.Client/C_Rope.cs @@ -81,5 +81,7 @@ public partial class C_RopeKeyframe : C_BaseEntity public float Width; [NetworkVar("m_flScrollSpeed")] public float ScrollSpeed; + + public override Vector3 WorldSpaceCenter() => GetAbsOrigin(); } diff --git a/Game.Client/DetailObjectSystem.cs b/Game.Client/DetailObjectSystem.cs index 5a6b7a81..62c92c93 100644 --- a/Game.Client/DetailObjectSystem.cs +++ b/Game.Client/DetailObjectSystem.cs @@ -1284,7 +1284,7 @@ int BuildOutSortedSprites(FastDetailLeafSpriteList data, in Vector3 viewOrigin, FastSpriteX4[] sprites = data.Sprites!; SortInfo[] outSort = FastSortInfos!; FastSpriteQuadBuildoutBufferX4[] quadBufferOut = BuildoutBuffer!; - int spriteIdx = 0; + int spriteIdx = data.StartSIMDSprite; int outIdx = 0; int quadIdx = 0; int curidx = 0; diff --git a/Game.Shared/BaseEntityShared.cs b/Game.Shared/BaseEntityShared.cs index 796832ab..d1d0f082 100644 --- a/Game.Shared/BaseEntityShared.cs +++ b/Game.Shared/BaseEntityShared.cs @@ -635,9 +635,7 @@ public static void SetPredictionRandomSeed(in UserCmd cmd) { } public BasePlayer? GetSimulatingPlayer() => PlayerSimulationOwner.Get(); - public virtual ref readonly Vector3 WorldSpaceCenter() { - return ref GetAbsOrigin(); // todo - } + public virtual Vector3 WorldSpaceCenter() => CollisionProp().WorldSpaceCenter(); public void SetPlayerSimulated(BasePlayer owner) { b_IsPlayerSimulated = true; diff --git a/Game.Shared/Beam.cs b/Game.Shared/Beam.cs index 0fd3991c..ece4ba46 100644 --- a/Game.Shared/Beam.cs +++ b/Game.Shared/Beam.cs @@ -29,6 +29,8 @@ public partial class #endif : BaseEntity { + // todo: WorldSpaceCenter override ((GetAbsStartPos() + GetAbsEndPos()) * 0.5f), it needs GetAbsStartPos and GetAbsEndPos ported first + public const int ATTACHMENT_INDEX_BITS = 5; public const float MAX_BEAM_WIDTH = 102.3f; public const float MAX_BEAM_SCROLLSPEED = 100f; diff --git a/Source.Engine/DtEncode.cs b/Source.Engine/DtEncode.cs index bd46ffcb..d55c29c4 100644 --- a/Source.Engine/DtEncode.cs +++ b/Source.Engine/DtEncode.cs @@ -638,7 +638,11 @@ public static void Array_FastCopy(SendProp sendProp, RecvProp recvProp, object s } } - public static void Array_DecodeZero(ref DecodeInfo info) => throw new NotImplementedException(); + public static void Array_DecodeZero(ref DecodeInfo info) { + ArrayLengthRecvProxyFn? lengthProxy = info.RecvProxyData.RecvProp.GetArrayLengthProxy(); + if (lengthProxy != null) + lengthProxy(info.Object, info.RecvProxyData.ObjectID, 0); + } public static void Array_Encode(object instance, ref DVariant var, SendProp prop, bf_write writeOut, int objectID) { SendProp? arrayProp = prop.GetArrayProp(); AssertMsg(arrayProp != null, $"Array_Decode: missing m_pArrayProp for SendProp '{prop.GetName()}'.");