Add controller input support.

Sebane1 · Sebane1 · commit a6b9090e1835 · 2026-01-16T21:15:40.000-06:00
diff --git a/server/core/src/main/java/dev/slimevr/tracking/trackers/Tracker.kt b/server/core/src/main/java/dev/slimevr/tracking/trackers/Tracker.kt
@@ -41,6 +41,7 @@ class Tracker @JvmOverloads constructor(
 	trackerNum: Int? = null,
 	val hasPosition: Boolean = false,
 	val hasRotation: Boolean = false,
+	val hasControls: Boolean = false,
 	val hasAcceleration: Boolean = false,
 	/**
 	 * User can change TrackerPosition, mounting...
@@ -106,6 +107,13 @@ class Tracker @JvmOverloads constructor(
 	// SlimeVR: +z backward, +x right, +y up
 	private var _acceleration = Vector3.NULL
 	private var _magVector = Vector3.NULL
+	private var _analogueThumbstick = Vector3.NULL
+	private var _button1 = false
+	private var _button2 = false
+	private var _menuRecenterButton = false
+	private var _stickClickButton = false
+	private var _trigger = 0f
+	private var _grip = 0f
 	var position = Vector3.NULL
 	val resetsHandler: TrackerResetsHandler = TrackerResetsHandler(this)
 	val filteringHandler: TrackerFilteringHandler = TrackerFilteringHandler()
@@ -447,4 +455,68 @@ class Tracker @JvmOverloads constructor(
 	fun resetFilteringQuats(reference: Quaternion) {
 		filteringHandler.resetMovingAverage(getAdjustedRotation(), reference)
 	}
+	/**
+	 * Sets the first button of the tracker.
+	 */
+	fun setButton1(button1: Boolean) {
+		this._button1 = button1
+	}
+	fun getButton1(): Boolean {
+		return this._button1
+	}
+	/**
+	 * Sets the second button of the tracker.
+	 */
+	fun setButton2(button2: Boolean) {
+		this._button2 = button2
+	}
+	fun getButton2(): Boolean {
+		return this._button2
+	}
+	/**
+	 * Sets the menu/recenter button of the tracker.
+	 */
+	fun setMenuRecenterButton(menuRecenterButton: Boolean) {
+		this._menuRecenterButton = menuRecenterButton
+	}
+	fun getMenuRecenterButton(): Boolean {
+		return this._menuRecenterButton
+	}
+
+	/**
+	 * Sets the stick click button of the tracker.
+	 */
+	fun setStickClickButton(stickClickButton: Boolean) {
+		this._stickClickButton = stickClickButton
+	}
+	fun getStickClickButton(): Boolean {
+		return this._stickClickButton
+	}
+	/**
+	 * Sets the grip of the tracker.
+	 */
+	fun setGrip(grip: Float) {
+		this._grip = grip
+	}
+	fun getGrip(): Float {
+		return this._grip
+	}
+	/**
+	 * Sets the grip of the tracker.
+	 */
+	fun setTrigger(trigger: Float) {
+		this._trigger = trigger
+	}
+	fun getTrigger(): Float {
+		return this._trigger
+	}
+	/**
+	 * Sets the thumbstick the tracker.
+	 */
+	fun setThumbstick(analogueThumbstick: Vector3) {
+		this._analogueThumbstick = analogueThumbstick
+	}
+	fun getThumbstick(): Vector3 {
+		return this._analogueThumbstick
+	}
 }
diff --git a/server/core/src/main/java/dev/slimevr/tracking/trackers/udp/TrackersUDPServer.kt b/server/core/src/main/java/dev/slimevr/tracking/trackers/udp/TrackersUDPServer.kt
@@ -557,6 +557,7 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
 						name = "Pause tracking toggle"
 						VRServer.instance.togglePauseTracking(RESET_SOURCE_NAME)
 					}
+
 				}
 
 				LogManager.info(
@@ -608,6 +609,68 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
 				// dont call dataTick here as this is just position update
 			}
 
