Skip to content

Commit

Permalink
Merge pull request #14 from Float3/dev
Browse files Browse the repository at this point in the history 
Dev 14
  • Loading branch information
@float3
float3 authored May 10, 2022
2 parents 12a5420 + fc6441c commit 6860ae0
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 15 deletions.
26 changes: 14 additions & 12 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# VRCLauncher
![VRCLauncher_Ip4QekJZhk](https://user-images.githubusercontent.com/86748455/164448202-0e7d2a48-9a29-4d7e-9c65-d94ab90f261c.png)
![VRCLauncher_Cnl7rw1dXt](https://user-images.githubusercontent.com/86748455/167714516-a8ba3909-b3f3-4e94-9a25-6018dee0dd7a.png)

For In-Depth explanations for most of the commands go to

Expand All @@ -9,14 +9,16 @@ https://docs.unity3d.com/2019.4/Documentation/Manual/PlayerCommandLineArguments.

Arguments that aren't covered by those links can be found below

| argument | default value | explanation | source |
|-------------------------------|-----------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------|
| --osc=inPort:senderIP:outPort | --osc=9000:127.0.0.1:9001 | https://github.com/vrchat-community/osc/wiki#vrchat-ports | https://github.com/vrchat-community/osc/wiki#vrchat-ports |
| | | | |
| vrchat://launch?id= | | Specify launch instance | |
| | | | |
| --log-debug-levels= | | extends logging. know "debug-levls" include (this information is most likely out of date): <br/><br/> --log-debug-levels="Always;API;AssetBundleDownloadManager;ContentCreator;All;NetworkTransport;NetworkData;NetworkProcessing" | |
| | | | |
| --custom-arm-ratio= | --custom-arm-ratio="0.4537" | The IK-Beta Changelog of VRChat 2022.1.1p3 build 11721 states:<br/><br/>- Added --custom-arm-ratio="0.4537" launch option. "0.4537" is default, "0.415" will approximate previous beta arm scale | An announcement on the VRChat Discord server: https://discord.com/channels/189511567539306508/503009489486872583/955619620310646814 |
| --disable-shoulder-tracking | | The IK-Beta Changelog of VRChat 2022.1.1p4 build 11731 states:<br/><br/>- Added --disable-shoulder-tracking launch option. Use this to avoid issues with some types of IMU-only based arm trackers. | An announcement on the VRChat Discord server: https://discord.com/channels/189511567539306508/503009489486872583/958535824490758144 |
| --calibration-range= | --calibration-range="0.3" | The IK-Beta 2.0 Changelog of VRChat 2022.1.1p5 build 11748 states:<br/><br/>- **Added the --calibration-range="0.3" launch option**. This determines the distance from predicted supported binding points that the calibration will search (in meters)<br/>- The default value is 0.3, corresponding to a 30cm radius sphere around possible binding points | An announcement on the VRChat Discord server: https://discord.com/channels/189511567539306508/503009489486872583/966575806522466305 |
| argument | default value | explanation | source |
|---------------------------------|------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------|
| --osc=inPort:senderIP:outPort | --osc=9000:127.0.0.1:9001 | https://github.com/vrchat-community/osc/wiki#vrchat-ports | https://github.com/vrchat-community/osc/wiki#vrchat-ports |
| | | | |
| vrchat://launch?id= | | Specify launch instance | |
| | | | |
| --log-debug-levels= | | extends logging. know "debug-levls" include (this information is most likely out of date): <br/><br/> --log-debug-levels="Always;API;AssetBundleDownloadManager;ContentCreator;All;NetworkTransport;NetworkData;NetworkProcessing" | |
| | | | |
| --custom-arm-ratio= | --custom-arm-ratio="0.4537" | The IK-Beta 2.0 Changelog of VRChat 2022.1.1p3, build 11721 states:<br/><br/>- Added --custom-arm-ratio="0.4537" launch option. "0.4537" is default, "0.415" will approximate previous beta arm scale | An announcement on the VRChat Discord server: https://discord.com/channels/189511567539306508/503009489486872583/955619620310646814 |
| --disable-shoulder-tracking | | The IK-Beta 2.0 Changelog of VRChat 2022.1.1p4, build 11731 states:<br/><br/>- Added --disable-shoulder-tracking launch option. Use this to avoid issues with some types of IMU-only based arm trackers. | An announcement on the VRChat Discord server: https://discord.com/channels/189511567539306508/503009489486872583/958535824490758144 |
| --calibration-range= | --calibration-range="0.6" | The IK-Beta 2.0 Changelog of VRChat 2022.1.1p5, build 11748 states:<br/><br/>- **Added the --calibration-range="0.3" launch option**. This determines the distance from predicted supported binding points that the calibration will search (in meters)<br/>- The default value is 0.3, corresponding to a 30cm radius sphere around possible binding points | An announcement on the VRChat Discord server: https://discord.com/channels/189511567539306508/503009489486872583/966575806522466305 |
| --enable-ik-debug-logging | forced on during IK 2.0 Beta | The IK-Beta 2.0 Changelog of VRChat 2022.1.2p4, build 11942 states:<br/><br/>- Added the --enable-ik-debug-logging launch argument - use this when providing us with logs and feedback during the Beta period! | An announcement on the VRChat Discord server: https://discord.com/channels/419351657743253524/623967007733186560/971839050937950259 |
| --freeze-tracking-on-disconnect | | The IK-Beta 2.0 Changelog of VRChat 2022.1.2p4, build 11946 states:<br/><br/>- Added the --freeze-tracking-on-disconnect launch option. Enabling this will cause trackers to freeze in place relative to the player when they are disconnected. To remove frozen trackers you can calibrate again. If all your trackers have disconnected so the calibration option is no longer visible, cycling the Avatar Measurement option will also unfreeze them | An announcement on the VRChat Discord server: https://discord.com/channels/419351657743253524/623967007733186560/973670442206388276 |
6 changes: 6 additions & 0 deletions VRCLauncher/Model/Config.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ public class Config
public string CustomArmRatio { get; set; }
public bool DisableShoulderTracking { get; set; }
public string CalibrationRange { get; set; }
public bool FreezeTrackingOnDisconnect { get; set; }
public bool EnableIKDebugLogging { get; set; }

public string MidiDevice { get; set; }
public string OSCPorts { get; set; }
Expand Down Expand Up @@ -178,6 +180,10 @@ public List<string> GetArgs()

if (CalibrationRange != "") args.Add("--calibration-range=\"" + CalibrationRange + "\"");

if (FreezeTrackingOnDisconnect) args.Add("--freeze-tracking-on-disconnect");

if (EnableIKDebugLogging) args.Add("--enable-ik-debug-logging");


if (MidiDevice != "") args.Add("--midi=" + MidiDevice);

Expand Down
17 changes: 14 additions & 3 deletions VRCLauncher/View/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@
<TextBlock
FontStyle="Italic"
Foreground="#959595"
Text="default: 0.3" />
Text="default: 0.6, previous beta: 0.3" />
</VisualBrush.Visual>
</VisualBrush>
</TextBox.Resources>
Expand Down Expand Up @@ -284,7 +284,18 @@

</TextBox>
</StackPanel>


<StackPanel Orientation="Horizontal">
<Label Content="--enable-ik-debug-logging" Width="180"
HorizontalContentAlignment="Left" />
<CheckBox IsChecked="{Binding EnableIKDebugLogging}" />
</StackPanel>

<StackPanel Orientation="Horizontal">
<Label Content="--freeze-tracking-on-disconnect" Width="180"
HorizontalContentAlignment="Left" />
<CheckBox IsChecked="{Binding EnableIKDebugLogging}" />
</StackPanel>
</StackPanel>
</GroupBox>
</StackPanel>
Expand Down Expand Up @@ -471,7 +482,7 @@
</StackPanel>
</GroupBox>

<GroupBox Header="Main" Margin="10" Padding="10" Grid.Row="1" Grid.Column="2">
<GroupBox Header="Launch" Margin="10" Padding="10" Grid.Row="1" Grid.Column="2">
<StackPanel>
<Button Style="{DynamicResource ButtonStyle}" Content="Launch" Margin="10" Padding="10"
Click="Launch" />
Expand Down
34 changes: 34 additions & 0 deletions VRCLauncher/ViewModel/ViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public ViewModel()
CustomArmRatio = Config.CustomArmRatio;
DisableShoulderTracking = Config.DisableShoulderTracking;
CalibrationRange = Config.CalibrationRange;
FreezeTrackingOnDisconnect = Config.FreezeTrackingOnDisconnect;
EnableIKDebugLogging = Config.EnableIKDebugLogging;

MidiDevice = Config.MidiDevice;
OSCPorts = Config.OSCPorts;
Expand Down Expand Up @@ -334,6 +336,38 @@ public string CalibrationRange
}
}

private bool _freezeTrackingOnDisconnect;

public bool FreezeTrackingOnDisconnect
{
get => Config.FreezeTrackingOnDisconnect;
set
{
if (_freezeTrackingOnDisconnect != value)
{
_freezeTrackingOnDisconnect = value;
Config.FreezeTrackingOnDisconnect = value;
OnPropertyChanged(nameof(FreezeTrackingOnDisconnect));
}
}
}

private bool _enableIKDebugLogging;

public bool EnableIKDebugLogging
{
get => Config.EnableIKDebugLogging;
set
{
if (_enableIKDebugLogging != value)
{
_enableIKDebugLogging = value;
Config.EnableIKDebugLogging = value;
OnPropertyChanged(nameof(EnableIKDebugLogging));
}
}
}

#endregion

#region MISC
Expand Down

0 comments on commit 6860ae0

Please sign in to comment.