mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-10 05:32:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Simplify setting of deadzone size in assets

Browse Source
This commit is contained in:
Malin E
2022-04-25 10:45:54 +02:00
parent 71cae1363d
commit 516be81ecd
6 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/assets/examples/joystickProperty.asset
View File

@@ -25,8 +25,8 @@
-- First - Name of the joystick that should be bound
-- Second - Which axis should be bound of this joystick
-- Third - The property uri
-- Fourth - (optional) The smallest value that you wnat to allow this property on the joystick
-- Fifth - (optional) The largest value that you wnat to allow this property on the joystick
-- Fourth - (optional) The smallest value that you want to allow this property on the joystick
-- Fifth - (optional) The largest value that you want to allow this property on the joystick
-- Sixth - (optional) Determines whether the axis should be inverted
-- Seventh - (optional) Should this property change be sent to other connected remote sessions

14
data/assets/util/joysticks/ps4.asset
View File

@@ -52,12 +52,14 @@ asset.onInitialize(function()
local controller = PS4Controller;
local name = "Wireless Controller";
openspace.navigation.setAxisDeadZone(name, controller.LeftThumbStick[1], 0.15)
openspace.navigation.setAxisDeadZone(name, controller.LeftThumbStick[2], 0.15)
openspace.navigation.setAxisDeadZone(name, controller.RightThumbStick[1], 0.15)
openspace.navigation.setAxisDeadZone(name, controller.RightThumbStick[2], 0.15)
openspace.navigation.setAxisDeadZone(name, controller.L2, 0.05)
openspace.navigation.setAxisDeadZone(name, controller.R2, 0.05)
local deadzoneJoysticks = 0.15
local deadzoneTriggers = 0.05
openspace.navigation.setAxisDeadZone(name, controller.LeftThumbStick[1], deadzoneJoysticks)
openspace.navigation.setAxisDeadZone(name, controller.LeftThumbStick[2], deadzoneJoysticks)
openspace.navigation.setAxisDeadZone(name, controller.RightThumbStick[1], deadzoneJoysticks)
openspace.navigation.setAxisDeadZone(name, controller.RightThumbStick[2], deadzoneJoysticks)
openspace.navigation.setAxisDeadZone(name, controller.L2, deadzoneTriggers)
openspace.navigation.setAxisDeadZone(name, controller.R2, deadzoneTriggers)
openspace.navigation.bindJoystickAxis(name, controller.LeftThumbStick[1], "Orbit X");
openspace.navigation.bindJoystickAxis(name, controller.LeftThumbStick[2], "Orbit Y", true);

13
data/assets/util/joysticks/space-mouse-enterprise-wireless.asset
View File

@@ -37,12 +37,13 @@ asset.onInitialize(function()
local controller = SpaceMouse;
local name = "3Dconnexion Universal Receiver";
openspace.navigation.setAxisDeadZone(name, controller.Push[1], 0.1)
openspace.navigation.setAxisDeadZone(name, controller.Push[2], 0.1)
openspace.navigation.setAxisDeadZone(name, controller.Twist[1], 0.1)
openspace.navigation.setAxisDeadZone(name, controller.Tilt[2], 0.1)
openspace.navigation.setAxisDeadZone(name, controller.Push[3], 0.1)
openspace.navigation.setAxisDeadZone(name, controller.Tilt[1], 0.1)
local deadzone = 0.15
openspace.navigation.setAxisDeadZone(name, controller.Push[1], deadzone)
openspace.navigation.setAxisDeadZone(name, controller.Push[2], deadzone)
openspace.navigation.setAxisDeadZone(name, controller.Twist[1], deadzone)
openspace.navigation.setAxisDeadZone(name, controller.Tilt[2], deadzone)
openspace.navigation.setAxisDeadZone(name, controller.Push[3], deadzone)
openspace.navigation.setAxisDeadZone(name, controller.Tilt[1], deadzone)
openspace.navigation.bindJoystickAxis(name, controller.Push[1], "Orbit X");
openspace.navigation.bindJoystickAxis(name, controller.Push[2], "Orbit Y");

13
data/assets/util/joysticks/space-mouse-enterprise.asset
View File

@@ -37,12 +37,13 @@ asset.onInitialize(function()
local controller = SpaceMouse;
local name = "SpaceMouse Enterprise";
openspace.navigation.setAxisDeadZone(name, controller.Push[1], 0.1)
openspace.navigation.setAxisDeadZone(name, controller.Push[2], 0.1)
openspace.navigation.setAxisDeadZone(name, controller.Twist[1], 0.1)
openspace.navigation.setAxisDeadZone(name, controller.Tilt[2], 0.1)
openspace.navigation.setAxisDeadZone(name, controller.Push[3], 0.1)
openspace.navigation.setAxisDeadZone(name, controller.Tilt[1], 0.1)
local deadzone = 0.15
openspace.navigation.setAxisDeadZone(name, controller.Push[1], deadzone)
openspace.navigation.setAxisDeadZone(name, controller.Push[2], deadzone)
openspace.navigation.setAxisDeadZone(name, controller.Twist[1], deadzone)
openspace.navigation.setAxisDeadZone(name, controller.Tilt[2], deadzone)
openspace.navigation.setAxisDeadZone(name, controller.Push[3], deadzone)
openspace.navigation.setAxisDeadZone(name, controller.Tilt[1], deadzone)
openspace.navigation.bindJoystickAxis(name, controller.Push[1], "Orbit X");
openspace.navigation.bindJoystickAxis(name, controller.Push[2], "Orbit Y");

14
data/assets/util/joysticks/xbox-wireless.asset
View File

@@ -50,12 +50,14 @@ asset.onInitialize(function()
local controller = XBoxController;
local name = "Wireless Xbox Controller";
openspace.navigation.setAxisDeadZone(name, controller.LeftThumbStick[1], 0.15)
openspace.navigation.setAxisDeadZone(name, controller.LeftThumbStick[2], 0.15)
openspace.navigation.setAxisDeadZone(name, controller.RightThumbStick[1], 0.15)
openspace.navigation.setAxisDeadZone(name, controller.RightThumbStick[2], 0.15)
openspace.navigation.setAxisDeadZone(name, controller.LeftTrigger, 0.05)
openspace.navigation.setAxisDeadZone(name, controller.RightTrigger, 0.05)
local deadzoneJoysticks = 0.15
local deadzoneTriggers = 0.05
openspace.navigation.setAxisDeadZone(name, controller.LeftThumbStick[1], deadzoneJoysticks)
openspace.navigation.setAxisDeadZone(name, controller.LeftThumbStick[2], deadzoneJoysticks)
openspace.navigation.setAxisDeadZone(name, controller.RightThumbStick[1], deadzoneJoysticks)
openspace.navigation.setAxisDeadZone(name, controller.RightThumbStick[2], deadzoneJoysticks)
openspace.navigation.setAxisDeadZone(name, controller.LeftTrigger, deadzoneTriggers)
openspace.navigation.setAxisDeadZone(name, controller.RightTrigger, deadzoneTriggers)
openspace.navigation.bindJoystickAxis(name, controller.LeftThumbStick[1], "Orbit X");
openspace.navigation.bindJoystickAxis(name, controller.LeftThumbStick[2], "Orbit Y", true);

14
data/assets/util/joysticks/xbox.asset
View File

@@ -50,12 +50,14 @@ asset.onInitialize(function()
local controller = XBoxController;
local name = "Xbox Controller";
openspace.navigation.setAxisDeadZone(name, controller.LeftThumbStick[1], 0.15)
openspace.navigation.setAxisDeadZone(name, controller.LeftThumbStick[2], 0.15)
openspace.navigation.setAxisDeadZone(name, controller.RightThumbStick[1], 0.15)
openspace.navigation.setAxisDeadZone(name, controller.RightThumbStick[2], 0.15)
openspace.navigation.setAxisDeadZone(name, controller.LeftTrigger, 0.05)
openspace.navigation.setAxisDeadZone(name, controller.RightTrigger, 0.05)
local deadzoneJoysticks = 0.15
local deadzoneTriggers = 0.05
openspace.navigation.setAxisDeadZone(name, controller.LeftThumbStick[1], deadzoneJoysticks)
openspace.navigation.setAxisDeadZone(name, controller.LeftThumbStick[2], deadzoneJoysticks)
openspace.navigation.setAxisDeadZone(name, controller.RightThumbStick[1], deadzoneJoysticks)
openspace.navigation.setAxisDeadZone(name, controller.RightThumbStick[2], deadzoneJoysticks)
openspace.navigation.setAxisDeadZone(name, controller.LeftTrigger, deadzoneTriggers)
openspace.navigation.setAxisDeadZone(name, controller.RightTrigger, deadzoneTriggers)
openspace.navigation.bindJoystickAxis(name, controller.LeftThumbStick[1], "Orbit X");
openspace.navigation.bindJoystickAxis(name, controller.LeftThumbStick[2], "Orbit Y", true);