Merge branch 'dev' into rc

Doxoh · Doxoh · commit bc0a7ee88c67 · 2023-08-06T10:44:05.000+02:00
diff --git a/api/AltV.Net.CApi/Libraries/ClientLibrary.cs b/api/AltV.Net.CApi/Libraries/ClientLibrary.cs
diff --git a/api/AltV.Net.CApi/Libraries/ServerLibrary.cs b/api/AltV.Net.CApi/Libraries/ServerLibrary.cs
@@ -438,7 +438,7 @@ public unsafe interface IServerLibrary
 
     public unsafe class ServerLibrary : IServerLibrary
     {
-        public readonly uint Methods = 1641;
+        public readonly uint Methods = 1647;
         public delegate* unmanaged[Cdecl]<nint, nint, void> BaseObject_DeleteSyncedMetaData { get; }
         public delegate* unmanaged[Cdecl]<nint, nint, nint, void> BaseObject_SetSyncedMetaData { get; }
         public delegate* unmanaged[Cdecl]<nint, nint, void> Blip_AddTargetPlayer { get; }
@@ -1720,7 +1720,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
         public ServerLibrary(Dictionary<ulong, IntPtr> funcTable)
         {
             if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
-            else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 9382033170143343053UL) Outdated = true;
+            else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 4271963963690998474UL) Outdated = true;
             BaseObject_DeleteSyncedMetaData = (delegate* unmanaged[Cdecl]<nint, nint, void>) GetUnmanagedPtr<BaseObject_DeleteSyncedMetaDataDelegate>(funcTable, 8228424877092269355UL, BaseObject_DeleteSyncedMetaDataFallback);
             BaseObject_SetSyncedMetaData = (delegate* unmanaged[Cdecl]<nint, nint, nint, void>) GetUnmanagedPtr<BaseObject_SetSyncedMetaDataDelegate>(funcTable, 8002999088966424231UL, BaseObject_SetSyncedMetaDataFallback);
             Blip_AddTargetPlayer = (delegate* unmanaged[Cdecl]<nint, nint, void>) GetUnmanagedPtr<Blip_AddTargetPlayerDelegate>(funcTable, 12411235729553386187UL, Blip_AddTargetPlayerFallback);
diff --git a/api/AltV.Net.CApi/Libraries/SharedLibrary.cs b/api/AltV.Net.CApi/Libraries/SharedLibrary.cs
@@ -374,7 +374,7 @@ public unsafe interface ISharedLibrary
 
     public unsafe class SharedLibrary : ISharedLibrary
     {
-        public readonly uint Methods = 1641;
+        public readonly uint Methods = 1647;
         public delegate* unmanaged[Cdecl]<nint, uint> Audio_GetID { get; }
         public delegate* unmanaged[Cdecl]<nint, uint> AudioAttachedOutput_GetID { get; }
         public delegate* unmanaged[Cdecl]<nint, uint> AudioFilter_GetID { get; }
@@ -1464,7 +1464,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
         public SharedLibrary(Dictionary<ulong, IntPtr> funcTable)
         {
             if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
-            else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 9382033170143343053UL) Outdated = true;
+            else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 4271963963690998474UL) Outdated = true;
             Audio_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<Audio_GetIDDelegate>(funcTable, 4464042055475980737UL, Audio_GetIDFallback);
             AudioAttachedOutput_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<AudioAttachedOutput_GetIDDelegate>(funcTable, 17725794901805112189UL, AudioAttachedOutput_GetIDFallback);
             AudioFilter_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<AudioFilter_GetIDDelegate>(funcTable, 8824535635529306325UL, AudioFilter_GetIDFallback);
