kneesox/sdraw_mods_cvr
1
0
Fork 0
mirror of https://github.com/hanetzer/sdraw_mods_cvr.git synced 2025-09-03 10:29:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Settings rework

Browse source
This commit is contained in:
SDraw 2022-08-07 23:56:42 +03:00
parent 422f3fa0d0
commit 85830348ad
No known key found for this signature in database
GPG key ID: BB95B4DAB2BB8BB5
4 changed files with 112 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -7,4 +7,4 @@ Merged set of MelonLoader mods for ChilloutVR.
| Avatar Change Info | ml_aci | 1.0.1 | Pending approval | Working | | Avatar Change Info | ml_aci | 1.0.1 | Pending approval | Working |
| Desktop Reticle Switch | ml_drs | 1.0.0 | Yes | Working | | Desktop Reticle Switch | ml_drs | 1.0.0 | Yes | Working |
| Four Point Tracking | ml_fpt | 1.0.0 | Pending approval | Working | | Four Point Tracking | ml_fpt | 1.0.0 | Pending approval | Working |
| Leap Motion Extension | ml_lme | 1.1.0 | Pending approval | Working | | Leap Motion Extension | ml_lme | 1.1.1 | Pending approval | Working |

1
ml_lme/Main.cs
View file

@ -119,6 +119,7 @@ namespace ml_lme
ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) => ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) =>
{ {
ViewManager.Instance.gameMenuView.View.ExecuteScript(Scripts.GetEmbeddedScript("menu.js")); ViewManager.Instance.gameMenuView.View.ExecuteScript(Scripts.GetEmbeddedScript("menu.js"));
ViewManager.Instance.RequestCurrentSettings();
}; };
} }

6
ml_lme/Properties/AssemblyInfo.cs
View file

@ -1,10 +1,10 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyTitle("LeapMotionExtension")] [assembly: AssemblyTitle("LeapMotionExtension")]
[assembly: AssemblyVersion("1.1.0")] [assembly: AssemblyVersion("1.1.1")]
[assembly: AssemblyFileVersion("1.1.0")] [assembly: AssemblyFileVersion("1.1.1")]
[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.1.0", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.1.1", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]

224
ml_lme/Settings.cs
View file

