Commit Graph

6797 Commits

Author SHA1 Message Date
Emma Broman ff419371fa Remove a non-used function 2020-02-17 15:02:43 -05:00
Emma Broman 3282f08ae6 remove extra blank line 2020-02-17 13:56:15 -05:00
Emma Broman 45309a8996 Clean up helperfunctions a bit 2020-02-17 13:28:28 -05:00
Emma Broman 6fc12fd2c7 Compute length for other curve types 2020-02-17 12:53:59 -05:00
Emma Broman 566b9959ec Minor refactor 2020-02-17 10:51:56 -05:00
Emma Broman 95449a633c Reset current distance along segment when clearing a path 2020-02-17 10:43:15 -05:00
Emma Broman 65cf8a79da Rename interpolation parameter to u, to reduce confusion about what is related to time 2020-02-17 10:30:36 -05:00
Emma Broman 3425604a9d Improve arc length approximation by using Simpson's method 2020-02-14 15:00:22 -05:00
Emma Broman b71a5519ba Update anchor halfway, not every frame 2020-02-14 13:27:21 -05:00
Emma Broman caa05d09bd Refactor speed function 2020-02-14 11:20:59 -05:00
Emma Broman 32139120f8 Speed function for acceleration and deacceleration 2020-02-14 10:41:47 -05:00
Emma Broman 9600459635 Move along curve with constant speed, based on displacement along the curve 2020-02-13 16:22:57 -05:00
Emma Broman 1f2840c320 Preparatory refactoring for computing curve position absed on travelled distance 2020-02-13 14:37:08 -05:00
Emma Broman 3ead8a92dd Reparameterization of Bezier3 now works 2020-02-12 15:34:14 -05:00
Emma Broman 37bca3d1b8 Merge branch 'bezier3-reparameterize' of https://github.com/WeirdRubberDuck/OpenSpace into bezier3-reparameterize 2020-02-12 14:58:03 -05:00
Lingis 066b91b076 Not correct, wrong shape of curve created in Bezier::valueAt 2020-02-12 11:13:49 -05:00
Lingis 5f006f139b Not correct, wrong shape of curve created in Bezier::valueAt 2020-02-12 10:12:47 -05:00
Emma Broman ffe417823f Refactor piecewise slerp a bit 2020-02-11 11:49:07 -05:00
Lingis 426b2006c2 Merge branch 'thesis/2019/camera-paths' of https://github.com/WeirdRubberDuck/OpenSpace into thesis/2019/camera-paths 2020-02-06 13:37:30 -05:00
Lingis bf434ee3ee Same anchor bug fix and readability in bezier3 2020-02-06 13:37:10 -05:00
Emma Broman 473d32de87 Also remove easing functions in header file... (woops) 2020-02-06 11:45:27 -05:00
Lingis 62c812f73c Merge branch 'bezier-test' into thesis/2019/camera-paths 2020-02-06 10:42:29 -05:00
Lingis 2370679fce Removed Bezier, Bezier2 and Linear2 curve types 2020-02-05 16:41:29 -05:00
Lingis ef076acadb readability and fixed correct direction of tangents 2020-02-05 16:09:33 -05:00
Emma Broman ad09a0396e Set the GuiScale to 1.0, to fix supersized GUI 2020-02-05 14:35:51 -05:00
Emma Broman e28435994f Fix warning related to implicit conversion from int to char 2020-02-05 13:50:16 -05:00
Emma Broman 2b00e3054b Remove forgotten comment 2020-02-05 13:47:11 -05:00
Emma Broman 750ce7f948 Replace lookAtRotation to a version that also works with navigationStates 2020-02-05 11:28:46 -05:00
Emma Broman 0f86c3d1ea Merge master into branch, and resolve conflict in cfg file 2020-02-04 18:12:51 -05:00
Emma Broman 6acbee90f7 Resolve merge conflict 2020-02-04 18:10:02 -05:00
Emma Broman d60ff85b5a Remove custom easing functions. Use ghoul's instead 2020-02-04 18:07:47 -05:00
Emma Broman 40d634d249 Fix precision error by getPosition returning vec3 instead of dvec3 2020-02-03 17:11:36 -05:00
Lingis cf8472cf34 Added accessors for rendering control points, for debugging 2020-02-03 11:19:31 -05:00
ElonOlsson 11aa87bd36 fix for mercury magnetosphere (#1064)
- updated transfer function
- removed extra text files
2020-01-30 19:39:48 -05:00
Emma Broman fdb9903713 Provide path position function, to use for rendering of path 2020-01-30 16:16:51 -05:00
Alexander Bock 04ce540102 Merge pull request #870 from OpenSpace/issue/848
Bring back stars to the Earth's night.
2020-01-30 14:56:39 -05:00
Gene Payne 199ddb6292 Added missing sun marker asset to osiris-rex asset 2020-01-27 16:26:55 -07:00
Your Name 55ecf2f6ef Changing conflicting keybindings in rosetta scene 2020-01-27 18:18:58 -05:00
Jonathas Costa 8d5edea6fb Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-01-27 17:24:24 -05:00
Alexander Bock aa5e4c05ff Use the default scene instead of the profile again 2020-01-27 23:23:42 +01:00
Jonathas Costa bfa64a6aae Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-01-27 17:23:13 -05:00
Jonathas Costa 607451e04b Changes to fix Dawn scene. 2020-01-27 17:23:05 -05:00
Your Name f560224143 GetProperty filter on groupname and update in base.asset 2020-01-27 16:49:36 -05:00
Alexander Bock 6a94b2267e Merge pull request #1053 from OpenSpace/feature/profile
Feature/profile
2020-01-27 16:18:01 -05:00
Alexander Bock 8a8748daaa Small fixes 2020-01-27 22:17:08 +01:00
Jonathas Costa 947a78a204 Changed night color behavior. 2020-01-27 14:58:05 -05:00
Jonathas Costa 6dcaa9e299 Merged master. 2020-01-27 14:26:21 -05:00
Jonathas Costa bf9df85327 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-01-27 12:21:53 -05:00
Alexander Bock 160790c03b Merge pull request #1051 from OpenSpace/feature/csv-bookmarks
Feature/csv bookmarks
2020-01-27 18:20:37 +01:00
Alexander Bock 975e46e4b2 Move local bookmarks file to new global asset folder 2020-01-27 18:20:17 +01:00