Emma Broman
ff54ad27a8
Do a temporary workaround to avoid going to the exact same position
2021-12-14 14:08:59 +01:00
Malin E
09b9d8437f
Improve zoom offset factor
2021-12-13 13:26:15 +01:00
Malin E
6f6519fbf7
Add property to zomm slightly closer or further away
2021-12-10 11:39:47 +01:00
Malin E
de54a5c09b
Merge branch 'feature/multiple-joysticks' into project/spaceship-installation
...
* Resolve conflicts in joystickcamerastates.cpp
2021-12-07 11:22:53 +01:00
Emma Broman
3638a118cb
Revert "Merge branch 'feature/quickfix-zoomout-camerapath-collisions' into project/spaceship-installation"
...
This reverts commit 386b47bfb81f71904322
2021-12-03 12:48:30 +01:00
Emma Broman
386b47bfb8
Merge branch 'feature/quickfix-zoomout-camerapath-collisions' into project/spaceship-installation
2021-12-03 10:41:54 +01:00
Malin E
8299e4db22
Address PR comments
2021-11-30 10:46:44 +01:00
Malin E
6d89897c25
Merge branch 'feature/multiple-joysticks' into project/spaceship-installation
2021-11-24 13:29:24 +01:00
Emma Broman
dc8a0f7b0e
Structure som properties and add option ot invert input
2021-11-19 09:13:28 +01:00
Emma Broman
77095b4467
Change angle names to match euler angles better
2021-11-19 08:38:57 +01:00
Emma Broman
51bd416fd0
Interpolate back to look at target at the end of a path
2021-11-19 08:15:28 +01:00
Emma Broman
85416e0cf9
Makes interaction during path work with joystick
...
Until we have a better implementation for binding joystick axes, just use the orbital navigator's joystickstates
2021-11-18 08:23:56 +01:00
Malin E
78b1f2c6e1
Remove support for sticky axis and sensitivity to Property type
2021-11-17 16:57:05 +01:00
Emma Broman
3055f25c26
Initial navigation with mouse during path traversal
2021-11-17 14:14:15 +01:00
Emma Broman
3d3db47d76
Small include updates to adapt to inputstate changes
2021-11-12 14:07:07 +01:00
Malin E
3fdae48092
Exchange normalisation property for joysticks to JoystickType
...
* Joysticks can either be "JoystickLike" or "TriggerLike", where the
triggers are normalized and have the deadzone close to -1 instead to 0
* Solves issue with zoom friction not to turn off for controllers
2021-11-12 11:46:17 +01:00
Malin E
a515f85234
Add ability to bind a joystick axis to a property value
2021-11-11 09:27:54 +01:00
Malin E
3526e14e66
Add support for several joysticks at the smae time
2021-11-04 13:19:43 +01:00
Malin E
8bddf38f02
Split InputState into MouseInputState and KeyboardInputState
2021-11-03 15:28:37 +01:00
Emma Broman
5d0e811cc3
Quick and dirty fix to avoid ZoomOutOverview curve colliding into planet when going between two nodes on the surface of a planet
2021-10-15 15:18:03 +02:00
Alexander Bock
4a860fb01d
Some code facelifting
2021-10-14 10:31:46 +02:00
Alexander Bock
76dd45e5ce
Event System ( #1741 )
...
* Add implementation of the EventEngine to handle global event chains
* Add properties to SceneGraphNodes to determine two distance radii for camera-based events
2021-10-11 21:53:00 +02:00
GPayne
5b63fff944
Merge branch 'master' into feature/profileOverScene
2021-09-12 21:11:12 -06:00
GPayne
51f6c9d45b
Rearranged profile initializations and verified that all init correctly
2021-09-12 21:05:00 -06:00
GPayne
cd50c3e4cf
Working non-assetized initializations for profile sections besides modules and interesting nodes
2021-09-07 21:55:44 -06:00
Emma Broman
5620cec153
Add an OrbitAroundUp IdleBehavior
...
Rotates around the y-axis of the node instead of the z-axis. Would be great if the nodes themselves knew about which axis of rotation would be to prefer.
2021-09-06 15:52:50 +02:00
Emma Broman
1516c066c9
Don't scale camera path speed if no duration was given
...
Just using the current distance for camera speed works better than setting a default duration based on the path length
2021-08-25 15:58:28 +02:00
Emma Broman
5d11af00dc
Rename curve type to path type
...
And clarify documentation a little. "Path type" makes more sense to a user, who is never actually exposed to the concept of curves
2021-08-16 12:59:00 +02:00
Emma Broman
a39dcf2567
Adress review comments
2021-08-15 19:34:10 +02:00
Emma Broman
4ccc47161c
Add an AvoidCollisionWithLookAt curve
...
Same path as AvoidCollision, but with lookat rotation instead of slerp. Useful (needed) for some cases in the interactive installations, but should be replaced later on as it leads to fast rotations
2021-08-13 15:55:06 +02:00
Emma Broman
3fc4c50836
Group the linear flight properties together in the UI
...
Note that it does break any previous usage of the linear flight, due to a the new propertyowner leading to updated URIs
2021-07-16 15:44:17 +02:00
Emma Broman
8c7a2c5252
Also abort IdleBehavior when starting a session recording playback
2021-07-16 15:26:20 +02:00
Emma Broman
cc2a255868
IdleBehavior interpolation for dampening and abort on more interactions
...
* Abort on: changing anchor, starting a path or navigating manually
* Add interpolation to dampen start and end of idle behavior motion
2021-07-14 16:34:50 +02:00
Emma Broman
2905fef7d9
Update camera scaling based on anchor pos even if path is playing
...
Previously this was only done hwen the Orbitalnavigator controlled the camera
2021-07-14 10:54:30 +02:00
Emma Broman
be9df994c8
Allow applying idle behavior on path finish
...
Ideally we want to specify this per individual path, but for now do it with a property for the PathNavigator
2021-07-14 10:23:17 +02:00
Emma Broman
7ba319e52e
Add option to orbit at constant latitude
2021-07-14 10:23:17 +02:00
Emma Broman
2241673b15
Abort idleBehavior on camera interaction
2021-07-14 10:23:16 +02:00
Emma Broman
8800f0b1cb
Refactor and add a speed scale
2021-07-14 10:23:16 +02:00
Emma Broman
aeb0a2cf7f
Move StopBehavior to OrbitalNavigator and rename to IdleBehavior
2021-07-14 10:23:16 +02:00
Emma Broman
de8005be4d
Split up path helper functions to separate, more specific, files
...
Some in Ghoul and some in OpenSpace core util
2021-07-14 10:22:48 +02:00
Emma Broman
771aa46fcd
Adress review comments
2021-07-09 15:35:14 +02:00
Emma Broman
ee3e0c8ae0
Start cleaning up and document some helper functions
2021-07-02 11:23:15 +02:00
Emma Broman
0019360a2c
Tiny navigation code cleanup
2021-07-02 09:43:04 +02:00
Emma Broman
6119b9b2a2
Make speed scale affect speed during path traversal
2021-06-24 15:04:25 +02:00
Emma Broman
43729ed911
Move path creation code into path class file
2021-06-23 15:58:48 +02:00
Emma Broman
890c8ae25f
Restructure helper function slightly (gotta find out where to place them later on)
2021-06-23 15:18:00 +02:00
Emma Broman
4ae70283a7
Add path rendering code to debugging module
2021-06-23 15:07:42 +02:00
Emma Broman
77bdfaefd6
Move camera path code into core and refactor navigation code a bit
2021-06-23 09:12:36 +02:00