+			is UDPPacket66ControllerButton -> {
+				if (connection == null) return
+				var name = ""
+				tracker = connection?.getTracker(packet.sensorId)
+				if (tracker == null) return
+				// If sensorOffset was applied to accel correctly, the axes will already
+				//  be correct for SlimeVR
+
+				when (packet.type) {
+					UDPPacket66ControllerButton.BUTTON_1_HELD -> {
+						name = "Button 1 Pressed"
+						tracker.setButton1(true)
+					}
+					UDPPacket66ControllerButton.BUTTON_1_UNHELD -> {
+						name = "Button 1 Unpressed"
+						tracker.setButton1(false)
+					}
+					UDPPacket66ControllerButton.BUTTON_2_HELD -> {
+						name = "Button 2 Pressed"
+						tracker.setButton2(true)
+					}
+					UDPPacket66ControllerButton.BUTTON_2_UNHELD -> {
+						name = "Button 2 Unpressed"
+						tracker.setButton2(false)
+					}
+					UDPPacket66ControllerButton.MENU_RECENTER_HELD -> {
+						name = "Menu/Recenter Pressed"
+						tracker.setMenuRecenterButton(true)
+					}
+					UDPPacket66ControllerButton.MENU_RECENTER_UNHELD -> {
+						name = "Menu/Recenter Unpressed"
+						tracker.setMenuRecenterButton(false)
+					}
+					UDPPacket66ControllerButton.STICK_CLICK_HELD -> {
+						name = "Stick Click Pressed"
+						tracker.setStickClickButton(true)
+					}
+					UDPPacket66ControllerButton.STICK_CLICK_UNHELD -> {
+						name = "Stick Click Unpressed"
+						tracker.setStickClickButton(false)
+					}
+				}
+
+				LogManager.info(
+					"[TrackerServer] User action from ${connection.descriptiveName} received. $name performed.",
+				)
+			}
+			is UDPPacket67Thumbstick -> {
+				tracker = connection?.getTracker(packet.sensorId)
+				if(tracker == null) return
+				tracker.setThumbstick(packet.analogueThumbstick);
+			}
+			is UDPPacket68Trigger -> {
+				tracker = connection?.getTracker(packet.sensorId)
+				if(tracker == null) return
+				tracker.setTrigger(packet.trigger);
+			}
+			is UDPPacket69Grip -> {
+				tracker = connection?.getTracker(packet.sensorId)
+				if(tracker == null) return
+				tracker.setTrigger(packet.grip);
+			}
 			is UDPPacket200ProtocolChange -> {}
 		}
 	}
diff --git a/server/core/src/main/java/dev/slimevr/tracking/trackers/udp/UDPPacket.kt b/server/core/src/main/java/dev/slimevr/tracking/trackers/udp/UDPPacket.kt
@@ -153,7 +153,80 @@ data class UDPPacket4Acceleration(var acceleration: Vector3 = Vector3.NULL) :
 	override var sensorId = 0
 	override fun readData(buf: ByteBuffer) {
 		acceleration = Vector3(UDPUtils.getSafeBufferFloat(buf), UDPUtils.getSafeBufferFloat(buf), UDPUtils.getSafeBufferFloat(buf))
+		sensorId = try {
+			buf.get().toInt() and 0xFF
+		} catch (e: BufferUnderflowException) {
+			// for owo track app
+			0
+		}
+	}
+}
 
