kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[orx-camera] Add propagationCancelled checks

Browse Source
This commit is contained in:
Edwin Jakobs
2023-07-11 16:16:33 +02:00
parent ddb308bb9b
commit 12da813b09
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
orx-camera/src/commonMain/kotlin/Camera2D.kt
View File

@@ -43,6 +43,7 @@ class Camera2D : Extension, ChangeEvents {
rotationCenter = it.position rotationCenter = it.position
} }
mouse.dragged.listen { mouse.dragged.listen {
if (!it.propagationCancelled) {
when (it.button) { when (it.button) {
MouseButton.LEFT -> view = buildTransform { MouseButton.LEFT -> view = buildTransform {
translate(it.dragDisplacement) translate(it.dragDisplacement)
@@ -58,7 +59,9 @@ class Camera2D : Extension, ChangeEvents {
} }
dirty = true dirty = true
} }
}
mouse.scrolled.listen { mouse.scrolled.listen {
if (!it.propagationCancelled) {
val scaleFactor = 1.0 - it.rotation.y * 0.03 val scaleFactor = 1.0 - it.rotation.y * 0.03
view = buildTransform { view = buildTransform {
translate(it.position) translate(it.position)
@@ -68,6 +71,7 @@ class Camera2D : Extension, ChangeEvents {
dirty = true dirty = true
} }
} }
}
override fun setup(program: Program) { override fun setup(program: Program) {
setupMouseEvents(program.mouse) setupMouseEvents(program.mouse)