Skip to content

Disabled the menu in scene view #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
momo-the-monster merged 2 commits into from
May 24, 2022
Merged

Disabled the menu in scene view #27

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5948f5b
Hidden the menu in the scene view
Arne-van-der-Lei Apr 29, 2022
f2b8585
Merge branch 'vrchat-community:main' into main
Arne-van-der-Lei May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions Packages/com.vrchat.ClientSim/Runtime/System/ClientSimMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
using UnityEngine.UI;
using VRC.SDKBase;
using VRC.Udon.Common;
#if UNITY_EDITOR
using UnityEditor;
#endif

namespace VRC.SDK3.ClientSim
{
Expand Down Expand Up @@ -102,6 +105,7 @@ protected override void Awake()

_menuCanvas = menu.GetComponent<Canvas>();
_playerHeightOriginalMaxvalue = playerHeightSlider.maxValue;

}

public void Initialize(
Expand All @@ -126,8 +130,11 @@ public void Initialize(
playerIdText.text = "";
isMasterToggle.isOn = false;
isInstanceOwnerToggle.isOn = settings.isInstanceOwner;

UpdateValuesFromSettings();
#if UNITY_EDITOR
SceneVisibilityManager.instance.Hide(gameObject, true);
#endif
}

public ClientSimDisplayedPage GetDisplayedPage()
Expand Down Expand Up @@ -311,7 +318,7 @@ private void UpdateCanvasLocation()
menu.transform.SetPositionAndRotation(position, camTransform.rotation);
}

#region ClientSim Input
#region ClientSim Input

private void HandleInputMenuToggle(bool value, HandType hand)
{
Expand Down Expand Up @@ -345,9 +352,9 @@ private void HandleInputMenuToggle(bool value, HandType hand)
ToggleMenu(!_menuIsActive);
}

#endregion
#endregion

#region ClientSim Events
#region ClientSim Events

private void OnReady(ClientSimReadyEvent readyEvent)
{
Expand Down Expand Up @@ -388,9 +395,9 @@ private void OnPlayerMoved(ClientSimOnPlayerMovedEvent movedEvent)
UpdateCanvasLocation();
}

#endregion
#endregion

#region UI Hooks
#region UI Hooks

[PublicAPI]
public void WarningAccepted()
Expand Down Expand Up @@ -501,6 +508,6 @@ public void UpdateConsoleLogging(bool consoleLogging)
SaveSettings();
}

#endregion
#endregion
}
}