diff --git a/api/AltV.Net.CApi/Native/AltV.Resource.cs b/api/AltV.Net.CApi/Native/AltV.Resource.cs
@@ -112,6 +112,15 @@ internal delegate void VehicleHornDelegate(IntPtr eventPointer, IntPtr targetPoi
             internal delegate void RemoveBaseObjectDelegate(IntPtr baseObject, BaseObjectType type);
 
 
+            internal delegate void RequestSyncedSceneDelegate(IntPtr eventPointer, IntPtr source, int sceneId);
+
+            internal delegate void StartSyncedSceneDelegate(IntPtr source, int sceneId, Position startPosition, Rotation startRotation, uint animDictHash, IntPtr[] entites, BaseObjectType[] types, uint[] animHashes, ulong size);
+
+            internal delegate void StopSyncedSceneDelegate(IntPtr source, int sceneId);
+
+            internal delegate void UpdateSyncedSceneDelegate(IntPtr source, float startRate, int sceneId);
+
+
             [DllImport(DllName, CallingConvention = NativeCallingConvention)]
             internal static extern void CSharpResourceImpl_SetMainDelegate(IntPtr resource,
                 MainDelegate @delegate);
@@ -287,6 +296,10 @@ internal static extern void CSharpResourceImpl_SetCreateBaseObjectDelegate(IntPt
             [DllImport(DllName, CallingConvention = NativeCallingConvention)]
             internal static extern void CSharpResourceImpl_SetRemoveBaseObjectDelegate(IntPtr resource,
                 RemoveBaseObjectDelegate @delegate);
+
+            [DllImport(DllName, CallingConvention = NativeCallingConvention)]
+            internal static extern void CSharpResourceImpl_SetRequestSyncedSceneDelegate(IntPtr resource,
+                RequestSyncedSceneDelegate @delegate);
         }
     }
 }
diff --git a/api/AltV.Net.Client/Alt.Create.cs b/api/AltV.Net.Client/Alt.Create.cs
@@ -16,7 +16,7 @@ public partial class Alt
         public static IWebView CreateWebView(string url, bool isOverlay = false, Vector2? pos = null, Vector2? size = null) => Core.CreateWebView(url, isOverlay, pos, size);
         public static IWebView CreateWebView(string url, uint propHash, string targetTexture) => Core.CreateWebView(url, propHash, targetTexture);
         public static IRmlDocument CreateRmlDocument(string url) => Core.CreateRmlDocument(url);
-        public static IAudio CreateAudio(string source, float volume) => Core.CreateAudio(source, volume);
+        public static IAudio CreateAudio(string source, float volume, bool isRadio = false, string basePath = "") => Core.CreateAudio(source, volume, isRadio, basePath);
         public static IAudioFilter CreateAudioFilter(uint hash) => Core.CreateAudioFilter(hash);
         public static IAudioFrontendOutput CreateFrontendOutput(uint categoryHash) => Core.CreateFrontendOutput(categoryHash);
         public static IAudioWorldOutput CreateWorldOutput(uint categoryHash, Position pos) => Core.CreateWorldOutput(categoryHash, pos);
diff --git a/api/AltV.Net.Client/Core.cs b/api/AltV.Net.Client/Core.cs
@@ -364,22 +364,24 @@ public ICheckpoint CreateCheckpoint(CheckpointType type, Vector3 pos, Vector3 ne
             return PoolManager.Checkpoint.Create(this, ptr, id);
         }
 
-        public IntPtr CreateAudioPtr(out uint id, string source, float volume)
+        public IntPtr CreateAudioPtr(out uint id, string source, float volume, bool isRadio = false, string basePath = "")
         {
             unsafe
             {
                 uint pId = default;
                 var sourcePtr = MemoryUtils.StringToHGlobalUtf8(source);
-                var ptr = Library.Client.Core_CreateAudio(NativePointer, sourcePtr, volume, Resource.NativePointer,  &pId);
+                var basePathPtr = MemoryUtils.StringToHGlobalUtf8(basePath);
+                var ptr = Library.Client.Core_CreateAudio(NativePointer, sourcePtr, volume, isRadio ?(byte)1:(byte)0, basePathPtr, Resource.NativePointer,  &pId);
                 id = pId;
+                Marshal.FreeHGlobal(basePathPtr);
                 Marshal.FreeHGlobal(sourcePtr);
                 return ptr;
             }
         }
 