@ -13,20 +13,20 @@ namespace ml_lme
HMD HMD
} }
public static readonly string[] ms_defaultSettings = enum ModSetting
{ {
"InteractionLeapMotionTracking", InteractionLeapMotionTracking,
"InteractionLeapMotionTrackingDesktopX", InteractionLeapMotionTrackingDesktopX,
"InteractionLeapMotionTrackingDesktopY", InteractionLeapMotionTrackingDesktopY,
"InteractionLeapMotionTrackingDesktopZ", InteractionLeapMotionTrackingDesktopZ,
"InteractionLeapMotionTrackingFingersOnly", InteractionLeapMotionTrackingFingersOnly,
"InteractionLeapMotionTrackingModel", InteractionLeapMotionTrackingModel,
"InteractionLeapMotionTrackingMode", InteractionLeapMotionTrackingMode,
"InteractionLeapMotionTrackingAngle", InteractionLeapMotionTrackingAngle,
"InteractionLeapMotionTrackingHead", InteractionLeapMotionTrackingHead,
"InteractionLeapMotionTrackingHeadX", InteractionLeapMotionTrackingHeadX,
"InteractionLeapMotionTrackingHeadY", InteractionLeapMotionTrackingHeadY,
"InteractionLeapMotionTrackingHeadZ" InteractionLeapMotionTrackingHeadZ
}; };
static bool ms_enabled = false; static bool ms_enabled = false;
@ -53,123 +53,113 @@ namespace ml_lme
{ {
p_instance.Patch( p_instance.Patch(
typeof(CVRSettings).GetMethod(nameof(CVRSettings.LoadSerializedSettings)), typeof(CVRSettings).GetMethod(nameof(CVRSettings.LoadSerializedSettings)),
new HarmonyLib.HarmonyMethod(typeof(Settings).GetMethod(nameof(BeforeSettingsLoad), System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic)), new HarmonyLib.HarmonyMethod(typeof(Settings).GetMethod(nameof(LoadSerializedSettings_Prefix), System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic)),
null null
); );
} }
static void BeforeSettingsLoad(ref CVRSettings __instance) static void LoadSerializedSettings_Prefix(ref CVRSettings __instance)
{ {
if(!ms_initialized && (__instance != null)) if(!ms_initialized && (__instance != null))
{ {
var l_settings = HarmonyLib.Traverse.Create(__instance)?.Field("_settings")?.GetValue<System.Collections.Generic.List<ABI_RC.Core.Savior.CVRSettingsValue>>(); var l_settings = HarmonyLib.Traverse.Create(__instance)?.Field("_settings")?.GetValue<System.Collections.Generic.List<ABI_RC.Core.Savior.CVRSettingsValue>>();
if(l_settings != null) if(l_settings != null)
{ {
l_settings.Add(new CVRSettingsBool(ms_defaultSettings[0], false)); l_settings.Add(new CVRSettingsBool(ModSetting.InteractionLeapMotionTracking.ToString(), false));
l_settings.Add(new CVRSettingsInt(ms_defaultSettings[1], 0)); l_settings.Add(new CVRSettingsInt(ModSetting.InteractionLeapMotionTrackingDesktopX.ToString(), 0));
l_settings.Add(new CVRSettingsInt(ms_defaultSettings[2], -45)); l_settings.Add(new CVRSettingsInt(ModSetting.InteractionLeapMotionTrackingDesktopY.ToString(), -45));
l_settings.Add(new CVRSettingsInt(ms_defaultSettings[3], 30)); l_settings.Add(new CVRSettingsInt(ModSetting.InteractionLeapMotionTrackingDesktopZ.ToString(), 30));
l_settings.Add(new CVRSettingsBool(ms_defaultSettings[4], false)); l_settings.Add(new CVRSettingsBool(ModSetting.InteractionLeapMotionTrackingFingersOnly.ToString(), false));
l_settings.Add(new CVRSettingsBool(ms_defaultSettings[5], false)); l_settings.Add(new CVRSettingsBool(ModSetting.InteractionLeapMotionTrackingModel.ToString(), false));
l_settings.Add(new CVRSettingsInt(ms_defaultSettings[6], 1)); l_settings.Add(new CVRSettingsInt(ModSetting.InteractionLeapMotionTrackingMode.ToString(), 1));
l_settings.Add(new CVRSettingsInt(ms_defaultSettings[7], 0)); l_settings.Add(new CVRSettingsInt(ModSetting.InteractionLeapMotionTrackingAngle.ToString(), 0));
l_settings.Add(new CVRSettingsBool(ms_defaultSettings[8], false)); l_settings.Add(new CVRSettingsBool(ModSetting.InteractionLeapMotionTrackingHead.ToString(), false));
l_settings.Add(new CVRSettingsInt(ms_defaultSettings[9], 0)); l_settings.Add(new CVRSettingsInt(ModSetting.InteractionLeapMotionTrackingHeadX.ToString(), 0));
l_settings.Add(new CVRSettingsInt(ms_defaultSettings[10], 0)); l_settings.Add(new CVRSettingsInt(ModSetting.InteractionLeapMotionTrackingHeadY.ToString(), 0));
l_settings.Add(new CVRSettingsInt(ms_defaultSettings[11], 0)); l_settings.Add(new CVRSettingsInt(ModSetting.InteractionLeapMotionTrackingHeadZ.ToString(), 0));
} }
// Enable tracking
__instance.settingBoolChanged.AddListener((name, value) => __instance.settingBoolChanged.AddListener((name, value) =>
{ {
if(name == ms_defaultSettings[0]) if(Enum.TryParse(name, out ModSetting l_setting))
{ {
ms_enabled = value; switch(l_setting)
EnabledChange?.Invoke();
}
});
// Desktop offsets
__instance.settingIntChanged.AddListener((name, value) =>
{
for(int i = 1; i <= 3; i++)
{
if(name == ms_defaultSettings[i])
{ {
ms_desktopOffset = new Vector3( case ModSetting.InteractionLeapMotionTracking:
MetaPort.Instance.settings.GetSettingInt(ms_defaultSettings[1]), {
MetaPort.Instance.settings.GetSettingInt(ms_defaultSettings[2]), ms_enabled = value;
MetaPort.Instance.settings.GetSettingInt(ms_defaultSettings[3]) EnabledChange?.Invoke();
) * 0.01f; }
DesktopOffsetChange?.Invoke(); break;
case ModSetting.InteractionLeapMotionTrackingFingersOnly:
{
ms_fingersOnly = value;
FingersOnlyChange?.Invoke();
}
break;
case ModSetting.InteractionLeapMotionTrackingModel:
{
ms_modelVisibility = value;
ModelVisibilityChange?.Invoke();
}
break;
case ModSetting.InteractionLeapMotionTrackingHead:
{
ms_headAttach = value;
HeadAttachChange?.Invoke();
}
break; break;
} }
} }
}); });
// Fingers tracking only
__instance.settingBoolChanged.AddListener((name, value) =>
{
if(name == ms_defaultSettings[4])
{
ms_fingersOnly = value;
FingersOnlyChange?.Invoke();
}
});
// Model visibility
__instance.settingBoolChanged.AddListener((name, value) =>
{
if(name == ms_defaultSettings[5])
{
ms_modelVisibility = value;
ModelVisibilityChange?.Invoke();
}
});
// Tracking mode
__instance.settingIntChanged.AddListener((name, value) => __instance.settingIntChanged.AddListener((name, value) =>
{ {
if(name == ms_defaultSettings[6]) if(Enum.TryParse(name, out ModSetting l_setting))
{ {
ms_trackingMode = (LeapTrackingMode)value; switch(l_setting)
TrackingModeChange?.Invoke();
}
});
// Root angle
__instance.settingIntChanged.AddListener((name, value) =>
{
if(name == ms_defaultSettings[7])
{
ms_rootAngle = value;
RootAngleChange?.Invoke();
}
});
// Head attach
__instance.settingBoolChanged.AddListener((name, value) =>
{
if(name == ms_defaultSettings[8])
{
ms_headAttach = value;
HeadAttachChange?.Invoke();
}
});
// Head offset
__instance.settingIntChanged.AddListener((name, value) =>
{
for(int i = 9; i <= 11; i++)
{
if(name == ms_defaultSettings[i])
{ {
ms_headOffset = new Vector3( case ModSetting.InteractionLeapMotionTrackingDesktopX:
MetaPort.Instance.settings.GetSettingInt(ms_defaultSettings[9]), case ModSetting.InteractionLeapMotionTrackingDesktopY:
MetaPort.Instance.settings.GetSettingInt(ms_defaultSettings[10]), case ModSetting.InteractionLeapMotionTrackingDesktopZ:
MetaPort.Instance.settings.GetSettingInt(ms_defaultSettings[11]) {
) * 0.01f; ms_desktopOffset = new Vector3(
HeadOffsetChange?.Invoke(); MetaPort.Instance.settings.GetSettingInt(ModSetting.InteractionLeapMotionTrackingDesktopX.ToString()),
MetaPort.Instance.settings.GetSettingInt(ModSetting.InteractionLeapMotionTrackingDesktopY.ToString()),
MetaPort.Instance.settings.GetSettingInt(ModSetting.InteractionLeapMotionTrackingDesktopZ.ToString())
) * 0.01f;
DesktopOffsetChange?.Invoke();
}
break;
case ModSetting.InteractionLeapMotionTrackingMode:
{
ms_trackingMode = (LeapTrackingMode)value;
TrackingModeChange?.Invoke();
}
break;
case ModSetting.InteractionLeapMotionTrackingAngle:
{
ms_rootAngle = value;
RootAngleChange?.Invoke();
}
break;
case ModSetting.InteractionLeapMotionTrackingHeadX:
case ModSetting.InteractionLeapMotionTrackingHeadY:
case ModSetting.InteractionLeapMotionTrackingHeadZ:
{
ms_headOffset = new Vector3(
MetaPort.Instance.settings.GetSettingInt(ModSetting.InteractionLeapMotionTrackingHeadX.ToString()),
MetaPort.Instance.settings.GetSettingInt(ModSetting.InteractionLeapMotionTrackingHeadY.ToString()),
MetaPort.Instance.settings.GetSettingInt(ModSetting.InteractionLeapMotionTrackingHeadZ.ToString())
) * 0.01f;
HeadOffsetChange?.Invoke();
}
break; break;
} }
} }
@ -181,21 +171,21 @@ namespace ml_lme
static public void Reload() static public void Reload()
{ {
ms_enabled = MetaPort.Instance.settings.GetSettingsBool(ms_defaultSettings[0]); ms_enabled = MetaPort.Instance.settings.GetSettingsBool(ModSetting.InteractionLeapMotionTracking.ToString());
ms_desktopOffset = new Vector3( ms_desktopOffset = new Vector3(
MetaPort.Instance.settings.GetSettingInt(ms_defaultSettings[1]), MetaPort.Instance.settings.GetSettingInt(ModSetting.InteractionLeapMotionTrackingDesktopX.ToString()),
MetaPort.Instance.settings.GetSettingInt(ms_defaultSettings[2]), MetaPort.Instance.settings.GetSettingInt(ModSetting.InteractionLeapMotionTrackingDesktopY.ToString()),
MetaPort.Instance.settings.GetSettingInt(ms_defaultSettings[3]) MetaPort.Instance.settings.GetSettingInt(ModSetting.InteractionLeapMotionTrackingDesktopZ.ToString())
) * 0.01f; ) * 0.01f;
ms_fingersOnly = MetaPort.Instance.settings.GetSettingsBool(ms_defaultSettings[4]); ms_fingersOnly = MetaPort.Instance.settings.GetSettingsBool(ModSetting.InteractionLeapMotionTrackingFingersOnly.ToString());
ms_modelVisibility = MetaPort.Instance.settings.GetSettingsBool(ms_defaultSettings[5]); ms_modelVisibility = MetaPort.Instance.settings.GetSettingsBool(ModSetting.InteractionLeapMotionTrackingModel.ToString());
ms_trackingMode = (LeapTrackingMode)MetaPort.Instance.settings.GetSettingInt(ms_defaultSettings[6]); ms_trackingMode = (LeapTrackingMode)MetaPort.Instance.settings.GetSettingInt(ModSetting.InteractionLeapMotionTrackingMode.ToString());
ms_rootAngle = MetaPort.Instance.settings.GetSettingInt(ms_defaultSettings[7]); ms_rootAngle = MetaPort.Instance.settings.GetSettingInt(ModSetting.InteractionLeapMotionTrackingAngle.ToString());
ms_headAttach = MetaPort.Instance.settings.GetSettingsBool(ms_defaultSettings[8]); ms_headAttach = MetaPort.Instance.settings.GetSettingsBool(ModSetting.InteractionLeapMotionTrackingHead.ToString());
ms_headOffset = new Vector3( ms_headOffset = new Vector3(
MetaPort.Instance.settings.GetSettingInt(ms_defaultSettings[9]), MetaPort.Instance.settings.GetSettingInt(ModSetting.InteractionLeapMotionTrackingHeadX.ToString()),
MetaPort.Instance.settings.GetSettingInt(ms_defaultSettings[10]), MetaPort.Instance.settings.GetSettingInt(ModSetting.InteractionLeapMotionTrackingHeadY.ToString()),
MetaPort.Instance.settings.GetSettingInt(ms_defaultSettings[11]) MetaPort.Instance.settings.GetSettingInt(ModSetting.InteractionLeapMotionTrackingHeadZ.ToString())
) * 0.01f; ) * 0.01f;
} }