added marker pool & factory (#778)

Author: KiwisKiwi

api/AltV.Net.Client/Elements/Factories/MarkerFactory.cs

@@ -0,0 +1,13 @@
+using AltV.Net.Client.Elements.Entities;
+using AltV.Net.Client.Elements.Interfaces;
+
+namespace AltV.Net.Client.Elements.Factories
+{
+    public class MarkerFactory : IBaseObjectFactory<IMarker>
+    {
+        public IMarker Create(ICore core, IntPtr markerPointer, uint id)
+        {
+            return new Marker(core, markerPointer, id);
+        }
+    }
+}

api/AltV.Net.Client/Elements/Pools/MarkerPool.cs

@@ -0,0 +1,24 @@
+using AltV.Net.Client.Elements.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AltV.Net.Client.Elements.Pools
+{
+    public class MarkerPool : BaseObjectPool<IMarker>
+    {
+        public MarkerPool(IBaseObjectFactory<IMarker> markerFactory) : base(markerFactory)
+        {
+        }
+
+        public override uint GetId(IntPtr entityPointer)
+        {
+            unsafe
+            {
+                return Alt.Core.Library.Shared.Marker_GetID(entityPointer);
+            }
+        }
+    }
+}

api/AltV.Net.Client/Elements/Pools/PoolManager.cs

@@ -19,7 +19,6 @@ public class PoolManager : IPoolManager
         public IBaseObjectPool<ICheckpoint> Checkpoint { get; }
         public IBaseObjectPool<IVirtualEntity> VirtualEntity { get; }
         public IBaseObjectPool<IVirtualEntityGroup> VirtualEntityGroup { get; }
-        public IBaseObjectPool<IMarker> Marker { get; }
         public IBaseObjectPool<IRmlDocument> RmlDocument { get; }
         public IBaseObjectPool<IRmlElement> RmlElement { get; }
         public IBaseObjectPool<IAudio> Audio { get; }
@@ -35,6 +34,7 @@ public class PoolManager : IPoolManager
         public IBaseObjectPool<ILocalVehicle> LocalVehicle { get; }
         public IBaseObjectPool<ILocalPed> LocalPed { get; }
         public IBaseObjectPool<IFont> Font { get; }
+        public IBaseObjectPool<IMarker> Marker { get; }
         public IBaseObjectPool<IColShape> ColShape { get; }
 
         public IPlayerPool Player { get; }
@@ -76,7 +76,8 @@ public PoolManager(
             IBaseObjectPool<IAudioFrontendOutput> audioFrontendOutputPool,
             IBaseObjectPool<IAudioAttachedOutput> audioAttachedOutputPool,
             IBaseObjectPool<IAudioWorldOutput> audioWorldOutputPool,
-            IBaseObjectPool<IFont> fontPool)
+            IBaseObjectPool<IFont> fontPool,
+            IBaseObjectPool<IMarker> markerPool)
         {
             this.Player = playerPool;
             this.Vehicle = vehiclePool;
@@ -102,6 +103,7 @@ public PoolManager(
             AudioAttachedOutput = audioAttachedOutputPool;
             AudioWorldOutput = audioWorldOutputPool;
             Font = fontPool;
+            Marker = markerPool;
         }
 
         ISharedBaseObject ISharedPoolManager.GetOrCreate(ISharedCore core, IntPtr entityPointer, BaseObjectType baseObjectType,
@@ -139,6 +141,7 @@ public IBaseObject GetOrCreate(ICore core, IntPtr entityPointer, BaseObjectType
                 BaseObjectType.AudioOutputFrontend => AudioFrontendOutput.GetOrCreate(core, entityPointer, entityId),
                 BaseObjectType.AudioOutputWorld => AudioWorldOutput.GetOrCreate(core, entityPointer, entityId),
                 BaseObjectType.Font => Font.GetOrCreate(core, entityPointer, entityId),
+                BaseObjectType.Marker => Marker.GetOrCreate(core, entityPointer, entityId),
                 _ => default
             };
         }
@@ -171,6 +174,7 @@ public IBaseObject GetOrCreate(ICore core, IntPtr entityPointer, BaseObjectType
                 BaseObjectType.AudioOutputFrontend => AudioFrontendOutput.GetOrCreate(core, entityPointer),
                 BaseObjectType.AudioOutputWorld => AudioWorldOutput.GetOrCreate(core, entityPointer),
                 BaseObjectType.Font => Font.GetOrCreate(core, entityPointer),
+                BaseObjectType.Marker => Marker.GetOrCreate(core, entityPointer),
                 _ => default
             };
         }