-        public IAudio CreateAudio(string source, float volume)
+        public IAudio CreateAudio(string source, float volume, bool isRadio = false, string basePath = "")
         {
-            var ptr = CreateAudioPtr(out var id, source, volume);
+            var ptr = CreateAudioPtr(out var id, source, volume, isRadio, basePath);
             if (ptr == IntPtr.Zero) return null;
             return PoolManager.Audio.Create(this, ptr, id);
         }
diff --git a/api/AltV.Net.Client/Elements/Entities/Player.cs b/api/AltV.Net.Client/Elements/Entities/Player.cs
@@ -31,6 +31,35 @@ public Player(ICore core, IntPtr playerPointer, uint id, BaseObjectType baseObje
         }
 
         public virtual bool IsLocal => false;
+        public void AddFilter(IAudioFilter filter)
+        {
+            unsafe
+            {
+                CheckIfEntityExists();
+                Core.Library.Client.Player_AddFilter(PlayerNativePointer, filter.AudioFilterNativePointer);
+            }
+        }
+
+        public void RemoveFilter()
+        {
+            unsafe
+            {
+                CheckIfEntityExists();
+                Core.Library.Client.Player_RemoveFilter(PlayerNativePointer);
+            }
+        }
+
+        public IAudioFilter GetFilter()
+        {
+            unsafe
+            {
+                CheckIfEntityExistsOrCached();
+                var ptr = Core.Library.Client.Player_GetFilter(PlayerNativePointer);
+                if (ptr == IntPtr.Zero) return null;
+
+                return Alt.Core.PoolManager.AudioFilter.Get(ptr);
+            }
+        }
 
         public IVehicle? Vehicle
         {
diff --git a/api/AltV.Net.Client/Elements/Entities/WebView.cs b/api/AltV.Net.Client/Elements/Entities/WebView.cs
@@ -241,6 +241,36 @@ public void Emit(string eventName, params object[] args)
             }
         }
 
+        public void AddOutput(IAudioOutput ouput)
+        {
+            unsafe
+            {
+                CheckIfEntityExists();
+                Core.Library.Client.WebView_AddOutput(WebViewNativePointer, ouput.AudioOutputNativePointer);
+            }
+        }
+
+        public void RemoveOutput(IAudioOutput ouput)
+        {
+            unsafe
+            {
+                CheckIfEntityExists();
+                Core.Library.Client.WebView_RemoveOutput(WebViewNativePointer, ouput.AudioOutputNativePointer);
+            }
+        }
+
+        public List<IAudioOutput> GetOutputs()
+        {
+            unsafe
+            {
+                CheckIfEntityExists();
+                var mvalue = new MValueConst(Core, MValueConst.Type.List, Core.Library.Client.WebView_GetOutputs(WebViewNativePointer));
+                var mList = mvalue.GetList();
+
+                return mList.Select(mValueConst => Core.PoolManager.AudioOutput.Get(mValueConst.nativePointer)).ToList();
+            }
+        }
+
         #endregion
 
     }
diff --git a/api/AltV.Net.Client/Elements/Interfaces/IPlayer.cs b/api/AltV.Net.Client/Elements/Interfaces/IPlayer.cs
@@ -11,5 +11,9 @@ public interface IPlayer : ISharedPlayer, IEntity
         float NonSpatialVolume { get; set; }
         float SpatialVolume { get; set; }
         bool IsLocal { get; }
+
+        void AddFilter(IAudioFilter filter);
+        void RemoveFilter();
+        IAudioFilter GetFilter();
     }
 }
