Skip to content

Commit

Permalink
feat(input): add erase button
Browse files Browse the repository at this point in the history
  • Loading branch information
@Xenira
Xenira committed Dec 3, 2023
1 parent 91f8634 commit 14ce7af
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 15 deletions.
Binary file modified libs/Managed/SteamVR_Actions.dll
View file
Binary file not shown.
7 changes: 6 additions & 1 deletion libs/StreamingAssets/SteamVR/actions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@
"name": "/actions/default/in/UICancel",
"type": "boolean"
},
{
"name": "/actions/default/in/ToggleErase",
"type": "boolean"
},
{
"name": "/actions/default/out/Haptic",
"type": "vibration"
Expand Down Expand Up @@ -261,7 +265,8 @@
"/actions/default/in/UIPageLeftSecondary": "UI Page Left Secondary",
"/actions/default/in/ToggleMenu": "ToggleMenu",
"/actions/default/in/UISubmit": "UI Submit",
"/actions/default/in/UICancel": "UI Cancel"
"/actions/default/in/UICancel": "UI Cancel",
"/actions/default/in/ToggleErase": "Toggle Erase"
}
]
}
14 changes: 9 additions & 5 deletions libs/StreamingAssets/SteamVR/bindings_knuckles.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,6 @@
"mode" : "button",
"path" : "/user/hand/right/input/a"
},
{
"inputs" : {},
"mode" : "button",
"path" : "/user/hand/right/input/b"
},
{
"inputs" : {
"click" : {
Expand Down Expand Up @@ -300,6 +295,15 @@
},
"mode" : "button",
"path" : "/user/hand/left/input/a"
},
{
"inputs" : {
"click" : {
"output" : "/actions/default/in/toggleerase"
}
},
"mode" : "button",
"path" : "/user/hand/left/input/b"
}
]
},
Expand Down
2 changes: 2 additions & 0 deletions plugin/src/input/input_patches.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,8 @@ private static Button MapButtonState(int actionId)
return SteamVRInputMapper.rotateRight;
case RewiredConsts.Action.Crafting_Menu:
return SteamVRInputMapper.Inventory;
case RewiredConsts.Action.Toggle_Erase:
return SteamVRInputMapper.toggleErase;
case RewiredConsts.Action.Cycle_Hotbar_Left:
return SteamVRInputMapper.cycleHotbarLeft;
case RewiredConsts.Action.UIPageLeft:
Expand Down
1 change: 1 addition & 0 deletions plugin/src/input/steamvr_input_mapper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public static class SteamVRInputMapper
public static Button cycleHotbarRight = new Button(SteamVR_Actions._default.CycleHotbarRight);
public static Button rotateLeft = new Button(SteamVR_Actions._default.RotateBuildingLeft);
public static Button rotateRight = new Button(SteamVR_Actions._default.RotoateBuildingRight);
public static Button toggleErase = new Button(SteamVR_Actions._default.ToggleErase);

public static void MapActions()
{
Expand Down
8 changes: 8 additions & 0 deletions unity/Assets/SteamVR_Input/ActionSetClasses/SteamVR_Input_ActionSet_default.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,14 @@ public virtual SteamVR_Action_Boolean UICancel
}
}

public virtual SteamVR_Action_Boolean ToggleErase
{
get
{
return SteamVR_Actions.default_ToggleErase;
}
}

public virtual SteamVR_Action_Vibration Haptic
{
get
Expand Down
21 changes: 18 additions & 3 deletions unity/Assets/SteamVR_Input/SteamVR_Input_Actions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ public partial class SteamVR_Actions

private static SteamVR_Action_Boolean p_default_UICancel;

private static SteamVR_Action_Boolean p_default_ToggleErase;

private static SteamVR_Action_Vibration p_default_Haptic;

public static SteamVR_Action_Boolean default_GrabPinch
Expand Down Expand Up @@ -389,6 +391,14 @@ public static SteamVR_Action_Boolean default_UICancel
}
}

public static SteamVR_Action_Boolean default_ToggleErase
{
get
{
return SteamVR_Actions.p_default_ToggleErase.GetCopy<SteamVR_Action_Boolean>();
}
}

