Mirrors/HeavenStudio
1
0
Fork 0
mirror of https://github.com/RHeavenStudio/HeavenStudio.git synced 2025-06-12 21:47:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

JSL-Related Improvements (#679)

Browse Source 
* *don't* cause a stack overflow when polling split controller

* update JSL (DualSense Edge support)

add ability to update controller bindings

* (temporarily) get rid of everything joy-con pair related

* prepare the new controller

update JSL

* implementation of joycon pair

* properly do the material

* finish implementation
This commit is contained in:
minenice55
2024-02-04 01:54:32 -05:00
committed by minenice55
parent a9017bf06c
commit a874b18ccb
20 changed files with 959 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Assets/Scripts/TitleManager.cs
View File

@ -155,14 +155,9 @@ namespace HeavenStudio
var nextController = newController;
var lastController = PlayerInput.GetInputController(1);
if ((newController is InputMouse) && !(lastController is InputMouse))
{
Debug.Log("Mouse used, selecting keyboard instead");
nextController = controllers[0];
}
Debug.Log("Assigning controller: " + newController.GetDeviceName());
if (lastController != nextController && !firstBoot)
if (lastController != nextController)// && !firstBoot)
{
firstBoot = false;
if (nextController == null)
@ -172,6 +167,7 @@ namespace HeavenStudio
}
lastController.SetPlayer(null);
nextController.SetPlayer(1);
nextController.OnSelected();
PlayerInput.CurrentControlStyle = nextController.GetDefaultStyle();
usingMouse = PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch;
selectedDisplayIcon.SetActive(!usingMouse);
@ -179,18 +175,8 @@ namespace HeavenStudio
{
obj.SetActive(!usingMouse);
}
if ((lastController as InputJoyshock) != null)
{
(lastController as InputJoyshock)?.UnAssignOtherHalf();
}
if ((nextController as InputJoyshock) != null)
{
nextController.OnSelected();
(nextController as InputJoyshock)?.UnAssignOtherHalf();
}
}
break;
}
else
{
@ -276,13 +262,13 @@ namespace HeavenStudio
}
else if (settingsPanel.IsOpen)
{
if (PlayerInput.CurrentControlStyle != InputController.ControlStyles.Touch)
{
if (controller.GetLastActionDown() == (int)InputController.ActionsPad.South)
{
SettingsClose();
}
}
// if (PlayerInput.CurrentControlStyle != InputController.ControlStyles.Touch)
// {
// if (controller.GetLastActionDown() == (int)InputController.ActionsPad.South)
// {
// SettingsClose();
// }
// }
}
else if (!firstPress)
{
@ -570,7 +556,7 @@ namespace HeavenStudio
}
// waitingForButtonUp = true;
playPanelRevealTime = Time.realtimeSinceStartup + 0.2f;
playPanelRevealTime = Time.realtimeSinceStartup + 0.5f;
playPanel.SetActive(true);
playMenuRevealed = true;
SoundByte.PlayOneShot("ui/UISelect");