+data class UDPPacket66ControllerButton(var type: Int = 0) :
+	UDPPacket(66),
+	SensorSpecificPacket {
+	override var sensorId = 0
+	override fun readData(buf: ByteBuffer) {
+		type = try {
+			buf.get().toInt() and 0xFF
+		} catch (e: BufferUnderflowException) {
+			0
+		}
+		sensorId = try {
+			buf.get().toInt() and 0xFF
+		} catch (e: BufferUnderflowException) {
+			// for owo track app
+			0
+		}
+	}
+	companion object {
+		const val BUTTON_1_HELD = 1
+		const val BUTTON_1_UNHELD = 2
+		const val BUTTON_2_HELD = 3
+		const val BUTTON_2_UNHELD = 4
+		const val MENU_RECENTER_HELD = 5
+		const val MENU_RECENTER_UNHELD = 6
+		const val STICK_CLICK_HELD = 7
+		const val STICK_CLICK_UNHELD = 8
+	}
+}
+
+data class UDPPacket67Thumbstick(var analogueThumbstick: Vector3 = Vector3.NULL) :
+	UDPPacket(67),
+	SensorSpecificPacket {
+	override var sensorId = 0
+	override fun readData(buf: ByteBuffer) {
+		analogueThumbstick = Vector3(UDPUtils.getSafeBufferFloat(buf), UDPUtils.getSafeBufferFloat(buf), 0f)
+		sensorId = try {
+			buf.get().toInt() and 0xFF
+		} catch (e: BufferUnderflowException) {
+			// for owo track app
+			0
+		}
+	}
+}
+
+data class UDPPacket68Trigger(var trigger: Float = 0f) :
+	UDPPacket(68),
+	SensorSpecificPacket {
+	override var sensorId = 0
+	override fun readData(buf: ByteBuffer) {
+		trigger	 = UDPUtils.getSafeBufferFloat(buf)
+		sensorId = try {
+			buf.get().toInt() and 0xFF
+		} catch (e: BufferUnderflowException) {
+			// for owo track app
+			0
+		}
+	}
+}
+
+data class UDPPacket69Grip(var grip: Float = 0f) :
+	UDPPacket(69),
+	SensorSpecificPacket {
+	override var sensorId = 0
+	override fun readData(buf: ByteBuffer) {
+		grip = UDPUtils.getSafeBufferFloat(buf)
 		sensorId = try {
 			buf.get().toInt() and 0xFF
 		} catch (e: BufferUnderflowException) {
diff --git a/server/core/src/main/java/dev/slimevr/tracking/trackers/udp/UDPProtocolParser.kt b/server/core/src/main/java/dev/slimevr/tracking/trackers/udp/UDPProtocolParser.kt
@@ -118,6 +118,10 @@ class UDPProtocolParser {
 		PACKET_FLEX_DATA -> UDPPacket26FlexData()
 		PACKET_POSITION -> UDPPacket27Position()
 		PACKET_PROTOCOL_CHANGE -> UDPPacket200ProtocolChange()
+		PACKET_CONTROLLER_BUTTON -> UDPPacket66ControllerButton()
+		PACKET_THUMBSTICK -> UDPPacket67Thumbstick()
+		PACKET_TRIGGER -> UDPPacket68Trigger()
+		PACKET_GRIP -> UDPPacket69Grip()
 		else -> null
 	}
 
@@ -157,6 +161,10 @@ class UDPProtocolParser {
 		const val PACKET_BUNDLE = 100
 		const val PACKET_BUNDLE_COMPACT = 101
 		const val PACKET_PROTOCOL_CHANGE = 200
+		const val PACKET_CONTROLLER_BUTTON = 66
+		const val PACKET_THUMBSTICK = 67
+		const val PACKET_TRIGGER = 68
+		const val PACKET_GRIP = 69
 		private val HANDSHAKE_BUFFER = ByteArray(64)
 		private val bundlePackets = ArrayList<UDPPacket>(128)
 
diff --git a/server/desktop/src/main/java/dev/slimevr/desktop/platform/ProtobufBridge.kt b/server/desktop/src/main/java/dev/slimevr/desktop/platform/ProtobufBridge.kt
@@ -97,6 +97,7 @@ abstract class ProtobufBridge(@JvmField protected val bridgeName: String) : ISte
 		for (tracker in sharedTrackers) {
 			writeTrackerUpdate(tracker)
 			writeBatteryUpdate(tracker)
+			writeControllerInputUpdate(tracker)
 		}
 	}
 
@@ -120,6 +121,23 @@ abstract class ProtobufBridge(@JvmField protected val bridgeName: String) : ISte
 		}
 		sendMessage(ProtobufMessage.newBuilder().setPosition(builder).build())
 	}
+	protected fun writeControllerInputUpdate(localTracker: Tracker?) {
+		val builder = ProtobufMessages.ControllerInput.newBuilder().setTrackerId(
+			localTracker!!.id,
+		)
+		if (localTracker.hasControls) {
+			val thumbstick = localTracker.getThumbstick()
+			builder.setThumbstickX(thumbstick.x)
+			builder.setThumbstickY(thumbstick.y)
+			builder.setButton1(localTracker.getButton1())
+			builder.setButton2(localTracker.getButton2())
+			builder.setMenuRecenter(localTracker.getMenuRecenterButton())
+			builder.setStickClick(localTracker.getStickClickButton())
+			builder.setTrigger(localTracker.getTrigger())
+			builder.setGrip(localTracker.getGrip())
+		}
+		sendMessage(ProtobufMessage.newBuilder().setControllerInput(builder).build())
+	}
 
 	@VRServerThread
 	protected open fun writeBatteryUpdate(localTracker: Tracker) {
diff --git a/server/desktop/src/main/java/dev/slimevr/desktop/platform/ProtobufMessages.java b/server/desktop/src/main/java/dev/slimevr/desktop/platform/ProtobufMessages.java
