Commit Graph

2010 Commits

Author SHA1 Message Date
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
18a0a89030 Remove fogotten camera file (moved to another folder) 2021-07-14 10:22:41 +02:00
Emma Broman
16173d7afe Merge branch 'master' into thesis/2019/camera-paths and resolve conflicts
# Conflicts:
#	modules/globebrowsing/globebrowsingmodule.cpp
#	modules/globebrowsing/globebrowsingmodule_lua.inl
2021-07-09 15:43:17 +02:00
Emma Broman
771aa46fcd Adress review comments 2021-07-09 15:35:14 +02:00
Malin Ejdbo
b910282291 Merge branch 'master' into feature/radec-conversion 2021-07-05 09:38:12 +02:00
Alexander Bock
8e5a7034ee Add the ability to optionally ignore the scale value read from session recordings 2021-07-04 19:45:54 +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
1912f8f08b Avoid non-supported ranges for exponential slider (#1672)
* Warn if setExponent is called with an invalid minmax range

* Disable bounding and interaction sphere exponent, to suppress warning
2021-07-02 08:11:37 +02:00
Alexander Bock
87da9a27ab Feature/path normalization (#1674)
* Path normalization (making sure there are fewer cases of '"..."'
* Using more std::filesystem::path instead of std::string
* Update Ghoul
2021-07-01 23:46:22 +02:00
Malin Ejdbo
21204e8367 Address PR comments 2021-07-01 17:38:28 +02:00
Malin Ejdbo
9dc2b3348b Clean up 2021-06-29 10:06:19 +02:00
Malin Ejdbo
2c47735757 Merge branch 'master' into feature/radec-conversion 2021-06-28 12:13:58 +02:00
Malin Ejdbo
d5a12f813e Enable both strings and numbers to lua ra dec conversion function 2021-06-28 12:05:21 +02:00
Emma Broman
6119b9b2a2 Make speed scale affect speed during path traversal 2021-06-24 15:04:25 +02:00
Emma Broman
8063b54fb8 Merge branch 'master' into thesis/2019/camera-paths
# Conflicts:
#	src/navigation/navigationhandler.cpp
2021-06-23 16:31:14 +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
Malin Ejdbo
c39baac3a8 Add functions to convert a cartesian coordinate to a ra dec distance 2021-06-21 13:43:31 +02:00
Alexander Bock
741ed2ac05 Remove remnant of scriptlogtype in log message 2021-06-18 09:16:15 +02:00
Alexander Bock
b1f10b1b70 Add the ability to specify RenderEngine font sizes in the configuration file (closes #1653) 2021-06-17 15:39:16 +02:00
Malin Ejdbo
094ca18471 Merge branch 'master' into feature/radec-conversion 2021-06-17 11:19:51 +02:00
Alexander Bock
a69b636dea Global sweep to cleanup the handling of floating point numbers and glm default initialization 2021-06-16 23:09:49 +02:00
Malin Ejdbo
660ff65baf Rause code for the conversion for ra and dec
* float -> double

* Add error handling
2021-06-16 10:56:46 +02:00
Malin Ejdbo
c8d7d5c294 Merge branch 'master' into feature/radec-conversion 2021-06-15 15:44:24 +02:00
Malin Ejdbo
9043f7d3cd Add initial version of lua ra dec conversion function 2021-06-15 09:18:33 +02:00
Malin Ejdbo
d139b38d31 Seperate the different joystick configurations into their own assets 2021-06-11 16:30:16 +02:00
Alexander Bock
402233da85 Change profile code to make it work with GCC 9.3 2021-05-31 13:23:47 +02:00
Alexander Bock
744ba0dc9b Feature/side by side (#1613)
* Make atmosphere, raycasting, and trails work with side_by_side stereo
2021-05-28 23:31:10 +02:00
Emma Broman
1695937749 Feature/numeric slider updates (#1609)
* Remove Logarithmic ViewOption and instead always use exponent of NumericalProperty + set exponent of some renderables' properties

* Add MinMaxRange ViewOption for Vec2 properties

* Add MinMaxRange viewoption to some existing vec2 properties and combine some other related properties to be able to utilize it. For example Min and Max label sizes, fade in/out distances, inner and outer radius. OBS! Includes renaming several properties (**breaking change**)

* Refactor and document labels code. OBS! Includes renaming several properties (**breaking change**)

* Add comments for some assets that have labels that are not working correctly


Renderables with rename properties: RenderableLabels , GlobeLabelsComponent, RenderableBillboardsCloud, RenderableDUMeshes, RenderableRadialGrid )
2021-05-28 17:00:55 +02:00
Alexander Bock
cb17bd7570 Remove warnings 2021-05-25 22:06:49 +02:00
Alexander Bock
6cf6e450fb Address MacOS compile issues, make ISS model scene graph node visible 2021-05-25 17:50:31 +02:00
Alexander Bock
c3ba532bdb Feature/cleanup (#1608)
* Revert screenlog back to showing Info and above messages
 * Various code cleanup
2021-05-25 14:08:33 +02:00
GPayne
0d5909b6a9 Merge master in 2021-05-24 23:49:51 -06:00
Malin E
ebaeb5d568 Merge pull request #1593 from OpenSpace/feature/space-mouse
Feature/space mouse
2021-05-24 14:01:05 +02:00
GPayne
e374eef72d Fixed merge conflicts with master 2021-05-20 19:55:49 -06:00
GPayne
3f9ae245c7 Added loop playback option to repeat playback file 2021-05-20 19:06:39 -06:00
GPayne
fb739d719e Restored support for session recording files in any directory 2021-05-20 12:44:29 -06:00
GPayne
5dfe4cb5c2 Added topic for new session recording pausing within playback 2021-05-20 12:09:11 -06:00
Malin Ejdbo
80eba3bdd9 Address PR comments 2021-05-20 13:44:45 +02:00
GPayne
413639e9fe Fixed problems with pausing time and time management 2021-05-19 19:47:51 -06:00
Malin Ejdbo
0d06c68f6f Clean up 2021-05-18 16:41:15 +02:00
Alexander Bock
92432caed2 Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string 2021-05-17 00:23:15 +02:00
Alexander Bock
ccdc5a5dc3 Feature/filesystem cleanup (#1587)
* Adapting to the changes in Ghoul
* First step of moving filesystem functions to std
* Remove persistence flag from cachemanager
2021-05-16 20:26:49 +02:00
Malin Ejdbo
def7f1f1a2 Merge branch 'master' into feature/space-mouse
* Resolve conflicts
2021-05-12 17:32:26 +02:00