@@ -204,6 +208,7 @@ public IBaseObject Get(IntPtr entityPointer, BaseObjectType baseObjectType)
                 BaseObjectType.AudioOutputFrontend => AudioFrontendOutput.Get(entityPointer),
                 BaseObjectType.AudioOutputWorld => AudioWorldOutput.Get(entityPointer),
                 BaseObjectType.Font => Font.Get(entityPointer),
+                BaseObjectType.Marker => Marker.Get(entityPointer),
                 _ => default
             };
         }
@@ -242,6 +247,7 @@ public bool Remove(IntPtr entityPointer, BaseObjectType baseObjectType)
                 BaseObjectType.AudioOutputFrontend => AudioFrontendOutput.Remove(entityPointer),
                 BaseObjectType.AudioOutputWorld => AudioWorldOutput.Remove(entityPointer),
                 BaseObjectType.Font => Font.Remove(entityPointer),
+                BaseObjectType.Marker => Marker.Remove(entityPointer),
                 _ => default
             };
         }
@@ -272,6 +278,7 @@ public void Dispose()
             AudioFrontendOutput.Dispose();
             AudioWorldOutput.Dispose();
             Font.Dispose();
+            Marker.Dispose();
         }
     }
 }

api/AltV.Net.Client/IResource.cs

@@ -32,6 +32,7 @@ public interface IResource
         public IBaseObjectFactory<IAudioOutput> GetAudioOutputFactory();
         public IBaseObjectFactory<IAudioWorldOutput> GetAudioWorldOutputFactory();
         public IBaseObjectFactory<IFont> GetFontFactory();
+        public IBaseObjectFactory<IMarker> GetMarkerFactory();
         public IBaseObjectFactory<IAudioAttachedOutput> GetAudioAttachedOutputFactory();
         public IBaseObjectFactory<IAudioFrontendOutput> GetAudioFrontendOutputFactory();
         public INativeResourceFactory GetResourceFactory();

api/AltV.Net.Client/ModuleWrapper.cs

@@ -85,13 +85,14 @@ public static void MainWithAssembly(Assembly resourceAssembly, IntPtr resourcePo
             var audioFrontendOutputPool = new AudioFrontendOutputPool(_resource.GetAudioFrontendOutputFactory());
             var audioWorldOutputPool = new AudioWorldOutputPool(_resource.GetAudioWorldOutputFactory());
             var fontPool = new FontPool(_resource.GetFontFactory());
+            var markerPool = new MarkerPool(_resource.GetMarkerFactory());
             var baseBaseObjectPool = new PoolManager(playerPool, vehiclePool, pedPool,
                                                      blipPool, checkpointPool, audioPool,
                                                      httpClientPool, webSocketClientPool, webViewPool,
                                                      rmlElementPool, rmlDocumentPool, objectPool,
                                                      virtualEntityPool, virtualEntityGroupPool,
                                                      textLabelPool, colShapePool, localVehiclePool,
-                                                     localPedPool, audioFilterPool, audioOutputPool, audioFrontendOutputPool, audioAttachedOutputPool, audioWorldOutputPool, fontPool);
+                                                     localPedPool, audioFilterPool, audioOutputPool, audioFrontendOutputPool, audioAttachedOutputPool, audioWorldOutputPool, fontPool, markerPool);
             var timerPool = new TimerPool();
 
             var natives = _resource.GetNatives(library);

api/AltV.Net.Client/Resource.cs

@@ -111,6 +111,11 @@ public virtual IBaseObjectFactory<IFont> GetFontFactory()
             return new FontFactory();
         }
 
+        public virtual IBaseObjectFactory<IMarker> GetMarkerFactory()
+        {
+            return new MarkerFactory();
+        }
+
         public virtual IBaseObjectFactory<IAudioAttachedOutput> GetAudioAttachedOutputFactory()
         {
             return new AudioAttachedOutputFactory();