diff options
author | Joe Ludwig <joe@valvesoftware.com> | 2016-05-24 21:20:46 +0300 |
---|---|---|
committer | Joe Ludwig <joe@valvesoftware.com> | 2016-05-24 21:20:46 +0300 |
commit | 063f93e587e80a204233fa088a52ecb493365273 (patch) | |
tree | b7d2fa043fe93f4aa3f19156f33ffbaa6a2363d8 | |
parent | 35e6fd3e256698df7ec4ac652c50fdb4fd338846 (diff) |
Fixed issues with C# code generation.v1.0.0
[git-p4: depot-paths = "//vr/steamvr/sdk_release/": change = 3466598]
-rw-r--r-- | headers/openvr_api.cs | 20 | ||||
-rw-r--r-- | unity_package/Assets/Plugins/openvr_api.cs | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/headers/openvr_api.cs b/headers/openvr_api.cs index d4264ee..6d1c8ed 100644 --- a/headers/openvr_api.cs +++ b/headers/openvr_api.cs @@ -1436,7 +1436,7 @@ public class CVRSystem public string GetPropErrorNameFromEnum(ETrackedPropertyError error) { IntPtr result = FnTable.GetPropErrorNameFromEnum(error); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public bool PollNextEvent(ref VREvent_t pEvent,uint uncbVREvent) { @@ -1451,7 +1451,7 @@ public class CVRSystem public string GetEventTypeNameFromEnum(EVREventType eType) { IntPtr result = FnTable.GetEventTypeNameFromEnum(eType); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public HiddenAreaMesh_t GetHiddenAreaMesh(EVREye eEye) { @@ -1475,12 +1475,12 @@ public class CVRSystem public string GetButtonIdNameFromEnum(EVRButtonId eButtonId) { IntPtr result = FnTable.GetButtonIdNameFromEnum(eButtonId); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public string GetControllerAxisTypeNameFromEnum(EVRControllerAxisType eAxisType) { IntPtr result = FnTable.GetControllerAxisTypeNameFromEnum(eAxisType); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public bool CaptureInputFocus() { @@ -1559,7 +1559,7 @@ public class CVRTrackedCamera public string GetCameraErrorNameFromEnum(EVRTrackedCameraError eCameraError) { IntPtr result = FnTable.GetCameraErrorNameFromEnum(eCameraError); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public EVRTrackedCameraError HasCamera(uint nDeviceIndex,ref bool pHasCamera) { @@ -1673,7 +1673,7 @@ public class CVRApplications public string GetApplicationsErrorNameFromEnum(EVRApplicationError error) { IntPtr result = FnTable.GetApplicationsErrorNameFromEnum(error); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public uint GetApplicationPropertyString(string pchAppKey,EVRApplicationProperty eProperty,string pchPropertyValueBuffer,uint unPropertyValueBufferLen,ref EVRApplicationError peError) { @@ -1718,7 +1718,7 @@ public class CVRApplications public string GetApplicationsTransitionStateNameFromEnum(EVRApplicationTransitionState state) { IntPtr result = FnTable.GetApplicationsTransitionStateNameFromEnum(state); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public bool IsQuitUserPromptRequested() { @@ -2131,7 +2131,7 @@ public class CVROverlay public string GetOverlayErrorNameFromEnum(EVROverlayError error) { IntPtr result = FnTable.GetOverlayErrorNameFromEnum(error); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public EVROverlayError SetOverlayRenderingPid(ulong ulOverlayHandle,uint unPID) { @@ -2537,7 +2537,7 @@ public class CVRRenderModels public string GetRenderModelErrorNameFromEnum(EVRRenderModelError error) { IntPtr result = FnTable.GetRenderModelErrorNameFromEnum(error); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } } @@ -2573,7 +2573,7 @@ public class CVRSettings public string GetSettingsErrorNameFromEnum(EVRSettingsError eError) { IntPtr result = FnTable.GetSettingsErrorNameFromEnum(eError); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public bool Sync(bool bForce,ref EVRSettingsError peError) { diff --git a/unity_package/Assets/Plugins/openvr_api.cs b/unity_package/Assets/Plugins/openvr_api.cs index d4264ee..6d1c8ed 100644 --- a/unity_package/Assets/Plugins/openvr_api.cs +++ b/unity_package/Assets/Plugins/openvr_api.cs @@ -1436,7 +1436,7 @@ public class CVRSystem public string GetPropErrorNameFromEnum(ETrackedPropertyError error) { IntPtr result = FnTable.GetPropErrorNameFromEnum(error); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public bool PollNextEvent(ref VREvent_t pEvent,uint uncbVREvent) { @@ -1451,7 +1451,7 @@ public class CVRSystem public string GetEventTypeNameFromEnum(EVREventType eType) { IntPtr result = FnTable.GetEventTypeNameFromEnum(eType); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public HiddenAreaMesh_t GetHiddenAreaMesh(EVREye eEye) { @@ -1475,12 +1475,12 @@ public class CVRSystem public string GetButtonIdNameFromEnum(EVRButtonId eButtonId) { IntPtr result = FnTable.GetButtonIdNameFromEnum(eButtonId); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public string GetControllerAxisTypeNameFromEnum(EVRControllerAxisType eAxisType) { IntPtr result = FnTable.GetControllerAxisTypeNameFromEnum(eAxisType); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public bool CaptureInputFocus() { @@ -1559,7 +1559,7 @@ public class CVRTrackedCamera public string GetCameraErrorNameFromEnum(EVRTrackedCameraError eCameraError) { IntPtr result = FnTable.GetCameraErrorNameFromEnum(eCameraError); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public EVRTrackedCameraError HasCamera(uint nDeviceIndex,ref bool pHasCamera) { @@ -1673,7 +1673,7 @@ public class CVRApplications public string GetApplicationsErrorNameFromEnum(EVRApplicationError error) { IntPtr result = FnTable.GetApplicationsErrorNameFromEnum(error); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public uint GetApplicationPropertyString(string pchAppKey,EVRApplicationProperty eProperty,string pchPropertyValueBuffer,uint unPropertyValueBufferLen,ref EVRApplicationError peError) { @@ -1718,7 +1718,7 @@ public class CVRApplications public string GetApplicationsTransitionStateNameFromEnum(EVRApplicationTransitionState state) { IntPtr result = FnTable.GetApplicationsTransitionStateNameFromEnum(state); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public bool IsQuitUserPromptRequested() { @@ -2131,7 +2131,7 @@ public class CVROverlay public string GetOverlayErrorNameFromEnum(EVROverlayError error) { IntPtr result = FnTable.GetOverlayErrorNameFromEnum(error); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public EVROverlayError SetOverlayRenderingPid(ulong ulOverlayHandle,uint unPID) { @@ -2537,7 +2537,7 @@ public class CVRRenderModels public string GetRenderModelErrorNameFromEnum(EVRRenderModelError error) { IntPtr result = FnTable.GetRenderModelErrorNameFromEnum(error); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } } @@ -2573,7 +2573,7 @@ public class CVRSettings public string GetSettingsErrorNameFromEnum(EVRSettingsError eError) { IntPtr result = FnTable.GetSettingsErrorNameFromEnum(eError); - return (string) Marshal.PtrToStructure(result, typeof(string)); + return Marshal.PtrToStringAnsi(result); } public bool Sync(bool bForce,ref EVRSettingsError peError) { |