Skip to content

Commit

Permalink
Add support to joystick SVG models other the PS4 (default one)
Browse files Browse the repository at this point in the history
Use dedicated svg model for the Logitech Extreme 3D Pro joystick.
  • Loading branch information
rafaellehmkuhl authored and patrickelectric committed Nov 14, 2023
1 parent 9d31852 commit db88ade
Showing 1 changed file with 41 additions and 12 deletions.
53 changes: 41 additions & 12 deletions src/components/joysticks/JoystickPS.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import { v4 as uuid4 } from 'uuid'
import { computed, onBeforeUnmount, ref, toRefs, watch } from 'vue'
import { JoystickModel } from '@/libs/joystick/manager'
import type { InputWithPrettyName } from '@/libs/joystick/protocols'
import { scale } from '@/libs/utils'
import { type JoystickInput, type ProtocolControllerMapping, JoystickAxis, JoystickButton } from '@/types/joystick'
Expand All @@ -14,13 +15,23 @@ import { InputType } from '@/types/joystick'
const textColor = '#747474'
/**
* Joystick models
* Joystick SVG models
*/
enum Models {
enum SVGModel {
PS4 = 'PS4',
PS5 = 'PS5',
LogitechExtreme3DPro = 'LogitechExtreme3DPro',
}
const joystickSvgModel = computed(() => {
switch (joystickModel.value) {
case JoystickModel.LogitechExtreme3DPro:
return SVGModel.LogitechExtreme3DPro
default:
return SVGModel.PS4
}
})
const buttonPath: { [key in JoystickButton]: string } = {
[JoystickButton.B0]: 'path_b0',
[JoystickButton.B1]: 'path_b1',
Expand All @@ -42,12 +53,24 @@ const buttonPath: { [key in JoystickButton]: string } = {
[JoystickButton.B17]: 'path_b17',
}
const axisPath: { [key in JoystickAxis]: string } = {
[JoystickAxis.A0]: 'path_b10',
[JoystickAxis.A1]: 'path_b10',
[JoystickAxis.A2]: 'path_b11',
[JoystickAxis.A3]: 'path_b11',
}
const axisPath = computed((): { [key in JoystickAxis]: string } => {
switch (joystickSvgModel.value) {
case SVGModel.LogitechExtreme3DPro:
return {
[JoystickAxis.A0]: 'path_b14',
[JoystickAxis.A1]: 'path_b14',
[JoystickAxis.A2]: 'path_b13',
[JoystickAxis.A3]: 'path_b12',
}
default:
return {
[JoystickAxis.A0]: 'path_b10',
[JoystickAxis.A1]: 'path_b10',
[JoystickAxis.A2]: 'path_b11',
[JoystickAxis.A3]: 'path_b11',
}
}
})
/* eslint-disable */
const props = defineProps<{
Expand Down Expand Up @@ -144,7 +167,7 @@ watch(
)
const joystick_svg_path = computed(() => {
return `/images/${props.model}.svg`
return `/images/${joystickSvgModel.value}.svg`
})
watch(
Expand Down Expand Up @@ -173,6 +196,7 @@ watch(
const buttonLabelCorrespondency = toRefs(props).buttonLabelCorrespondency
const protocolMapping = toRefs(props).protocolMapping
const joystickModel = toRefs(props).model
watch([protocolMapping, buttonLabelCorrespondency], () => updateLabelsState())
const updateLabelsState = (): void => {
Expand Down Expand Up @@ -238,19 +262,24 @@ function toggleButton(button: JoystickButton, state: boolean): void {
function setAxes(axes: [JoystickAxis.A0, JoystickAxis.A1] | [JoystickAxis.A2, JoystickAxis.A3], values: [number, number]): void {
let xValue
let yValue
switch (props.model) {
case Models.PS5: {
switch (joystickModel.value) {
case SVGModel.PS5: {
xValue = axes[0] == JoystickAxis.A0 ? scale(values[0], -1, 1, -3920.9, -3882.1) : scale(values[0], -1, 1, -4144.8, -4106.1)
yValue = scale(values[1], -1, 1, -2192.7, -2153.9)
break
}
case SVGModel.LogitechExtreme3DPro: {
xValue = scale(values[0], -1, 1, -15, 15)
yValue = scale(values[1], -1, 1, -15, 15)
break
}
default: {
xValue = scale(values[0], -1, 1, -15, 15)
yValue = scale(values[1], -1, 1, -15, 15)
break
}
}
svg?.getElementById(axisPath[axes[0]])?.setAttribute('transform', `translate(${xValue} ${yValue})`)
svg?.getElementById(axisPath.value[axes[0]])?.setAttribute('transform', `translate(${xValue} ${yValue})`)
}
</script>

0 comments on commit db88ade

Please sign in to comment.