Center Marker/ Chaperone Refactor/ IVROverlay/IVRSettings wrappers PT 1/? (#438)
* changed click noises to internal sounds * udpated to ovr 1.11.11 * in prog added prototypes * began wrapper for IVRSettings * added getters for chaperone colors * added setters for chaperone color * fixed type conversion issue * fixed linking issue, added additional settings chaperone page * adjusted chaperone page qml * added color chaperone UI * refactor in prog * updated ivrsettings wrapper, refactor in prog * refactor in prog * collision bound style add * refactor * cleaned up error logging * fixed fade distance remember bug * fixed sounds * fixed brightness opacity bug setting to 0 when 0 * fixed sounds * added wrapper for removing keys * refactored reset * added chaperone Styles to UI * added chaperone floor always on * fixed copy/paste error * adjsuted ui chaperone color slider * started adding chaperone floor marker * fixeed naming error overlay * finalized chaperone Ideas, added chaperone markers * began ivroverlay wrapper * center marker fully implemented * added function prototypes for new settings * added setting, and updated ui for New Center Marker Overlay * adjsuted sound effect volume and formatting for chaperonecolorbox * adjusted volume back * fixed various issues aroudn new overlay * removed artifact comment * cleaned up settings wrapper * cleaned up chaperone tab controller for namespace changes * removed ide comment issue * cleanup overlay wrapper * cleaned up tab/space changed file name * renamed files * fixed include statements * updated namespace in chaperonetabcontroller * fixed tab/space issues * re-activated boundbasisheight * fixed bulgarian case * changed chaperone warnings to only work in roomscale * fix capitilization * fixed tracking universe update * direct text input change for brightness * qml fixes * fixed qml format issues * fixed sound issue w/ sliders * fixed super truely * Add SDL libraries to CircleCI * Remove -tidy from circleCI config * flushed out error messages in overlaywrapper * removed hungarian notation * added get/set string to ovrsettings wrapper * misc cleanup * add reset orientation btn and new center marker to chaperone * ui adjustments * changed alarm audio * adjusted sound effect volume slightly lower * updated for 5.1.0 release Co-authored-by: Vasily <vautkin@teknik.io>
This commit is contained in:
+18
-2
@@ -4403,7 +4403,6 @@ public enum EVREventType
|
||||
VREvent_DashboardDeactivated = 503,
|
||||
VREvent_DashboardRequested = 505,
|
||||
VREvent_ResetDashboard = 506,
|
||||
VREvent_RenderToast = 507,
|
||||
VREvent_ImageLoaded = 508,
|
||||
VREvent_ShowKeyboard = 509,
|
||||
VREvent_HideKeyboard = 510,
|
||||
@@ -4462,6 +4461,8 @@ public enum EVREventType
|
||||
VREvent_LastKnownSectionSettingChanged = 867,
|
||||
VREvent_DismissedWarningsSectionSettingChanged = 868,
|
||||
VREvent_GpuSpeedSectionSettingChanged = 869,
|
||||
VREvent_WindowsMRSectionSettingChanged = 870,
|
||||
VREvent_OtherSectionSettingChanged = 871,
|
||||
VREvent_StatusUpdate = 900,
|
||||
VREvent_WebInterface_InstallDriverCompleted = 950,
|
||||
VREvent_MCImageUpdated = 1000,
|
||||
@@ -5168,6 +5169,14 @@ public enum EVRRenderModelError
|
||||
NotEnoughTexCoords = 308,
|
||||
InvalidTexture = 400,
|
||||
}
|
||||
public enum EVRRenderModelTextureFormat
|
||||
{
|
||||
RGBA8_SRGB = 0,
|
||||
BC2 = 1,
|
||||
BC4 = 2,
|
||||
BC7 = 3,
|
||||
BC7_SRGB = 4,
|
||||
}
|
||||
public enum EVRNotificationType
|
||||
{
|
||||
Transient = 0,
|
||||
@@ -5947,6 +5956,7 @@ public enum EVRDebugError
|
||||
public ushort unWidth;
|
||||
public ushort unHeight;
|
||||
public IntPtr rubTextureMapData; // const uint8_t *
|
||||
public EVRRenderModelTextureFormat format;
|
||||
}
|
||||
// This structure is for backwards binary compatibility on Linux and OSX only
|
||||
[StructLayout(LayoutKind.Sequential, Pack = 4)] public struct RenderModel_TextureMap_t_Packed
|
||||
@@ -5954,17 +5964,20 @@ public enum EVRDebugError
|
||||
public ushort unWidth;
|
||||
public ushort unHeight;
|
||||
public IntPtr rubTextureMapData; // const uint8_t *
|
||||
public EVRRenderModelTextureFormat format;
|
||||
public RenderModel_TextureMap_t_Packed(RenderModel_TextureMap_t unpacked)
|
||||
{
|
||||
this.unWidth = unpacked.unWidth;
|
||||
this.unHeight = unpacked.unHeight;
|
||||
this.rubTextureMapData = unpacked.rubTextureMapData;
|
||||
this.format = unpacked.format;
|
||||
}
|
||||
public void Unpack(ref RenderModel_TextureMap_t unpacked)
|
||||
{
|
||||
unpacked.unWidth = this.unWidth;
|
||||
unpacked.unHeight = this.unHeight;
|
||||
unpacked.rubTextureMapData = this.rubTextureMapData;
|
||||
unpacked.format = this.format;
|
||||
}
|
||||
}
|
||||
[StructLayout(LayoutKind.Sequential)] public struct RenderModel_t
|
||||
@@ -7072,6 +7085,7 @@ public class OpenVR
|
||||
public const string k_pch_Null_RenderHeight_Int32 = "renderHeight";
|
||||
public const string k_pch_Null_SecondsFromVsyncToPhotons_Float = "secondsFromVsyncToPhotons";
|
||||
public const string k_pch_Null_DisplayFrequency_Float = "displayFrequency";
|
||||
public const string k_pch_WindowsMR_Section = "driver_holographic";
|
||||
public const string k_pch_UserInterface_Section = "userinterface";
|
||||
public const string k_pch_UserInterface_StatusAlwaysOnTop_Bool = "StatusAlwaysOnTop";
|
||||
public const string k_pch_UserInterface_MinimizeToTray_Bool = "MinimizeToTray";
|
||||
@@ -7100,6 +7114,7 @@ public class OpenVR
|
||||
public const string k_pch_CollisionBounds_CenterMarkerOn_Bool = "CollisionBoundsCenterMarkerOn";
|
||||
public const string k_pch_CollisionBounds_PlaySpaceOn_Bool = "CollisionBoundsPlaySpaceOn";
|
||||
public const string k_pch_CollisionBounds_FadeDistance_Float = "CollisionBoundsFadeDistance";
|
||||
public const string k_pch_CollisionBounds_WallHeight_Float = "CollisionBoundsWallHeight";
|
||||
public const string k_pch_CollisionBounds_ColorGammaR_Int32 = "CollisionBoundsColorGammaR";
|
||||
public const string k_pch_CollisionBounds_ColorGammaG_Int32 = "CollisionBoundsColorGammaG";
|
||||
public const string k_pch_CollisionBounds_ColorGammaB_Int32 = "CollisionBoundsColorGammaB";
|
||||
@@ -7129,6 +7144,8 @@ public class OpenVR
|
||||
public const string k_pch_audio_PlaybackMirrorDevice_String = "playbackMirrorDevice";
|
||||
public const string k_pch_audio_PlaybackMirrorDeviceName_String = "playbackMirrorDeviceName";
|
||||
public const string k_pch_audio_OldPlaybackMirrorDevice_String = "onPlaybackMirrorDevice";
|
||||
public const string k_pch_audio_ActiveMirrorDevice_String = "activePlaybackMirrorDevice";
|
||||
public const string k_pch_audio_EnablePlaybackMirrorIndependentVolume_Bool = "enablePlaybackMirrorIndependentVolume";
|
||||
public const string k_pch_audio_LastHmdPlaybackDeviceId_String = "lastHmdPlaybackDeviceId";
|
||||
public const string k_pch_audio_VIVEHDMIGain = "viveHDMIGain";
|
||||
public const string k_pch_Power_Section = "power";
|
||||
@@ -7141,7 +7158,6 @@ public class OpenVR
|
||||
public const string k_pch_Dashboard_Section = "dashboard";
|
||||
public const string k_pch_Dashboard_EnableDashboard_Bool = "enableDashboard";
|
||||
public const string k_pch_Dashboard_ArcadeMode_Bool = "arcadeMode";
|
||||
public const string k_pch_Dashboard_UseWebSettings = "useWebSettings";
|
||||
public const string k_pch_Dashboard_Position = "position";
|
||||
public const string k_pch_Dashboard_DesktopScale = "desktopScale";
|
||||
public const string k_pch_Dashboard_DashboardScale = "dashboardScale";
|
||||
|
||||
Reference in New Issue
Block a user