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

Add checks for event.propagationCancelled in OrbitalControls

Browse Source
This commit is contained in:
Edwin Jakobs
2020-03-09 18:50:52 +01:00
parent 0d1eae3752
commit a8fc4f34d7
1 changed files with 77 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
orx-camera/src/main/kotlin/OrbitalControls.kt
View File

@@ -21,6 +21,7 @@ class OrbitalControls(val orbitalCamera: OrbitalCamera , val userInteraction: Bo
private lateinit var lastMousePosition: Vector2
private fun mouseScrolled(event: MouseEvent) {
if (!event.propagationCancelled) {
if (abs(event.rotation.x) > 0.1) return
when {
@@ -28,9 +29,11 @@ class OrbitalControls(val orbitalCamera: OrbitalCamera , val userInteraction: Bo
event.rotation.y < 0 -> orbitalCamera.dollyOut()
}
}
}
private fun mouseMoved(event: MouseEvent) {
if (!event.propagationCancelled) {
if (state == STATE.NONE) return
val delta = lastMousePosition - event.position
lastMousePosition = event.position
@@ -51,10 +54,11 @@ class OrbitalControls(val orbitalCamera: OrbitalCamera , val userInteraction: Bo
val rotY = 360.0 * delta.y / program.window.size.y
orbitalCamera.rotate(rotX, rotY)
}
}
}
private fun mouseButtonDown(event: MouseEvent) {
if (!event.propagationCancelled) {
val previousState = state
when (event.button) {
@@ -74,8 +78,10 @@ class OrbitalControls(val orbitalCamera: OrbitalCamera , val userInteraction: Bo
lastMousePosition = event.position
}
}
}
fun keyPressed(keyEvent: KeyEvent) {
if (!keyEvent.propagationCancelled) {
if (keyEvent.key == KEY_ARROW_RIGHT) {
orbitalCamera.pan(keySpeed, 0.0, 0.0)
}
@@ -115,6 +121,7 @@ class OrbitalControls(val orbitalCamera: OrbitalCamera , val userInteraction: Bo
orbitalCamera.zoom(-keySpeed)
}
}
}
// EXTENSION
override var enabled: Boolean = true