teldufalsari/visionforge
1
0
Fork 0
forked from kscience/visionforge
Code Pull Requests Activity

Almost working OrbitControls for FX

Browse Source
This commit is contained in:
Alexander Nozik 2019-12-29 09:48:24 +03:00
parent 459d256ebd
commit 7733bc9258
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dataforge-vis-spatial/src/jvmMain/kotlin/hep/dataforge/vis/spatial/fx/OrbitControls.kt
View File

@ -25,10 +25,10 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
val azimuthProperty = SimpleDoubleProperty(spec.azimuth) val azimuthProperty = SimpleDoubleProperty(spec.azimuth)
var azimuth by azimuthProperty var azimuth by azimuthProperty
val zenithProperty = SimpleDoubleProperty(PI/2 - spec.latitude) val zenithProperty = SimpleDoubleProperty(PI / 2 - spec.latitude)
var zenith by zenithProperty var zenith by zenithProperty
val latitudeProperty = zenithProperty.unaryMinus().plus(PI/2) val latitudeProperty = zenithProperty.unaryMinus().plus(PI / 2)
val latitude by latitudeProperty val latitude by latitudeProperty
val baseXProperty = SimpleDoubleProperty(0.0) val baseXProperty = SimpleDoubleProperty(0.0)
@ -38,6 +38,8 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
val baseZProperty = SimpleDoubleProperty(0.0) val baseZProperty = SimpleDoubleProperty(0.0)
var z by baseZProperty var z by baseZProperty
private val baseTranslate = Translate()
// val basePositionProperty: ObjectBinding<Point3D> = // val basePositionProperty: ObjectBinding<Point3D> =
// nonNullObjectBinding(baseXProperty, baseYProperty, baseZProperty) { // nonNullObjectBinding(baseXProperty, baseYProperty, baseZProperty) {
// Point3D(x, y, z) // Point3D(x, y, z)
@ -47,12 +49,12 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
val centerMarker by lazy { val centerMarker by lazy {
Sphere(10.0).also { Sphere(10.0).also {
it.translateXProperty().bind(baseXProperty) it.transforms.setAll(center, baseTranslate)
it.translateYProperty().bind(baseYProperty)
it.translateZProperty().bind(baseZProperty)
} }
} }
private val center = Translate()
private val rx = Rotate(0.0, Rotate.X_AXIS) private val rx = Rotate(0.0, Rotate.X_AXIS)
private val ry = Rotate(0.0, Rotate.Y_AXIS) private val ry = Rotate(0.0, Rotate.Y_AXIS)
@ -63,7 +65,7 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
init { init {
camera.transforms.setAll(ry, rx, translate,rz) camera.transforms.setAll(center, ry, rx, translate, rz)
update() update()
val listener = InvalidationListener { val listener = InvalidationListener {
update() update()
@ -76,8 +78,8 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
baseZProperty.addListener(listener) baseZProperty.addListener(listener)
canvas.apply { canvas.apply {
camera.translateXProperty().bind(widthProperty().divide(2)) // center.xProperty().bind(widthProperty().divide(2))
camera.translateZProperty().bind(heightProperty().divide(2)) // center.zProperty().bind(heightProperty().divide(2))
handleMouse() handleMouse()
} }
// coordinateContainer?.vbox { // coordinateContainer?.vbox {
@ -94,6 +96,9 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
sin(zenith) * cos(azimuth) sin(zenith) * cos(azimuth)
).times(distance) ).times(distance)
val basePosition = Point3D(x, y, z) val basePosition = Point3D(x, y, z)
baseTranslate.x = x
baseTranslate.y = y
baseTranslate.z = z
//Create direction vector //Create direction vector
val cameraPosition = basePosition + spherePosition val cameraPosition = basePosition + spherePosition
val camDirection: Point3D = (-spherePosition).normalize() val camDirection: Point3D = (-spherePosition).normalize()
@ -151,8 +156,8 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
azimuth -= mouseDeltaX * MOUSE_SPEED * modifier * ROTATION_SPEED azimuth -= mouseDeltaX * MOUSE_SPEED * modifier * ROTATION_SPEED
zenith -= mouseDeltaY * MOUSE_SPEED * modifier * ROTATION_SPEED zenith -= mouseDeltaY * MOUSE_SPEED * modifier * ROTATION_SPEED
} else if (me.isSecondaryButtonDown) { } else if (me.isSecondaryButtonDown) {
x += mouseDeltaX * MOUSE_SPEED * modifier * TRACK_SPEED x += MOUSE_SPEED * modifier * TRACK_SPEED * (mouseDeltaX * cos(azimuth) + mouseDeltaY * sin(azimuth))
z -= mouseDeltaY * MOUSE_SPEED * modifier * TRACK_SPEED z += MOUSE_SPEED * modifier * TRACK_SPEED * (-mouseDeltaX * sin(azimuth) + mouseDeltaY * cos(azimuth))
} }
} }
onScroll = EventHandler<ScrollEvent> { event -> onScroll = EventHandler<ScrollEvent> { event ->
@ -165,7 +170,7 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
private const val SHIFT_MULTIPLIER = 10.0 private const val SHIFT_MULTIPLIER = 10.0
private const val MOUSE_SPEED = 0.1 private const val MOUSE_SPEED = 0.1
private const val ROTATION_SPEED = 0.02 private const val ROTATION_SPEED = 0.02
private const val TRACK_SPEED = 6.0 private const val TRACK_SPEED = 20.0
private const val RESIZE_SPEED = 10.0 private const val RESIZE_SPEED = 10.0
} }
} }