etc
/
HeavenStudioPlus
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #138 from minenice55/controllers-update1 

Controllers Support Update 1
This commit is contained in:
minenice55 2022-07-26 08:57:38 -04:00 committed by GitHub
parent 9054015342 c4d77c2254
commit af3980cd4e
4 changed files with 175 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
Assets/Scripts/InputSystem/ControllerTypes/InputJoyshock.cs
View File

@ -1,3 +1,4 @@
using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
@ -19,6 +20,17 @@ namespace HeavenStudio.InputSystem
"DualSense" "DualSense"
}; };
static int[] dsPlayerColours = new[]
{
0xd41817,
0x04d4fa,
0x05ff08,
0xffdd01,
0xe906c9,
0xcc6020,
0x888888
};
//TODO: see if single joy-con mappings differ from a normal pad (they don't!) //TODO: see if single joy-con mappings differ from a normal pad (they don't!)
int[] mappings = new[] int[] mappings = new[]
{ {
@ -68,6 +80,7 @@ namespace HeavenStudio.InputSystem
int joyshockHandle; int joyshockHandle;
int type; int type;
int splitType; int splitType;
int lightbarColour;
string joyshockName; string joyshockName;
//buttons, sticks, triggers //buttons, sticks, triggers
@ -107,6 +120,14 @@ namespace HeavenStudio.InputSystem
joyBtStateLast = joyBtStateCurrent; joyBtStateLast = joyBtStateCurrent;
joyBtStateCurrent = JslGetSimpleState(joyshockHandle); joyBtStateCurrent = JslGetSimpleState(joyshockHandle);
//gyro and accelerometer
joyImuStateLast = joyImuStateCurrent;
joyImuStateCurrent = JslGetIMUState(joyshockHandle);
//touchpad
joyTouchStateLast = joyTouchStateCurrent;
joyTouchStateCurrent = JslGetTouchState(joyshockHandle);
//stick direction state //stick direction state
//split controllers will need to be rotated to compensate //split controllers will need to be rotated to compensate
//left rotates counterclockwise, right rotates clockwise, all by 90 degrees //left rotates counterclockwise, right rotates clockwise, all by 90 degrees
@ -154,7 +175,7 @@ namespace HeavenStudio.InputSystem
public override InputFeatures GetFeatures() public override InputFeatures GetFeatures()
{ {
InputFeatures features = InputFeatures.Style_Pad | InputFeatures.Style_Baton; InputFeatures features = InputFeatures.Readable_MotionSensor | InputFeatures.Extra_Rumble | InputFeatures.Style_Pad | InputFeatures.Style_Baton;
switch (type) switch (type)
{ {
case TypeJoyConLeft: case TypeJoyConLeft:
@ -173,7 +194,6 @@ namespace HeavenStudio.InputSystem
features |= InputFeatures.Readable_AnalogueTriggers | InputFeatures.Readable_Pointer | InputFeatures.Writable_PlayerLED | InputFeatures.Writable_LightBar; features |= InputFeatures.Readable_AnalogueTriggers | InputFeatures.Readable_Pointer | InputFeatures.Writable_PlayerLED | InputFeatures.Writable_LightBar;
break; break;
} }
features |= InputFeatures.Readable_MotionSensor | InputFeatures.Extra_Rumble | InputFeatures.Style_Pad | InputFeatures.Style_Baton | InputFeatures.Style_Touch;
return features; return features;
} }
@ -360,6 +380,7 @@ namespace HeavenStudio.InputSystem
{ {
this.playerNum = null; this.playerNum = null;
JslSetPlayerNumber(joyshockHandle, 0); JslSetPlayerNumber(joyshockHandle, 0);
JslSetLightColour(joyshockHandle, 0);
return; return;
} }
this.playerNum = playerNum; this.playerNum = playerNum;
@ -372,6 +393,8 @@ namespace HeavenStudio.InputSystem
} }
} }
JslSetPlayerNumber(joyshockHandle, ledMask); JslSetPlayerNumber(joyshockHandle, ledMask);
lightbarColour = GetLightbarColourForPlayer((int) this.playerNum);
JslSetLightColour(joyshockHandle, lightbarColour);
} }
public override int? GetPlayer() public override int? GetPlayer()
@ -379,6 +402,61 @@ namespace HeavenStudio.InputSystem
return this.playerNum; return this.playerNum;
} }
public Color GetBodyColor()
{
if (otherHalf != null)
{
// gets the colour of the right controller if is split
return BitwiseUtils.IntToRgb(splitType == SplitRight ? JslGetControllerColour(joyshockHandle) : JslGetControllerColour(GetOtherHalf().GetHandle()));
}
return BitwiseUtils.IntToRgb(JslGetControllerColour(joyshockHandle));
}
public Color GetButtonColor()
{
return BitwiseUtils.IntToRgb(JslGetControllerButtonColour(joyshockHandle));
}
public Color GetLeftGripColor()
{
if (otherHalf != null)
{
return BitwiseUtils.IntToRgb(splitType == SplitLeft ? JslGetControllerColour(joyshockHandle) : JslGetControllerColour(GetOtherHalf().GetHandle()));
}
return BitwiseUtils.IntToRgb(JslGetControllerLeftGripColour(joyshockHandle));
}
public Color GetRightGripColor()
{
if (otherHalf != null)
{
return BitwiseUtils.IntToRgb(splitType == SplitRight ? JslGetControllerColour(joyshockHandle) : JslGetControllerColour(GetOtherHalf().GetHandle()));
}
return BitwiseUtils.IntToRgb(JslGetControllerRightGripColour(joyshockHandle));
}
public Color GetLightbarColour()
{
return BitwiseUtils.IntToRgb(lightbarColour);
}
public void SetLightbarColour(Color color)
{
lightbarColour = BitwiseUtils.RgbToInt(color);
JslSetLightColour(joyshockHandle, lightbarColour);
}
public static int GetLightbarColourForPlayer(int playerNum = 0)
{
if (playerNum < 0)
{
return dsPlayerColours[dsPlayerColours.Length - 1];
}
playerNum = Math.Min(playerNum, dsPlayerColours.Length - 1);
return dsPlayerColours[playerNum];
}
public int GetHandle() public int GetHandle()
{ {
return joyshockHandle; return joyshockHandle;

38
Assets/Scripts/InputSystem/InputController.cs
View File

@ -64,31 +64,31 @@ namespace HeavenStudio.InputSystem
public enum InputFeatures public enum InputFeatures
{ {
//readable properties //readable properties
Readable_ShellColour, Readable_ShellColour = 1 << 0,
Readable_ButtonColour, Readable_ButtonColour = 1 << 1,
Readable_LeftGripColour, Readable_LeftGripColour = 1 << 2,
Readable_RightGripColour, Readable_RightGripColour = 1 << 3,
Readable_AnalogueTriggers, Readable_AnalogueTriggers = 1 << 4,
Readable_StringInput, Readable_StringInput = 1 << 5,
Readable_Pointer, Readable_Pointer = 1 << 6,
Readable_MotionSensor, Readable_MotionSensor = 1 << 7,
//writable properties //writable properties
Writable_PlayerLED, Writable_PlayerLED = 1 << 8,
Writable_LightBar, Writable_LightBar = 1 << 9,
Writable_Chroma, Writable_Chroma = 1 << 10,
Writable_Speaker, Writable_Speaker = 1 << 11,
//other / "special" properties //other / "special" properties
Extra_SplitControllerLeft, Extra_SplitControllerLeft = 1 << 12,
Extra_SplitControllerRight, Extra_SplitControllerRight = 1 << 13,
Extra_Rumble, Extra_Rumble = 1 << 14,
Extra_HDRumble, Extra_HDRumble = 1 << 15,
//supported control styles //supported control styles
Style_Pad, Style_Pad = 1 << 16,
Style_Baton, Style_Baton = 1 << 17,
Style_Touch Style_Touch = 1 << 18,
}; };
//Following enums are specific to Heaven Studio, can be removed in other applications //Following enums are specific to Heaven Studio, can be removed in other applications

164
Assets/Scripts/LevelEditor/SettingsDialog/Tabs/ControllerSettings.cs
View File

@ -40,6 +40,50 @@ namespace HeavenStudio.Editor
{ {
InputController lastController = PlayerInput.GetInputController(1); InputController lastController = PlayerInput.GetInputController(1);
InputController newController = PlayerInput.GetInputControllers()[controllersDropdown.value]; InputController newController = PlayerInput.GetInputControllers()[controllersDropdown.value];
AssignController(newController, lastController);
});
}
private void Update() {
if (isAutoSearching) {
var controllers = PlayerInput.GetInputControllers();
foreach (var controller in controllers) {
if (controller.GetLastButtonDown() > 0 || controller.GetLastKeyDown() > 0) {
InputController lastController = PlayerInput.GetInputController(1);
isAutoSearching = false;
autoSearchLabel.SetActive(false);
AssignController(controller, lastController);
controllersDropdown.value = PlayerInput.GetInputControllerId(1);
}
}
}
else if (isPairSearching) {
var controllers = PlayerInput.GetInputControllers();
InputController.InputFeatures lrFlag = pairSelectLR ? InputController.InputFeatures.Extra_SplitControllerLeft : InputController.InputFeatures.Extra_SplitControllerRight;
foreach (var controller in controllers) {
if (controller == PlayerInput.GetInputController(1)) continue;
InputController.InputFeatures features = controller.GetFeatures();
if (!features.HasFlag(lrFlag)) continue;
if (controller.GetLastButtonDown() > 0 || controller.GetLastKeyDown() > 0) {
InputJoyshock con = (InputJoyshock) PlayerInput.GetInputController(1);
con.AssignOtherHalf((InputJoyshock) controller);
isPairSearching = false;
pairSearchLabel.SetActive(false);
currentControllerLabel.text = "Current Controller: " + controller.GetDeviceName();
pairingLabel.text = "Joy-Con Pair Selected\nPairing Successful!";
ShowControllerIcon(controller);
StartCoroutine(SelectionVibrate(con));
StartCoroutine(SelectionVibrate((InputJoyshock) controller));
}
}
}
}
void AssignController(InputController newController, InputController lastController)
{
lastController.SetPlayer(-1); lastController.SetPlayer(-1);
newController.SetPlayer(1); newController.SetPlayer(1);
@ -58,82 +102,23 @@ namespace HeavenStudio.Editor
ShowControllerIcon(newController); ShowControllerIcon(newController);
InputController.InputFeatures features = newController.GetFeatures(); InputController.InputFeatures features = newController.GetFeatures();
if (features.HasFlag(InputController.InputFeatures.Extra_SplitControllerLeft) || features.HasFlag(InputController.InputFeatures.Extra_SplitControllerRight)) if (features.HasFlag(InputController.InputFeatures.Extra_SplitControllerLeft)) {
{ pairingLabel.text = "Joy-Con (L) Selected\nPress A to pair with Joy-Con (R)";
pairSelectLR = !features.HasFlag(InputController.InputFeatures.Extra_SplitControllerLeft); pairSelectLR = !features.HasFlag(InputController.InputFeatures.Extra_SplitControllerLeft);
pairSearchItem.SetActive(true); pairSearchItem.SetActive(true);
StartPairSearch(); StartPairSearch();
} }
else else if (features.HasFlag(InputController.InputFeatures.Extra_SplitControllerRight)) {
{ pairingLabel.text = "Joy-Con (R) Selected\nPress A to pair with Joy-Con (L)";
pairSearchItem.SetActive(false);
CancelPairSearch();
}
});
}
private void Update() {
if (isAutoSearching) {
var controllers = PlayerInput.GetInputControllers();
foreach (var controller in controllers) {
if (controller.GetLastButtonDown() > 0 || controller.GetLastKeyDown() > 0) {
InputController lastController = PlayerInput.GetInputController(1);
lastController.SetPlayer(-1);
controller.SetPlayer(1);
isAutoSearching = false;
autoSearchLabel.SetActive(false);
controllersDropdown.value = PlayerInput.GetInputControllerId(1);
if (typeof(InputJoyshock) == lastController.GetType()) {
((InputJoyshock)lastController).UnAssignOtherHalf();
}
if (typeof(InputJoyshock) == controller.GetType()) {
InputJoyshock con = (InputJoyshock) controller;
StartCoroutine(SelectionVibrate(con));
con.UnAssignOtherHalf();
}
currentControllerLabel.text = "Current Controller: " + controller.GetDeviceName();
ShowControllerIcon(controller);
InputController.InputFeatures features = controller.GetFeatures();
if (features.HasFlag(InputController.InputFeatures.Extra_SplitControllerLeft) || features.HasFlag(InputController.InputFeatures.Extra_SplitControllerRight))
{
pairSelectLR = !features.HasFlag(InputController.InputFeatures.Extra_SplitControllerLeft); pairSelectLR = !features.HasFlag(InputController.InputFeatures.Extra_SplitControllerLeft);
pairSearchItem.SetActive(true); pairSearchItem.SetActive(true);
StartPairSearch(); StartPairSearch();
} }
else else {
{
pairSearchItem.SetActive(false);
CancelPairSearch(); CancelPairSearch();
} pairSearchItem.SetActive(false);
}
}
}
else if (isPairSearching) {
var controllers = PlayerInput.GetInputControllers();
InputController.InputFeatures lrFlag = pairSelectLR ? InputController.InputFeatures.Extra_SplitControllerLeft : InputController.InputFeatures.Extra_SplitControllerRight;
foreach (var controller in controllers) {
if (controller == PlayerInput.GetInputController(1)) continue;
InputController.InputFeatures features = controller.GetFeatures();
if (!features.HasFlag(lrFlag)) continue;
if (controller.GetLastButtonDown() > 0 || controller.GetLastKeyDown() > 0) {
InputJoyshock con = (InputJoyshock) PlayerInput.GetInputController(1);
con.AssignOtherHalf((InputJoyshock) controller);
isPairSearching = false;
pairSearchLabel.SetActive(false);
currentControllerLabel.text = "Current Controller: " + controller.GetDeviceName();
pairingLabel.text = "Joy-Con (L / R) Selected\nPairing Successful!";
ShowControllerIcon(controller);
StartCoroutine(SelectionVibrate(con));
StartCoroutine(SelectionVibrate((InputJoyshock) controller));
}
}
} }
} }
@ -149,7 +134,6 @@ namespace HeavenStudio.Editor
if (!isAutoSearching) { if (!isAutoSearching) {
pairSearchLabel.SetActive(true); pairSearchLabel.SetActive(true);
isPairSearching = true; isPairSearching = true;
pairingLabel.text = "Joy-Con (L / R) Selected\nPairing Second Joy-Con...";
} }
} }
@ -157,7 +141,7 @@ namespace HeavenStudio.Editor
if (isPairSearching) { if (isPairSearching) {
pairSearchLabel.SetActive(false); pairSearchLabel.SetActive(false);
isPairSearching = false; isPairSearching = false;
pairingLabel.text = "Joy-Con (L / R) Selected\nPairing was cancelled."; pairingLabel.text = "Joy-Con Selected\nPairing was cancelled.";
} }
} }
@ -179,6 +163,7 @@ namespace HeavenStudio.Editor
optionData.text = vals[i].GetDeviceName(); optionData.text = vals[i].GetDeviceName();
dropDownData.Add(optionData); dropDownData.Add(optionData);
} }
controllersDropdown.ClearOptions();
controllersDropdown.AddOptions(dropDownData); controllersDropdown.AddOptions(dropDownData);
controllersDropdown.value = 0; controllersDropdown.value = 0;
} }
@ -207,55 +192,56 @@ namespace HeavenStudio.Editor
case "Joy-Con (L)": case "Joy-Con (L)":
case "Joy-Con (R)": case "Joy-Con (R)":
InputJoyshock joy = (InputJoyshock) controller; InputJoyshock joy = (InputJoyshock) controller;
controllerMat.SetColor("_BodyColor", BitwiseUtils.IntToRgb(JslGetControllerColour(joy.GetHandle()))); controllerMat.SetColor("_BodyColor", joy.GetBodyColor());
controllerMat.SetColor("_BtnColor", BitwiseUtils.IntToRgb(JslGetControllerButtonColour(joy.GetHandle()))); controllerMat.SetColor("_BtnColor", joy.GetButtonColor());
controllerMat.SetColor("_LGripColor", ColorUtility.TryParseHtmlString("#2F353A", out colour) ? colour : Color.white); controllerMat.SetColor("_LGripColor", ColorUtility.TryParseHtmlString("#2F353A", out colour) ? colour : Color.white);
controllerMat.SetColor("_RGripColor", ColorUtility.TryParseHtmlString("#2F353A", out colour) ? colour : Color.white); controllerMat.SetColor("_RGripColor", ColorUtility.TryParseHtmlString("#2F353A", out colour) ? colour : Color.white);
break; break;
case "Joy-Con Pair": case "Joy-Con Pair":
joy = (InputJoyshock) controller; joy = (InputJoyshock) controller;
int joySide = JslGetControllerSplitType(joy.GetHandle()); int joySide = JslGetControllerSplitType(joy.GetHandle());
controllerMat.SetColor("_BodyColor", BitwiseUtils.IntToRgb(joySide == SplitRight ? JslGetControllerButtonColour(joy.GetHandle()) : JslGetControllerButtonColour(joy.GetOtherHalf().GetHandle()))); controllerMat.SetColor("_BodyColor", joySide == SplitRight ? joy.GetButtonColor() : joy.GetOtherHalf().GetButtonColor());
controllerMat.SetColor("_BtnColor", BitwiseUtils.IntToRgb(joySide == SplitLeft ? JslGetControllerButtonColour(joy.GetHandle()) : JslGetControllerButtonColour(joy.GetOtherHalf().GetHandle()))); controllerMat.SetColor("_BtnColor", joySide == SplitLeft ? joy.GetButtonColor() : joy.GetOtherHalf().GetButtonColor());
controllerMat.SetColor("_LGripColor", BitwiseUtils.IntToRgb(joySide == SplitLeft ? JslGetControllerColour(joy.GetHandle()) : JslGetControllerColour(joy.GetOtherHalf().GetHandle()))); controllerMat.SetColor("_LGripColor", joy.GetLeftGripColor());
controllerMat.SetColor("_RGripColor", BitwiseUtils.IntToRgb(joySide == SplitRight ? JslGetControllerColour(joy.GetHandle()) : JslGetControllerColour(joy.GetOtherHalf().GetHandle()))); controllerMat.SetColor("_RGripColor", joy.GetRightGripColor());
break; break;
case "Pro Controller": case "Pro Controller":
joy = (InputJoyshock) controller; joy = (InputJoyshock) controller;
controllerMat.SetColor("_BodyColor", BitwiseUtils.IntToRgb(JslGetControllerColour(joy.GetHandle()))); controllerMat.SetColor("_BodyColor", joy.GetBodyColor());
controllerMat.SetColor("_BtnColor", BitwiseUtils.IntToRgb(JslGetControllerButtonColour(joy.GetHandle()))); controllerMat.SetColor("_BtnColor", joy.GetButtonColor());
controllerMat.SetColor("_LGripColor", BitwiseUtils.IntToRgb(JslGetControllerLeftGripColour(joy.GetHandle()))); controllerMat.SetColor("_LGripColor", joy.GetLeftGripColor());
controllerMat.SetColor("_RGripColor", BitwiseUtils.IntToRgb(JslGetControllerRightGripColour(joy.GetHandle()))); controllerMat.SetColor("_RGripColor", joy.GetRightGripColor());
break; break;
//TODO: dualshock 4 and dualsense lightbar colour support
case "DualShock 4": case "DualShock 4":
joy = (InputJoyshock) controller;
controllerMat.SetColor("_BodyColor", ColorUtility.TryParseHtmlString("#E1E2E4", out colour) ? colour : Color.white); controllerMat.SetColor("_BodyColor", ColorUtility.TryParseHtmlString("#E1E2E4", out colour) ? colour : Color.white);
controllerMat.SetColor("_BtnColor", ColorUtility.TryParseHtmlString("#414246", out colour) ? colour : Color.white); controllerMat.SetColor("_BtnColor", ColorUtility.TryParseHtmlString("#414246", out colour) ? colour : Color.white);
controllerMat.SetColor("_LGripColor", ColorUtility.TryParseHtmlString("#1E6EFA", out colour) ? colour : Color.white); controllerMat.SetColor("_LGripColor", joy.GetLightbarColour());
controllerMat.SetColor("_RGripColor", ColorUtility.TryParseHtmlString("#1E6EFA", out colour) ? colour : Color.white); controllerMat.SetColor("_RGripColor", joy.GetLightbarColour());
break; break;
case "DualSense": case "DualSense":
joy = (InputJoyshock) controller;
controllerMat.SetColor("_BodyColor", ColorUtility.TryParseHtmlString("#DEE0EB", out colour) ? colour : Color.white); controllerMat.SetColor("_BodyColor", ColorUtility.TryParseHtmlString("#DEE0EB", out colour) ? colour : Color.white);
controllerMat.SetColor("_BtnColor", ColorUtility.TryParseHtmlString("#272D39", out colour) ? colour : Color.white); controllerMat.SetColor("_BtnColor", ColorUtility.TryParseHtmlString("#272D39", out colour) ? colour : Color.white);
controllerMat.SetColor("_LGripColor", ColorUtility.TryParseHtmlString("#1E6EFA", out colour) ? colour : Color.white); controllerMat.SetColor("_LGripColor", joy.GetLightbarColour());
controllerMat.SetColor("_RGripColor", ColorUtility.TryParseHtmlString("#1E6EFA", out colour) ? colour : Color.white); controllerMat.SetColor("_RGripColor", joy.GetLightbarColour());
break; break;
default: default:
controllerMat.SetColor("_BodyColor", new Color(1, 1, 1, 1)); controllerMat.SetColor("_BodyColor", Color.white);
controllerMat.SetColor("_BtnColor", new Color(1, 1, 1, 1)); controllerMat.SetColor("_BtnColor", Color.white);
controllerMat.SetColor("_LGripColor", new Color(1, 1, 1, 1)); controllerMat.SetColor("_LGripColor", Color.white);
controllerMat.SetColor("_RGripColor", new Color(1, 1, 1, 1)); controllerMat.SetColor("_RGripColor", Color.white);
break; break;
} }
} }
IEnumerator SelectionVibrate(InputJoyshock controller) IEnumerator SelectionVibrate(InputJoyshock controller)
{ {
JslSetRumbleFrequency(controller.GetHandle(), 0.4f, 0.3f, 80f, 160f); JslSetRumbleFrequency(controller.GetHandle(), 0.4f, 0.4f, 80f, 160f);
yield return new WaitForSeconds(0.15f); yield return new WaitForSeconds(0.15f);
JslSetRumbleFrequency(controller.GetHandle(), 0f, 0f, 0f, 0f); JslSetRumbleFrequency(controller.GetHandle(), 0f, 0f, 0f, 0f);
yield return new WaitForSeconds(0.05f); yield return new WaitForSeconds(0.05f);
JslSetRumbleFrequency(controller.GetHandle(), 0.45f, 0.45f, 160f, 320f); JslSetRumbleFrequency(controller.GetHandle(), 0.5f, 0.5f, 160f, 320f);
yield return new WaitForSeconds(0.25f); yield return new WaitForSeconds(0.25f);
JslSetRumbleFrequency(controller.GetHandle(), 0f, 0f, 0f, 0f); JslSetRumbleFrequency(controller.GetHandle(), 0f, 0f, 0f, 0f);
} }

8
Assets/Scripts/Util/BitwiseUtils.cs
View File

@ -59,5 +59,13 @@ namespace HeavenStudio.Util
var blue = ( value >> 0 ) & 255; var blue = ( value >> 0 ) & 255;
return new Color(red/255f, green/255f, blue/255f); return new Color(red/255f, green/255f, blue/255f);
} }
public static int RgbToInt(Color color)
{
var red = (int)(color.r * 255);
var green = (int)(color.g * 255);
var blue = (int)(color.b * 255);
return (red << 16) | (green << 8) | blue;
}
} }
} }