mirror of
https://github.com/amwatson/CitraVR.git
synced 2024-09-20 03:11:40 +02:00
add 'is already active?' checks to bumpers to ensure same behavior as sticks. In addition to the existing check for a previous mapping, this check only overwrites the value if the previous mapping had activity
This commit is contained in:
parent
569a98382b
commit
5aa8a4cae5
1 changed files with 16 additions and 4 deletions
|
@ -296,23 +296,35 @@ open class EmulationActivity : AppCompatActivity() {
|
|||
}
|
||||
|
||||
NativeLibrary.ButtonType.TRIGGER_L -> {
|
||||
val isAlreadyMappedToActive = isTriggerPressedL
|
||||
isTriggerPressedLMapped = true
|
||||
isTriggerPressedL = value != 0f
|
||||
if (isCurrentAxisActive || !isAlreadyMappedToActive) {
|
||||
isTriggerPressedL = value != 0f
|
||||
}
|
||||
}
|
||||
|
||||
NativeLibrary.ButtonType.TRIGGER_R -> {
|
||||
val isAlreadyMappedToActive = isTriggerPressedR
|
||||
isTriggerPressedRMapped = true
|
||||
isTriggerPressedR = value != 0f
|
||||
if (isCurrentAxisActive || !isAlreadyMappedToActive) {
|
||||
isTriggerPressedR = value != 0f
|
||||
}
|
||||
}
|
||||
|
||||
NativeLibrary.ButtonType.BUTTON_ZL -> {
|
||||
val isAlreadyMappedToActive = isTriggerPressedZL
|
||||
isTriggerPressedZLMapped = true
|
||||
isTriggerPressedZL = value != 0f
|
||||
if (isCurrentAxisActive || !isAlreadyMappedToActive) {
|
||||
isTriggerPressedZL = value != 0f
|
||||
}
|
||||
}
|
||||
|
||||
NativeLibrary.ButtonType.BUTTON_ZR -> {
|
||||
val isAlreadyMappedToActive = isTriggerPressedZR
|
||||
isTriggerPressedZRMapped = true
|
||||
isTriggerPressedZR = value != 0f
|
||||
if (isCurrentAxisActive || !isAlreadyMappedToActive) {
|
||||
isTriggerPressedZR = value != 0f
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue