diff --git a/Game.Server/GameInterface.cs b/Game.Server/GameInterface.cs index b79173fa..377cb780 100644 --- a/Game.Server/GameInterface.cs +++ b/Game.Server/GameInterface.cs @@ -271,6 +271,8 @@ public bool DLLInit(IServiceProvider services) { System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(AI_SystemHook).TypeHandle); System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(FlexSceneFileManager).TypeHandle); System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(LagCompensationGlobals).TypeHandle); + System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(Templates).TypeHandle); + System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(PointTemplatePrecacher).TypeHandle); #if GMOD_DLL if (CommandLine.FindParm("-noaddons") == 0) @@ -507,7 +509,7 @@ public bool LevelInit(ReadOnlySpan pMapName, ReadOnlyMemory pMapEnti // Now that all of the active entities have been loaded in, precache any entities who need point_template parameters // to be parsed (the above code has loaded all point_template entities) - // PrecachePointTemplates(); + PointTemplatePrecacher.PrecachePointTemplates(); // load MOTD from file into stringtable // LoadMessageOfTheDay(); diff --git a/Game.Server/MapEntities.cs b/Game.Server/MapEntities.cs index d2bee2ab..c12ddfe6 100644 --- a/Game.Server/MapEntities.cs +++ b/Game.Server/MapEntities.cs @@ -32,9 +32,6 @@ public interface IMapEntityFilter BaseEntity? CreateNextEntity(ReadOnlySpan className); } -[LinkEntityToClass("point_template")] -public class PointTemplate : BaseEntity { } // TODO move this - [InlineArray(EntityMapData.MAPKEY_MAXLENGTH)] public struct InlineArrayMapKeyMaxLength { T first; } public static class MapEntities { @@ -164,7 +161,6 @@ public static void MapEntity_ParseAllEntities(ReadOnlyMemory mapData, IMap } } -#if false // TODO: point_template not implemented yet // Now loop through all our point_template entities and tell them to make templates of everything they're pointing to int templates = pointTemplates.Count; for (int i = 0; i < templates; i++) { @@ -183,7 +179,7 @@ public static void MapEntity_ParseAllEntities(ReadOnlyMemory mapData, IMap int numTemplates = pointTemplate.GetNumTemplateEntities(); for (int templateNm = 0; templateNm < numTemplates; templateNm++) { // Find it in the spawn list - BaseEntity entity = pointTemplate.GetTemplateEntity(templateNm); + BaseEntity? entity = pointTemplate.GetTemplateEntity(templateNm); for (int iEntNum = 0; iEntNum < numEntities; iEntNum++) { if (spawnList[iEntNum].Entity == entity) { // Give the point_template the mapdata @@ -204,11 +200,25 @@ public static void MapEntity_ParseAllEntities(ReadOnlyMemory mapData, IMap pointTemplate.FinishBuildingTemplates(); } -#endif SpawnHierarchicalList(numEntities, spawnList, activateEntities); } + public static void MapEntity_PrecacheEntity(ReadOnlyMemory entData, int entDataSize) { + EntityMapData mapData = new(entData, entDataSize); + Span className = stackalloc byte[EntityMapData.MAPKEY_MAXLENGTH]; + + if (!mapData.ExtractValue("classname"u8, className)) + Error("classname missing from entity!\n"); + + BaseEntity? entity = CreateEntityByName(TokenString(className)); + if (entity != null) { + entity.ParseMapData(mapData); + entity.Precache(); + Util.RemoveImmediate(entity); + } + } + public static void FreeContainingEntity(Edict? ed) { if (ed != null) { BaseEntity? ent = BaseEntity.GetContainingEntity(ed); @@ -325,7 +335,7 @@ static void SetupParentsForSpawnList(int entities, HierarchicalSpawn_t[] spawnLi } } - static void SpawnHierarchicalList(int entities, HierarchicalSpawn_t[] spawnList, bool activateEntities) { + internal static void SpawnHierarchicalList(int entities, HierarchicalSpawn_t[] spawnList, bool activateEntities) { // Compute the hierarchical depth of all entities hierarchically attached ComputeSpawnHierarchyDepth(entities, spawnList); diff --git a/Game.Server/PointTemplate.cs b/Game.Server/PointTemplate.cs new file mode 100644 index 00000000..0653f581 --- /dev/null +++ b/Game.Server/PointTemplate.cs @@ -0,0 +1,253 @@ +using Game.Shared; + +using Source; +using Source.Common; +using Source.Common.Mathematics; + +using System.Numerics; +using System.Text; + +namespace Game.Server; + +using DEFINE = Source.DEFINE; + +public class PointTemplatePrecacher() : AutoGameSystem("CPointTemplatePrecacher") +{ + public static readonly PointTemplatePrecacher g_PointTemplatePrecacher = new(); + + readonly List> Ents = []; + + public void AddToPrecache(PointTemplate ent) { + Handle handle = new(); + handle.Set(ent); + Ents.Add(handle); + } + + public override void LevelInitPreEntity() => Ents.Clear(); + + public override void Shutdown() => Ents.Clear(); + + public void Precache() { + int c = Ents.Count; + for (int i = 0; i < c; ++i) { + PointTemplate? ent = Ents[i].Get(); + ent?.PerformPrecache(); + } + + Ents.Clear(); + } + + public static void PrecachePointTemplates() => g_PointTemplatePrecacher.Precache(); +} + +[LinkEntityToClass("point_template")] +public class PointTemplate : LogicalEntity +{ + public const int MAX_NUM_TEMPLATES = 16; + + const int SF_POINTTEMPLATE_DONTREMOVETEMPLATEENTITIES = 0x0001; + const int SF_POINTTEMPLATE_PRESERVE_NAMES = 0x0002; + + public struct Template + { + public int TemplateIndex; + public Matrix4x4 EntityToTemplate; + } + + string? TemplateEntityName01, TemplateEntityName02, TemplateEntityName03, TemplateEntityName04, TemplateEntityName05, TemplateEntityName06, TemplateEntityName07, TemplateEntityName08, + TemplateEntityName09, TemplateEntityName10, TemplateEntityName11, TemplateEntityName12, TemplateEntityName13, TemplateEntityName14, TemplateEntityName15, TemplateEntityName16; + + readonly List TemplateEntities = []; + readonly List