diff --git a/api/AltV.Net.Client/Elements/Interfaces/IWebView.cs b/api/AltV.Net.Client/Elements/Interfaces/IWebView.cs
@@ -17,5 +17,9 @@ public interface IWebView : IBaseObject
         void Focus();
         void Unfocus();
         void Emit(string eventName, params object[] args);
+
+        void AddOutput(IAudioOutput ouput);
+        void RemoveOutput(IAudioOutput ouput);
+        List<IAudioOutput> GetOutputs();
     }
 }
diff --git a/api/AltV.Net.Client/ICore.cs b/api/AltV.Net.Client/ICore.cs
@@ -132,8 +132,8 @@ public interface ICore : ISharedCore
         void ClearTimer(uint id);
         IntPtr CreateCheckpointPtr(out uint id, CheckpointType type, Vector3 pos, Vector3 nextPos, float radius, float height, Rgba color, Rgba iconColor, uint streamingDistance);
         ICheckpoint CreateCheckpoint(CheckpointType type, Vector3 pos, Vector3 nextPos, float radius, float height, Rgba color, Rgba iconColor, uint streamingDistance);
-        IntPtr CreateAudioPtr(out uint id, string source, float volume);
-        IAudio CreateAudio(string source, float volume);
+        IntPtr CreateAudioPtr(out uint id, string source, float volume, bool isRadio = false, string basePath = "");
+        IAudio CreateAudio(string source, float volume, bool isRadio = false, string basePath = "");
 
         IntPtr CreateAudioFilterPtr(out uint id, uint hash);
         IntPtr CreateFrontendOutputPtr(out uint id, uint categoryHash);
diff --git a/api/AltV.Net/Alt.Events.cs b/api/AltV.Net/Alt.Events.cs
@@ -297,5 +297,11 @@ public static event PlayerSpawnDelegate OnPlayerSpawn
             remove => CoreImpl.PlayerSpawnHandler.Remove(value);
         }
 
+        public static event RequestSyncedSceneDelegate OnRequestSyncScene
+        {
+            add => CoreImpl.RequestSyncedSceneHandler.Add(value);
+            remove => CoreImpl.RequestSyncedSceneHandler.Remove(value);
+        }
+
     }
 }
diff --git a/api/AltV.Net/Alt.RegisterEvents.cs b/api/AltV.Net/Alt.RegisterEvents.cs
@@ -681,6 +681,27 @@ public static void RegisterEvents(object target)
                                         };
                                     break;
                                 }
+                                case ScriptEventType.RequestSyncedScene:
+                                {
+                                    scriptFunction = ScriptFunction.Create(eventMethodDelegate,
+                                        new[]
+                                        {
+                                            typeof(IPlayer), typeof(int)
+                                        });
+                                    if (scriptFunction == null) return;
+                                    OnFire += (source, sceneId) =>
+                                    {
+                                        scriptFunction.Set(source);
+                                        scriptFunction.Set(sceneId);
+                                        if (scriptFunction.Call() is bool value)
+                                        {
+                                            return value;
+                                        }
+
+                                        return true;
+                                    };
+                                    break;
+                                }
                                 default:
                                     throw new ArgumentOutOfRangeException();
                             }
diff --git a/api/AltV.Net/CSharpResourceImpl.cs b/api/AltV.Net/CSharpResourceImpl.cs
@@ -200,6 +200,11 @@ internal void SetDelegates(AltNative.Resource.MainDelegate onStart)
             handles.AddFirst(GCHandle.Alloc(onRemoveRemoveBaseObject));
             AltNative.Resource.CSharpResourceImpl_SetRemoveBaseObjectDelegate(NativePointer, onRemoveRemoveBaseObject);
 
+            AltNative.Resource.RequestSyncedSceneDelegate onRequestSyncedSceneDelegate =
+                ModuleWrapper.OnRequestSyncedScene;
+            handles.AddFirst(GCHandle.Alloc(onRequestSyncedSceneDelegate));
+            AltNative.Resource.CSharpResourceImpl_SetRequestSyncedSceneDelegate(NativePointer, onRequestSyncedSceneDelegate);
+
         }
 
         public void Dispose()
