diff --git a/Facepunch.Steamworks/Generated/CustomEnums.cs b/Facepunch.Steamworks/Generated/CustomEnums.cs index 021e711..f4594b2 100644 --- a/Facepunch.Steamworks/Generated/CustomEnums.cs +++ b/Facepunch.Steamworks/Generated/CustomEnums.cs @@ -71,7 +71,7 @@ namespace Steamworks CheckFileSignature = 705, GamepadTextInputDismissed = 714, AppResumingFromSuspend = 736, - ModalGamepadTextInputDismissed = 738, + FloatingGamepadTextInputDismissed = 738, DlcInstalled = 1005, RegisterActivationCodeResponse = 1008, NewUrlLaunchParameters = 1014, @@ -97,6 +97,7 @@ namespace Steamworks P2PSessionConnectFail = 1203, SteamNetConnectionStatusChangedCallback = 1221, SteamNetAuthenticationStatus = 1222, + SteamNetworkingFakeIPResult = 1223, SteamNetworkingMessagesSessionRequest = 1251, SteamNetworkingMessagesSessionFailed = 1252, SteamRelayNetworkStatus = 1281, @@ -287,7 +288,7 @@ namespace Steamworks { CallbackType.CheckFileSignature, typeof( CheckFileSignature_t )}, { CallbackType.GamepadTextInputDismissed, typeof( GamepadTextInputDismissed_t )}, { CallbackType.AppResumingFromSuspend, typeof( AppResumingFromSuspend_t )}, - { CallbackType.ModalGamepadTextInputDismissed, typeof( ModalGamepadTextInputDismissed_t )}, + { CallbackType.FloatingGamepadTextInputDismissed, typeof( FloatingGamepadTextInputDismissed_t )}, { CallbackType.DlcInstalled, typeof( DlcInstalled_t )}, { CallbackType.RegisterActivationCodeResponse, typeof( RegisterActivationCodeResponse_t )}, { CallbackType.NewUrlLaunchParameters, typeof( NewUrlLaunchParameters_t )}, @@ -311,6 +312,7 @@ namespace Steamworks { CallbackType.P2PSessionConnectFail, typeof( P2PSessionConnectFail_t )}, { CallbackType.SteamNetConnectionStatusChangedCallback, typeof( SteamNetConnectionStatusChangedCallback_t )}, { CallbackType.SteamNetAuthenticationStatus, typeof( SteamNetAuthenticationStatus_t )}, + { CallbackType.SteamNetworkingFakeIPResult, typeof( SteamNetworkingFakeIPResult_t )}, { CallbackType.SteamNetworkingMessagesSessionRequest, typeof( SteamNetworkingMessagesSessionRequest_t )}, { CallbackType.SteamNetworkingMessagesSessionFailed, typeof( SteamNetworkingMessagesSessionFailed_t )}, { CallbackType.SteamRelayNetworkStatus, typeof( SteamRelayNetworkStatus_t )}, diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingFakeUDPPort.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingFakeUDPPort.cs new file mode 100644 index 0000000..776ab8a --- /dev/null +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingFakeUDPPort.cs @@ -0,0 +1,61 @@ +using System; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; +using Steamworks.Data; + + +namespace Steamworks +{ + internal unsafe class ISteamNetworkingFakeUDPPort : SteamInterface + { + + internal ISteamNetworkingFakeUDPPort( bool IsGameServer ) + { + SetupInterface( IsGameServer ); + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingFakeUDPPort_DestroyFakeUDPPort", CallingConvention = Platform.CC)] + private static extern void _DestroyFakeUDPPort( IntPtr self ); + + #endregion + internal void DestroyFakeUDPPort() + { + _DestroyFakeUDPPort( Self ); + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingFakeUDPPort_SendMessageToFakeIP", CallingConvention = Platform.CC)] + private static extern Result _SendMessageToFakeIP( IntPtr self, ref NetAddress remoteAddress, IntPtr pData, uint cbData, int nSendFlags ); + + #endregion + internal Result SendMessageToFakeIP( ref NetAddress remoteAddress, IntPtr pData, uint cbData, int nSendFlags ) + { + var returnValue = _SendMessageToFakeIP( Self, ref remoteAddress, pData, cbData, nSendFlags ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingFakeUDPPort_ReceiveMessages", CallingConvention = Platform.CC)] + private static extern int _ReceiveMessages( IntPtr self, IntPtr ppOutMessages, int nMaxMessages ); + + #endregion + internal int ReceiveMessages( IntPtr ppOutMessages, int nMaxMessages ) + { + var returnValue = _ReceiveMessages( Self, ppOutMessages, nMaxMessages ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingFakeUDPPort_ScheduleCleanup", CallingConvention = Platform.CC)] + private static extern void _ScheduleCleanup( IntPtr self, ref NetAddress remoteAddress ); + + #endregion + internal void ScheduleCleanup( ref NetAddress remoteAddress ) + { + _ScheduleCleanup( Self, ref remoteAddress ); + } + + } +} diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs index b3a54d9..6314fe8 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs @@ -15,12 +15,12 @@ namespace Steamworks SetupInterface( IsGameServer ); } - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingSockets_SteamAPI_v011", CallingConvention = Platform.CC)] - internal static extern IntPtr SteamAPI_SteamNetworkingSockets_SteamAPI_v011(); - public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamNetworkingSockets_SteamAPI_v011(); - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v011", CallingConvention = Platform.CC)] - internal static extern IntPtr SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v011(); - public override IntPtr GetServerInterfacePointer() => SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v011(); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingSockets_SteamAPI_v012", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamNetworkingSockets_SteamAPI_v012(); + public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamNetworkingSockets_SteamAPI_v012(); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v012", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v012(); + public override IntPtr GetServerInterfacePointer() => SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v012(); #region FunctionMeta @@ -205,14 +205,13 @@ namespace Steamworks } #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_GetQuickConnectionStatus", CallingConvention = Platform.CC)] - [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _GetQuickConnectionStatus( IntPtr self, Connection hConn, ref ConnectionStatus pStats ); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_GetConnectionRealTimeStatus", CallingConvention = Platform.CC)] + private static extern Result _GetConnectionRealTimeStatus( IntPtr self, Connection hConn, ref ConnectionStatus pStatus, int nLanes, [In,Out] ConnectionLaneStatus[] pLanes ); #endregion - internal bool GetQuickConnectionStatus( Connection hConn, ref ConnectionStatus pStats ) + internal Result GetConnectionRealTimeStatus( Connection hConn, ref ConnectionStatus pStatus, int nLanes, [In,Out] ConnectionLaneStatus[] pLanes ) { - var returnValue = _GetQuickConnectionStatus( Self, hConn, ref pStats ); + var returnValue = _GetConnectionRealTimeStatus( Self, hConn, ref pStatus, nLanes, pLanes ); return returnValue; } @@ -253,6 +252,17 @@ namespace Steamworks return returnValue; } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_ConfigureConnectionLanes", CallingConvention = Platform.CC)] + private static extern Result _ConfigureConnectionLanes( IntPtr self, Connection hConn, int nNumLanes, ref int pLanePriorities, ref ushort pLaneWeights ); + + #endregion + internal Result ConfigureConnectionLanes( Connection hConn, int nNumLanes, ref int pLanePriorities, ref ushort pLaneWeights ) + { + var returnValue = _ConfigureConnectionLanes( Self, hConn, nNumLanes, ref pLanePriorities, ref pLaneWeights ); + return returnValue; + } + #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_GetIdentity", CallingConvention = Platform.CC)] [return: MarshalAs( UnmanagedType.I1 )] @@ -489,5 +499,16 @@ namespace Steamworks _RunCallbacks( Self ); } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_CreateFakeUDPPort", CallingConvention = Platform.CC)] + private static extern IntPtr _CreateFakeUDPPort( IntPtr self, int idxFakeServerPort ); + + #endregion + internal IntPtr CreateFakeUDPPort( int idxFakeServerPort ) + { + var returnValue = _CreateFakeUDPPort( Self, idxFakeServerPort ); + return returnValue; + } + } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs index fa8c4f9..eb1ec1b 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs @@ -15,12 +15,12 @@ namespace Steamworks SetupInterface( IsGameServer ); } - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamUGC_v015", CallingConvention = Platform.CC)] - internal static extern IntPtr SteamAPI_SteamUGC_v015(); - public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamUGC_v015(); - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamGameServerUGC_v015", CallingConvention = Platform.CC)] - internal static extern IntPtr SteamAPI_SteamGameServerUGC_v015(); - public override IntPtr GetServerInterfacePointer() => SteamAPI_SteamGameServerUGC_v015(); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamUGC_v016", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamUGC_v016(); + public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamUGC_v016(); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamGameServerUGC_v016", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamGameServerUGC_v016(); + public override IntPtr GetServerInterfacePointer() => SteamAPI_SteamGameServerUGC_v016(); #region FunctionMeta @@ -465,6 +465,30 @@ namespace Steamworks return returnValue; } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUGC_SetTimeCreatedDateRange", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _SetTimeCreatedDateRange( IntPtr self, UGCQueryHandle_t handle, RTime32 rtStart, RTime32 rtEnd ); + + #endregion + internal bool SetTimeCreatedDateRange( UGCQueryHandle_t handle, RTime32 rtStart, RTime32 rtEnd ) + { + var returnValue = _SetTimeCreatedDateRange( Self, handle, rtStart, rtEnd ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUGC_SetTimeUpdatedDateRange", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _SetTimeUpdatedDateRange( IntPtr self, UGCQueryHandle_t handle, RTime32 rtStart, RTime32 rtEnd ); + + #endregion + internal bool SetTimeUpdatedDateRange( UGCQueryHandle_t handle, RTime32 rtStart, RTime32 rtEnd ) + { + var returnValue = _SetTimeUpdatedDateRange( Self, handle, rtStart, rtEnd ); + return returnValue; + } + #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUGC_AddRequiredKeyValueTag", CallingConvention = Platform.CC)] [return: MarshalAs( UnmanagedType.I1 )] diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs index 22ffada..f0a4cf5 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs @@ -400,14 +400,14 @@ namespace Steamworks } #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUtils_ShowModalGamepadTextInput", CallingConvention = Platform.CC)] + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUtils_ShowFloatingGamepadTextInput", CallingConvention = Platform.CC)] [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _ShowModalGamepadTextInput( IntPtr self, GamepadTextInputLineMode eLineInputMode ); + private static extern bool _ShowFloatingGamepadTextInput( IntPtr self, TextInputMode eKeyboardMode, int nTextFieldXPosition, int nTextFieldYPosition, int nTextFieldWidth, int nTextFieldHeight ); #endregion - internal bool ShowModalGamepadTextInput( GamepadTextInputLineMode eLineInputMode ) + internal bool ShowFloatingGamepadTextInput( TextInputMode eKeyboardMode, int nTextFieldXPosition, int nTextFieldYPosition, int nTextFieldWidth, int nTextFieldHeight ) { - var returnValue = _ShowModalGamepadTextInput( Self, eLineInputMode ); + var returnValue = _ShowFloatingGamepadTextInput( Self, eKeyboardMode, nTextFieldXPosition, nTextFieldYPosition, nTextFieldWidth, nTextFieldHeight ); return returnValue; } @@ -421,5 +421,17 @@ namespace Steamworks _SetGameLauncherMode( Self, bLauncherMode ); } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUtils_DismissFloatingGamepadTextInput", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _DismissFloatingGamepadTextInput( IntPtr self ); + + #endregion + internal bool DismissFloatingGamepadTextInput() + { + var returnValue = _DismissFloatingGamepadTextInput( Self ); + return returnValue; + } + } } diff --git a/Facepunch.Steamworks/Generated/SteamCallbacks.cs b/Facepunch.Steamworks/Generated/SteamCallbacks.cs index a3f9eae..1065d28 100644 --- a/Facepunch.Steamworks/Generated/SteamCallbacks.cs +++ b/Facepunch.Steamworks/Generated/SteamCallbacks.cs @@ -573,13 +573,13 @@ namespace Steamworks.Data } [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] - internal struct ModalGamepadTextInputDismissed_t : ICallbackData + internal struct FloatingGamepadTextInputDismissed_t : ICallbackData { #region SteamCallback - public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(ModalGamepadTextInputDismissed_t) ); + public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(FloatingGamepadTextInputDismissed_t) ); public int DataSize => _datasize; - public CallbackType CallbackType => CallbackType.ModalGamepadTextInputDismissed; + public CallbackType CallbackType => CallbackType.FloatingGamepadTextInputDismissed; #endregion } @@ -1849,6 +1849,10 @@ namespace Steamworks.Data internal ulong ContextValue; // m_ulContextValue uint64 [MarshalAs(UnmanagedType.I1)] internal bool RequestSuccessful; // m_bRequestSuccessful bool + [MarshalAs(UnmanagedType.I1)] + internal bool TMP_bSuccessfulA; // m_TMP_bSuccessfulA bool + [MarshalAs(UnmanagedType.I1)] + internal bool TMP_bSuccessfulB; // m_TMP_bSuccessfulB bool internal HTTPStatusCode StatusCode; // m_eStatusCode EHTTPStatusCode internal uint BodySize; // m_unBodySize uint32 @@ -2985,4 +2989,20 @@ namespace Steamworks.Data #endregion } + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] + internal struct SteamNetworkingFakeIPResult_t : ICallbackData + { + internal Result Result; // m_eResult EResult + internal NetIdentity Dentity; // m_identity SteamNetworkingIdentity + internal uint IP; // m_unIP uint32 + [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8, ArraySubType = UnmanagedType.U2)] + internal ushort[] Ports; // m_unPorts uint16 [8] + + #region SteamCallback + public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(SteamNetworkingFakeIPResult_t) ); + public int DataSize => _datasize; + public CallbackType CallbackType => CallbackType.SteamNetworkingFakeIPResult; + #endregion + } + } diff --git a/Facepunch.Steamworks/Generated/SteamConstants.cs b/Facepunch.Steamworks/Generated/SteamConstants.cs index e80c98b..fcdd12f 100644 --- a/Facepunch.Steamworks/Generated/SteamConstants.cs +++ b/Facepunch.Steamworks/Generated/SteamConstants.cs @@ -64,6 +64,7 @@ namespace Steamworks.Data internal static readonly int k_cchMaxSteamNetworkingErrMsg = 1024; internal static readonly int k_cchSteamNetworkingMaxConnectionCloseReason = 128; internal static readonly int k_cchSteamNetworkingMaxConnectionDescription = 128; + internal static readonly int k_cchSteamNetworkingMaxConnectionAppName = 32; internal static readonly int k_nSteamNetworkConnectionInfoFlags_Unauthenticated = 1; internal static readonly int k_nSteamNetworkConnectionInfoFlags_Unencrypted = 2; internal static readonly int k_nSteamNetworkConnectionInfoFlags_LoopbackBuffers = 4; @@ -95,5 +96,7 @@ namespace Steamworks.Data internal static readonly uint k_cbSteamDatagramMaxSerializedTicket = 512; internal static readonly uint k_cbMaxSteamDatagramGameCoordinatorServerLoginAppData = 2048; internal static readonly uint k_cbMaxSteamDatagramGameCoordinatorServerLoginSerialized = 4096; + internal static readonly int k_cbSteamNetworkingSocketsFakeUDPPortRecommendedMTU = 1200; + internal static readonly int k_cbSteamNetworkingSocketsFakeUDPPortMaxMessageSize = 4096; } } diff --git a/Facepunch.Steamworks/Generated/SteamEnums.cs b/Facepunch.Steamworks/Generated/SteamEnums.cs index 8b8e579..abf3f9b 100644 --- a/Facepunch.Steamworks/Generated/SteamEnums.cs +++ b/Facepunch.Steamworks/Generated/SteamEnums.cs @@ -9,19 +9,9 @@ namespace Steamworks // // ESteamIPType // - /// - /// Specifies the type of IP. - /// internal enum SteamIPType : int { - /// - /// IPv4 - /// Type4 = 0, - - /// - /// IPv6 - /// Type6 = 1, } @@ -41,9 +31,6 @@ namespace Steamworks // // EResult // - /// - /// Determines the result of a request. - /// public enum Result : int { None = 0, @@ -168,6 +155,7 @@ namespace Steamworks SteamRealmMismatch = 120, InvalidSignature = 121, ParseFailure = 122, + NoVerifiedPhone = 123, } // @@ -608,6 +596,17 @@ namespace Steamworks MultipleLines = 1, } + // + // EFloatingGamepadTextInputMode + // + public enum TextInputMode : int + { + SingleLine = 0, + MultipleLines = 1, + Email = 2, + Numeric = 3, + } + // // ETextFilteringContext // @@ -1358,7 +1357,80 @@ namespace Steamworks PS5_Reserved18 = 330, PS5_Reserved19 = 331, PS5_Reserved20 = 332, - Count = 333, + SteamDeck_A = 333, + SteamDeck_B = 334, + SteamDeck_X = 335, + SteamDeck_Y = 336, + SteamDeck_L1 = 337, + SteamDeck_R1 = 338, + SteamDeck_Menu = 339, + SteamDeck_View = 340, + SteamDeck_LeftPad_Touch = 341, + SteamDeck_LeftPad_Swipe = 342, + SteamDeck_LeftPad_Click = 343, + SteamDeck_LeftPad_DPadNorth = 344, + SteamDeck_LeftPad_DPadSouth = 345, + SteamDeck_LeftPad_DPadWest = 346, + SteamDeck_LeftPad_DPadEast = 347, + SteamDeck_RightPad_Touch = 348, + SteamDeck_RightPad_Swipe = 349, + SteamDeck_RightPad_Click = 350, + SteamDeck_RightPad_DPadNorth = 351, + SteamDeck_RightPad_DPadSouth = 352, + SteamDeck_RightPad_DPadWest = 353, + SteamDeck_RightPad_DPadEast = 354, + SteamDeck_L2_SoftPull = 355, + SteamDeck_L2 = 356, + SteamDeck_R2_SoftPull = 357, + SteamDeck_R2 = 358, + SteamDeck_LeftStick_Move = 359, + SteamDeck_L3 = 360, + SteamDeck_LeftStick_DPadNorth = 361, + SteamDeck_LeftStick_DPadSouth = 362, + SteamDeck_LeftStick_DPadWest = 363, + SteamDeck_LeftStick_DPadEast = 364, + SteamDeck_LeftStick_Touch = 365, + SteamDeck_RightStick_Move = 366, + SteamDeck_R3 = 367, + SteamDeck_RightStick_DPadNorth = 368, + SteamDeck_RightStick_DPadSouth = 369, + SteamDeck_RightStick_DPadWest = 370, + SteamDeck_RightStick_DPadEast = 371, + SteamDeck_RightStick_Touch = 372, + SteamDeck_L4 = 373, + SteamDeck_R4 = 374, + SteamDeck_L5 = 375, + SteamDeck_R5 = 376, + SteamDeck_DPad_Move = 377, + SteamDeck_DPad_North = 378, + SteamDeck_DPad_South = 379, + SteamDeck_DPad_West = 380, + SteamDeck_DPad_East = 381, + SteamDeck_Gyro_Move = 382, + SteamDeck_Gyro_Pitch = 383, + SteamDeck_Gyro_Yaw = 384, + SteamDeck_Gyro_Roll = 385, + SteamDeck_Reserved1 = 386, + SteamDeck_Reserved2 = 387, + SteamDeck_Reserved3 = 388, + SteamDeck_Reserved4 = 389, + SteamDeck_Reserved5 = 390, + SteamDeck_Reserved6 = 391, + SteamDeck_Reserved7 = 392, + SteamDeck_Reserved8 = 393, + SteamDeck_Reserved9 = 394, + SteamDeck_Reserved10 = 395, + SteamDeck_Reserved11 = 396, + SteamDeck_Reserved12 = 397, + SteamDeck_Reserved13 = 398, + SteamDeck_Reserved14 = 399, + SteamDeck_Reserved15 = 400, + SteamDeck_Reserved16 = 401, + SteamDeck_Reserved17 = 402, + SteamDeck_Reserved18 = 403, + SteamDeck_Reserved19 = 404, + SteamDeck_Reserved20 = 405, + Count = 406, MaximumPossibleValue = 32767, } @@ -1479,6 +1551,19 @@ namespace Steamworks Small = 0, Medium = 1, Large = 2, + Count = 3, + } + + // + // ESteamInputGlyphStyle + // + internal enum SteamInputGlyphStyle : int + { + Standard = 0, + Light = 1, + Dark = 2, + NeutralColorABXY = 16, + OutlineOnlyABXY = 32, } // @@ -1800,7 +1885,80 @@ namespace Steamworks XBoxOne_RightGrip_Lower = 302, XBoxOne_RightGrip_Upper = 303, XBoxOne_Share = 304, - Count = 305, + SteamDeck_A = 305, + SteamDeck_B = 306, + SteamDeck_X = 307, + SteamDeck_Y = 308, + SteamDeck_L1 = 309, + SteamDeck_R1 = 310, + SteamDeck_Menu = 311, + SteamDeck_View = 312, + SteamDeck_LeftPad_Touch = 313, + SteamDeck_LeftPad_Swipe = 314, + SteamDeck_LeftPad_Click = 315, + SteamDeck_LeftPad_DPadNorth = 316, + SteamDeck_LeftPad_DPadSouth = 317, + SteamDeck_LeftPad_DPadWest = 318, + SteamDeck_LeftPad_DPadEast = 319, + SteamDeck_RightPad_Touch = 320, + SteamDeck_RightPad_Swipe = 321, + SteamDeck_RightPad_Click = 322, + SteamDeck_RightPad_DPadNorth = 323, + SteamDeck_RightPad_DPadSouth = 324, + SteamDeck_RightPad_DPadWest = 325, + SteamDeck_RightPad_DPadEast = 326, + SteamDeck_L2_SoftPull = 327, + SteamDeck_L2 = 328, + SteamDeck_R2_SoftPull = 329, + SteamDeck_R2 = 330, + SteamDeck_LeftStick_Move = 331, + SteamDeck_L3 = 332, + SteamDeck_LeftStick_DPadNorth = 333, + SteamDeck_LeftStick_DPadSouth = 334, + SteamDeck_LeftStick_DPadWest = 335, + SteamDeck_LeftStick_DPadEast = 336, + SteamDeck_LeftStick_Touch = 337, + SteamDeck_RightStick_Move = 338, + SteamDeck_R3 = 339, + SteamDeck_RightStick_DPadNorth = 340, + SteamDeck_RightStick_DPadSouth = 341, + SteamDeck_RightStick_DPadWest = 342, + SteamDeck_RightStick_DPadEast = 343, + SteamDeck_RightStick_Touch = 344, + SteamDeck_L4 = 345, + SteamDeck_R4 = 346, + SteamDeck_L5 = 347, + SteamDeck_R5 = 348, + SteamDeck_DPad_Move = 349, + SteamDeck_DPad_North = 350, + SteamDeck_DPad_South = 351, + SteamDeck_DPad_West = 352, + SteamDeck_DPad_East = 353, + SteamDeck_Gyro_Move = 354, + SteamDeck_Gyro_Pitch = 355, + SteamDeck_Gyro_Yaw = 356, + SteamDeck_Gyro_Roll = 357, + SteamDeck_Reserved1 = 358, + SteamDeck_Reserved2 = 359, + SteamDeck_Reserved3 = 360, + SteamDeck_Reserved4 = 361, + SteamDeck_Reserved5 = 362, + SteamDeck_Reserved6 = 363, + SteamDeck_Reserved7 = 364, + SteamDeck_Reserved8 = 365, + SteamDeck_Reserved9 = 366, + SteamDeck_Reserved10 = 367, + SteamDeck_Reserved11 = 368, + SteamDeck_Reserved12 = 369, + SteamDeck_Reserved13 = 370, + SteamDeck_Reserved14 = 371, + SteamDeck_Reserved15 = 372, + SteamDeck_Reserved16 = 373, + SteamDeck_Reserved17 = 374, + SteamDeck_Reserved18 = 375, + SteamDeck_Reserved19 = 376, + SteamDeck_Reserved20 = 377, + Count = 378, MaximumPossibleValue = 32767, } @@ -2127,6 +2285,7 @@ namespace Steamworks SymmetricConnect = 37, LocalVirtualPort = 38, DualWifi_Enable = 39, + EnableDiagnosticsUI = 46, FakePacketLoss_Send = 2, FakePacketLoss_Recv = 3, FakePacketLag_Send = 4, diff --git a/Facepunch.Steamworks/Generated/SteamStructFunctions.cs b/Facepunch.Steamworks/Generated/SteamStructFunctions.cs index acd40ef..8803701 100644 --- a/Facepunch.Steamworks/Generated/SteamStructFunctions.cs +++ b/Facepunch.Steamworks/Generated/SteamStructFunctions.cs @@ -193,13 +193,6 @@ namespace Steamworks.Data } - internal partial struct NetIdentityRender - { - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingIdentityRender_c_str", CallingConvention = Platform.CC)] - internal static extern Utf8StringPointer Internalc_str( ref NetIdentityRender self ); - - } - public partial struct NetAddress { [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingIPAddr_Clear", CallingConvention = Platform.CC)] @@ -242,13 +235,6 @@ namespace Steamworks.Data } - internal partial struct NetAddressRender - { - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingIPAddrRender_c_str", CallingConvention = Platform.CC)] - internal static extern Utf8StringPointer Internalc_str( ref NetAddressRender self ); - - } - internal partial struct NetMsg { [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingMessage_t_Release", CallingConvention = Platform.CC)] @@ -256,11 +242,4 @@ namespace Steamworks.Data } - internal partial struct SteamNetworkingPOPIDRender - { - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingPOPIDRender_c_str", CallingConvention = Platform.CC)] - internal static extern Utf8StringPointer Internalc_str( ref SteamNetworkingPOPIDRender self ); - - } - } diff --git a/Facepunch.Steamworks/Generated/SteamStructs.cs b/Facepunch.Steamworks/Generated/SteamStructs.cs index cbc42b1..c6f03b4 100644 --- a/Facepunch.Steamworks/Generated/SteamStructs.cs +++ b/Facepunch.Steamworks/Generated/SteamStructs.cs @@ -110,8 +110,7 @@ namespace Steamworks.Data { internal ulong ControllerHandle; // controllerHandle InputHandle_t internal SteamInputActionEventType EEventType; // eEventType ESteamInputActionEventType - internal ulong AnalogAction_actionHandle; // analogAction_actionHandle InputAnalogActionHandle_t - internal AnalogState AnalogAction_analogActionData; // analogAction_analogActionData InputAnalogActionData_t + // internal SteamInputActionEvent_t.AnalogAction_t AnalogAction; // analogAction SteamInputActionEvent_t::AnalogAction_t } @@ -170,33 +169,6 @@ namespace Steamworks.Data } - [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] - internal partial struct SteamNetworkingPOPIDRender - { - internal string BufUTF8() => System.Text.Encoding.UTF8.GetString( Buf, 0, System.Array.IndexOf( Buf, 0 ) ); - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)] // byte[] buf - internal byte[] Buf; // buf char [8] - - } - - [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] - internal partial struct NetIdentityRender - { - internal string BufUTF8() => System.Text.Encoding.UTF8.GetString( Buf, 0, System.Array.IndexOf( Buf, 0 ) ); - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)] // byte[] buf - internal byte[] Buf; // buf char [128] - - } - - [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] - internal partial struct NetAddressRender - { - internal string BufUTF8() => System.Text.Encoding.UTF8.GetString( Buf, 0, System.Array.IndexOf( Buf, 0 ) ); - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 48)] // byte[] buf - internal byte[] Buf; // buf char [48] - - } - [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] internal partial struct SteamDatagramHostedAddress { diff --git a/Facepunch.Steamworks/Networking/Connection.cs b/Facepunch.Steamworks/Networking/Connection.cs index 41bde2a..34a6bb5 100644 --- a/Facepunch.Steamworks/Networking/Connection.cs +++ b/Facepunch.Steamworks/Networking/Connection.cs @@ -153,7 +153,7 @@ namespace Steamworks.Data { ConnectionStatus connectionStatus = default( ConnectionStatus ); - SteamNetworkingSockets.Internal.GetQuickConnectionStatus( this, ref connectionStatus ); + SteamNetworkingSockets.Internal.GetConnectionRealTimeStatus( this, ref connectionStatus, 0, null ); return connectionStatus; } diff --git a/Facepunch.Steamworks/Networking/ConnectionLaneStatus.cs b/Facepunch.Steamworks/Networking/ConnectionLaneStatus.cs new file mode 100644 index 0000000..a109542 --- /dev/null +++ b/Facepunch.Steamworks/Networking/ConnectionLaneStatus.cs @@ -0,0 +1,34 @@ +using System.Runtime.InteropServices; + +namespace Steamworks.Data +{ + /// + /// Describe the status of a connection + /// + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] + public struct ConnectionLaneStatus + { + internal int cbPendingUnreliable; // m_cbPendingUnreliable int + internal int cbPendingReliable; // m_cbPendingReliable int + internal int cbSentUnackedReliable; // m_cbSentUnackedReliable int + internal int _reservePad1; // _reservePad1 int + internal long ecQueueTime; // m_usecQueueTime SteamNetworkingMicroseconds + [MarshalAs( UnmanagedType.ByValArray, SizeConst = 10, ArraySubType = UnmanagedType.U4 )] + internal uint[] reserved; // reserved uint32 [10] + + /// + /// Number of bytes unreliable data pending to be sent. This is data that you have recently requested to be sent but has not yet actually been put on the wire. + /// + public int PendingUnreliable => cbPendingUnreliable; + + /// + /// Number of bytes reliable data pending to be sent. This is data that you have recently requested to be sent but has not yet actually been put on the wire. + /// + public int PendingReliable => cbPendingReliable; + + /// + /// Number of bytes of reliable data that has been placed the wire, but for which we have not yet received an acknowledgment, and thus we may have to re-transmit. + /// + public int SentUnackedReliable => cbSentUnackedReliable; + } +} \ No newline at end of file