public static SteamVR_Action_Vibration default_Haptic
{
get
Expand Down Expand Up @@ -437,6 +447,7 @@ private static void InitializeActionArrays()
SteamVR_Actions.default_ToggleMenu,
SteamVR_Actions.default_UISubmit,
SteamVR_Actions.default_UICancel,
SteamVR_Actions.default_ToggleErase,
SteamVR_Actions.default_Haptic};
Valve.VR.SteamVR_Input.actionsIn = new Valve.VR.ISteamVR_Action_In[] {
SteamVR_Actions.default_GrabPinch,
Expand Down Expand Up @@ -475,7 +486,8 @@ private static void InitializeActionArrays()
SteamVR_Actions.default_UIPageLeftSecondary,
SteamVR_Actions.default_ToggleMenu,
SteamVR_Actions.default_UISubmit,
SteamVR_Actions.default_UICancel};
SteamVR_Actions.default_UICancel,
SteamVR_Actions.default_ToggleErase};
Valve.VR.SteamVR_Input.actionsOut = new Valve.VR.ISteamVR_Action_Out[] {
SteamVR_Actions.default_Haptic};
Valve.VR.SteamVR_Input.actionsVibration = new Valve.VR.SteamVR_Action_Vibration[] {
Expand Down Expand Up @@ -511,7 +523,8 @@ private static void InitializeActionArrays()
SteamVR_Actions.default_UIPageLeftSecondary,
SteamVR_Actions.default_ToggleMenu,
SteamVR_Actions.default_UISubmit,
SteamVR_Actions.default_UICancel};
SteamVR_Actions.default_UICancel,
SteamVR_Actions.default_ToggleErase};
Valve.VR.SteamVR_Input.actionsSingle = new Valve.VR.SteamVR_Action_Single[] {
SteamVR_Actions.default_Squeeze};
Valve.VR.SteamVR_Input.actionsVector2 = new Valve.VR.SteamVR_Action_Vector2[] {
Expand Down Expand Up @@ -556,7 +569,8 @@ private static void InitializeActionArrays()
SteamVR_Actions.default_UIPageLeftSecondary,
SteamVR_Actions.default_ToggleMenu,
SteamVR_Actions.default_UISubmit,
SteamVR_Actions.default_UICancel};
SteamVR_Actions.default_UICancel,
SteamVR_Actions.default_ToggleErase};
}

private static void PreInitActions()
Expand Down Expand Up @@ -598,6 +612,7 @@ private static void PreInitActions()
SteamVR_Actions.p_default_ToggleMenu = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/ToggleMenu")));
SteamVR_Actions.p_default_UISubmit = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/UISubmit")));
SteamVR_Actions.p_default_UICancel = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/UICancel")));
SteamVR_Actions.p_default_ToggleErase = ((SteamVR_Action_Boolean)(SteamVR_Action.Create<SteamVR_Action_Boolean>("/actions/default/in/ToggleErase")));
SteamVR_Actions.p_default_Haptic = ((SteamVR_Action_Vibration)(SteamVR_Action.Create<SteamVR_Action_Vibration>("/actions/default/out/Haptic")));
}
}
Expand Down
7 changes: 6 additions & 1 deletion unity/Assets/StreamingAssets/SteamVR/actions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@
"name": "/actions/default/in/UICancel",
"type": "boolean"
},
{
"name": "/actions/default/in/ToggleErase",
"type": "boolean"
},
{
"name": "/actions/default/out/Haptic",
"type": "vibration"
Expand Down Expand Up @@ -261,7 +265,8 @@
"/actions/default/in/UIPageLeftSecondary": "UI Page Left Secondary",
"/actions/default/in/ToggleMenu": "ToggleMenu",
"/actions/default/in/UISubmit": "UI Submit",
"/actions/default/in/UICancel": "UI Cancel"
"/actions/default/in/UICancel": "UI Cancel",
"/actions/default/in/ToggleErase": "Toggle Erase"
}
]
}
14 changes: 9 additions & 5 deletions unity/Assets/StreamingAssets/SteamVR/bindings_knuckles.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,6 @@
"mode" : "button",
"path" : "/user/hand/right/input/a"
},
{
"inputs" : {},
"mode" : "button",
"path" : "/user/hand/right/input/b"
},
{
"inputs" : {
"click" : {
Expand Down Expand Up @@ -300,6 +295,15 @@
},
"mode" : "button",
"path" : "/user/hand/left/input/a"
},
{
"inputs" : {
"click" : {
"output" : "/actions/default/in/toggleerase"
}
},
"mode" : "button",
"path" : "/user/hand/left/input/b"
}
]
},
Expand Down

0 comments on commit 14ce7af

Please sign in to comment.