diff --git a/api/AltV.Net/Core.Events.cs b/api/AltV.Net/Core.Events.cs
diff --git a/api/AltV.Net/Events/Events.cs b/api/AltV.Net/Events/Events.cs
diff --git a/api/AltV.Net/ModuleWrapper.cs b/api/AltV.Net/ModuleWrapper.cs
diff --git a/api/AltV.Net/ScriptEventType.cs b/api/AltV.Net/ScriptEventType.cs
diff --git a/runtime b/runtime

Original file line number	Diff line number	Diff line change
`@@ -364,22 +364,24 @@ public ICheckpoint CreateCheckpoint(CheckpointType type, Vector3 pos, Vector3 ne`
`364`	`364`	`return PoolManager.Checkpoint.Create(this, ptr, id);`
`365`	`365`	`}`
`366`	`366`
`367`		`- public IntPtr CreateAudioPtr(out uint id, string source, float volume)`
	`367`	`+ public IntPtr CreateAudioPtr(out uint id, string source, float volume, bool isRadio = false, string basePath = "")`
`368`	`368`	`{`
`369`	`369`	`unsafe`
`370`	`370`	`{`
`371`	`371`	`uint pId = default;`
`372`	`372`	`var sourcePtr = MemoryUtils.StringToHGlobalUtf8(source);`
`373`		`- var ptr = Library.Client.Core_CreateAudio(NativePointer, sourcePtr, volume, Resource.NativePointer, &pId);`
	`373`	`+ var basePathPtr = MemoryUtils.StringToHGlobalUtf8(basePath);`
	`374`	`+ var ptr = Library.Client.Core_CreateAudio(NativePointer, sourcePtr, volume, isRadio ?(byte)1:(byte)0, basePathPtr, Resource.NativePointer, &pId);`
`374`	`375`	`id = pId;`
	`376`	`+ Marshal.FreeHGlobal(basePathPtr);`
`375`	`377`	`Marshal.FreeHGlobal(sourcePtr);`
`376`	`378`	`return ptr;`
`377`	`379`	`}`
`378`	`380`	`}`
`379`	`381`
`380`		`- public IAudio CreateAudio(string source, float volume)`
	`382`	`+ public IAudio CreateAudio(string source, float volume, bool isRadio = false, string basePath = "")`
`381`	`383`	`{`
`382`		`- var ptr = CreateAudioPtr(out var id, source, volume);`
	`384`	`+ var ptr = CreateAudioPtr(out var id, source, volume, isRadio, basePath);`
`383`	`385`	`if (ptr == IntPtr.Zero) return null;`
`384`	`386`	`return PoolManager.Audio.Create(this, ptr, id);`
`385`	`387`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,9 @@ public interface IPlayer : ISharedPlayer, IEntity`
`11`	`11`	`float NonSpatialVolume { get; set; }`
`12`	`12`	`float SpatialVolume { get; set; }`
`13`	`13`	`bool IsLocal { get; }`
	`14`	`+`
	`15`	`+ void AddFilter(IAudioFilter filter);`
	`16`	`+ void RemoveFilter();`
	`17`	`+ IAudioFilter GetFilter();`
`14`	`18`	`}`
`15`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,9 @@ public interface IWebView : IBaseObject`
`17`	`17`	`void Focus();`
`18`	`18`	`void Unfocus();`
`19`	`19`	`void Emit(string eventName, params object[] args);`
	`20`	`+`
	`21`	`+ void AddOutput(IAudioOutput ouput);`
	`22`	`+ void RemoveOutput(IAudioOutput ouput);`
	`23`	`+ List<IAudioOutput> GetOutputs();`
`20`	`24`	`}`
`21`	`25`	`}`