djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

(unused) abstract joystick renderer system + debug logging + tm joystick mapping

Browse Source
This commit is contained in:
isXander
2023-04-14 15:29:52 +01:00
parent 6092c896fe
commit bf874fef4f
25 changed files with 598 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/assets/controlify/controllers/controller_identification.json5
+13 -4
View File
@@ -1,7 +1,7 @@
[
{
"name": "Xbox One Controller",
"identifier": "xbox_one",
"theme": "xbox_one",
"hids": [
[0x45e, 0x2ff],
@@ -21,7 +21,7 @@
},
{
"name": "Dualshock 4 Controller",
"identifier": "dualshock4",
"theme": "dualshock4",
"hids": [
[0x54c, 0x5c4],
@@ -31,7 +31,7 @@
},
{
"name": "Steam Deck",
"identifier": "steam_deck",
"theme": "xbox_one",
"hids": [
[0x28de, 0x1205],
@@ -39,10 +39,19 @@
},
{
"name": "Stadia Controller",
"identifier": "stadia",
"theme": "stadia",
"hids": [
[0x18d1, 0x9400],
]
},
{
"name": "Thrustmaster T16000M",
"theme": "thrustmaster",
"mapping": "tm_t16000m",
"hids": [
[0x044f, 0xb10a]
]
}
]
src/main/resources/assets/controlify/lang/en_us.json
+29 -35
View File
@@ -202,40 +202,6 @@
"controlify.guide.interact": "Interact",
"controlify.guide.pick_block": "Pick Block",
"controlify.joystick_mapping.unmapped.axis": "Axis #%s",
"controlify.joystick_mapping.unmapped.button": "Button #%s",
"controlify.joystick_mapping.unmapped.hat": "Hat #%s",
"controlify.joystick_mapping.unmapped.axis_direction.negative": "(Negative)",
"controlify.joystick_mapping.unmapped.axis_direction.positive": "(Positive)",
"controlify.joystick_mapping.xbox_one.axis.left_stick": "Left Stick",
"controlify.joystick_mapping.xbox_one.axis.left_stick.left": "Left",
"controlify.joystick_mapping.xbox_one.axis.left_stick.right": "Right",
"controlify.joystick_mapping.xbox_one.axis.left_stick.up": "Up",
"controlify.joystick_mapping.xbox_one.axis.left_stick.down": "Down",
"controlify.joystick_mapping.xbox_one.axis.right_stick": "Right Stick",
"controlify.joystick_mapping.xbox_one.axis.right_stick.left": "Left",
"controlify.joystick_mapping.xbox_one.axis.right_stick.right": "Right",
"controlify.joystick_mapping.xbox_one.axis.right_stick.up": "Up",
"controlify.joystick_mapping.xbox_one.axis.right_stick.down": "Down",
"controlify.joystick_mapping.xbox_one.axis.left_trigger": "Left Trigger",
"controlify.joystick_mapping.xbox_one.axis.left_trigger.up": "Up",
"controlify.joystick_mapping.xbox_one.axis.left_trigger.down": "Down",
"controlify.joystick_mapping.xbox_one.axis.right_trigger": "Right Trigger",
"controlify.joystick_mapping.xbox_one.axis.right_trigger.up": "Up",
"controlify.joystick_mapping.xbox_one.axis.right_trigger.down": "Down",
"controlify.joystick_mapping.xbox_one.button.a": "A",
"controlify.joystick_mapping.xbox_one.button.b": "B",
"controlify.joystick_mapping.xbox_one.button.x": "X",
"controlify.joystick_mapping.xbox_one.button.y": "Y",
"controlify.joystick_mapping.xbox_one.button.left_bumper": "Left Bumper",
"controlify.joystick_mapping.xbox_one.button.right_bumper": "Right Bumper",
"controlify.joystick_mapping.xbox_one.button.left_stick": "Left Stick Press",
"controlify.joystick_mapping.xbox_one.button.right_stick": "Right Stick Press",
"controlify.joystick_mapping.xbox_one.button.back": "Back",
"controlify.joystick_mapping.xbox_one.button.start": "Start",
"controlify.joystick_mapping.xbox_one.button.guide": "Guide",
"controlify.joystick_mapping.xbox_one.hat.dpad": "D-Pad",
"controlify.calibration.title": "Controller Calibration for '%s'",
"controlify.calibration.info": "This process will optimize settings for your controller to prevent stick drift. Stick drift happens in your controller thumbsticks and outputs slightly wrong values when you aren't touching them at all. Deadzones are used to prevent this.\n\nThis will only take a few seconds.",
"controlify.calibration.wait": "Please do not touch your controller thumbsticks until the progress bar is complete. This process will only take a few seconds.",
@@ -255,5 +221,33 @@
"controlify.hat_state.up": "Up",
"controlify.hat_state.down": "Down",
"controlify.hat_state.left": "Left",
"controlify.hat_state.right": "Right"
"controlify.hat_state.right": "Right",
"controlify.joystick_mapping.unmapped.axis": "Axis #%s",
"controlify.joystick_mapping.unmapped.button": "Button #%s",
"controlify.joystick_mapping.unmapped.hat": "Hat #%s",
"controlify.joystick_mapping.unmapped.axis_direction.negative": "(Negative)",
"controlify.joystick_mapping.unmapped.axis_direction.positive": "(Positive)",
"controlify.joystick_mapping.tm_t16000.axis.roll": "Roll",
"controlify.joystick_mapping.tm_t16000.axis.pitch": "Pitch",
"controlify.joystick_mapping.tm_t16000.axis.yaw": "Yaw",
"controlify.joystick_mapping.tm_t16000.axis.throttle": "Throttle",
"controlify.joystick_mapping.tm_t16000.button.trigger": "Trigger",
"controlify.joystick_mapping.tm_t16000.button.a": "A",
"controlify.joystick_mapping.tm_t16000.button.x": "X",
"controlify.joystick_mapping.tm_t16000.button.b": "B",
"controlify.joystick_mapping.tm_t16000.left_1": "Left 1",
"controlify.joystick_mapping.tm_t16000.left_2": "Left 2",
"controlify.joystick_mapping.tm_t16000.left_3": "Left 3",
"controlify.joystick_mapping.tm_t16000.left_4": "Left 4",
"controlify.joystick_mapping.tm_t16000.left_5": "Left 5",
"controlify.joystick_mapping.tm_t16000.left_6": "Left 6",
"controlify.joystick_mapping.tm_t16000.right_1": "Right 1",
"controlify.joystick_mapping.tm_t16000.right_2": "Right 2",
"controlify.joystick_mapping.tm_t16000.right_3": "Right 3",
"controlify.joystick_mapping.tm_t16000.right_4": "Right 4",
"controlify.joystick_mapping.tm_t16000.right_5": "Right 5",
"controlify.joystick_mapping.tm_t16000.right_6": "Right 6",
"controlify.joystick_mapping.tm_t16000.hat": "Hat"
}
src/main/resources/assets/controlify/mappings/compound-5be9f119-838b-3afd-92b3-e1069f897a51_a9dbf1cb-246b-3c70-91c9-40dcf2a13889.json
-176
View File
@@ -1,176 +0,0 @@
{
"axes": [
{
"ids": [0, 1],
"identifier": "ps4_left_stick",
"deadzone": true,
"rest": 0.0,
"axis_names": [
["right", "left"],
["down", "up"]
]
},
{
"ids": [2, 5],
"identifier": "ps4_right_stick",
"deadzone": true,
"axis_names": [
["right", "left"],
["down", "up"]
],
"rest": 0.0
},
{
"ids": [3],
"identifier": "ps4_left_trigger",
"rest": 0.0,
"deadzone": false,
"range": [0.0, 1.0],
"axis_names": [
["down", "up"]
]
},
{
"ids": [4],
"identifier": "ps4_right_trigger",
"rest": 0.0,
"deadzone": false,
"range": [0.0, 1.0],
"axis_names": [
["down", "up"]
]
},
{
"ids": [6, 7],
"identifier": "xbox_left_stick",
"deadzone": true,
"rest": 0.0,
"axis_names": [
["right", "left"],
["down", "up"]
]
},
{
"ids": [8, 9],
"identifier": "xbox_right_stick",
"deadzone": true,
"axis_names": [
["right", "left"],
["down", "up"]
],
"rest": 0.0
},
{
"ids": [10],
"identifier": "xbox_left_trigger",
"deadzone": false,
"rest": 0.0,
"range": [0.0, 1.0],
"axis_names": [
["down", "up"]
]
},
{
"ids": [11],
"identifier": "xbox_right_trigger",
"deadzone": false,
"rest": 0.0,
"range": [0.0, 1.0],
"axis_names": [
["down", "up"]
]
}
],
"buttons": [
{
"button": 0,
"name": "a"
},
{
"button": 1,
"name": "b"
},
{
"button": 2,
"name": "x"
},
{
"button": 3,
"name": "y"
},
{
"button": 4,
"name": "left_bumper"
},
{
"button": 5,
"name": "right_bumper"
},
{
"button": 6,
"name": "back"
},
{
"button": 7,
"name": "start"
},
{
"button": 8,
"name": "left_stick"
},
{
"button": 9,
"name": "right_stick"
},
{
"button": 10,
"name": "a1"
},
{
"button": 11,
"name": "b1"
},
{
"button": 12,
"name": "x1"
},
{
"button": 13,
"name": "y1"
},
{
"button": 14,
"name": "left_bumper1"
},
{
"button": 15,
"name": "right_bumper1"
},
{
"button": 16,
"name": "back1"
},
{
"button": 17,
"name": "start1"
},
{
"button": 18,
"name": "left_stick1"
},
{
"button": 19,
"name": "right_stick1"
}
],
"hats": [
{
"hat": 0,
"name": "dpad_xbox"
},
{
"hat": 1,
"name": "dpad_ps4"
}
]
}
src/main/resources/assets/controlify/mappings/tm_t16000.json
+113
View File
@@ -0,0 +1,113 @@
{
"axes": [
{
"ids": [0],
"identifier": "roll",
"deadzone": true,
"rest": 0.0,
"axis_names": [
["right", "left"]
]
},
{
"ids": [1],
"identifier": "pitch",
"deadzone": true,
"rest": 0.0,
"axis_names": [
["down", "up"]
]
},
{
"ids": [2],
"identifier": "yaw",
"deadzone": true,
"rest": 0.0,
"axis_names": [
["right", "left"]
]
},
{
"ids": [3],
"identifier": "throttle",
"rest": 0.0,
"deadzone": false,
"range": [0.0, 1.0],
"axis_names": [
["down", "up"]
]
}
],
"buttons": [
{
"button": 0,
"name": "trigger"
},
{
"button": 1,
"name": "a"
},
{
"button": 2,
"name": "x"
},
{
"button": 3,
"name": "b"
},
{
"button": 4,
"name": "left_1"
},
{
"button": 5,
"name": "left_2"
},
{
"button": 6,
"name": "left_3"
},
{
"button": 7,
"name": "left_4"
},
{
"button": 8,
"name": "left_5"
},
{
"button": 9,
"name": "left_6"
},
{
"button": 10,
"name": "right_1"
},
{
"button": 11,
"name": "right_2"
},
{
"button": 12,
"name": "right_3"
},
{
"button": 13,
"name": "right_4"
},
{
"button": 14,
"name": "right_5"
},
{
"button": 15,
"name": "right_6"
}
],
"hats": [
{
"name": "hat",
"hat": 0
}
]
}