Commit Graph

3523 Commits

Author SHA1 Message Date
GPayne 2c11e87374 Updated renderablesmallbody with line width & refresh changes from satellites 2020-02-11 23:45:25 -07:00
GPayne 2650f8c6b6 Merged with master before pull request 2020-02-11 22:52:14 -07:00
GPayne 2a6db6b1ee Removed unnecessary data fields in SBDB data file support 2020-02-11 22:16:49 -07:00
Alexander Bock b37698a705 Make it possible again to remove globe browsing layers (closes #960) 2020-02-12 00:42:59 +01:00
Alexander Bock 81fda6c8db Update Ghoul repository
Adapt to changes in Ghoul
2020-02-12 00:01:24 +01:00
GPayne eb83d49cf3 Merged with master 2020-02-11 13:59:51 -07:00
Emma Broman ffe417823f Refactor piecewise slerp a bit 2020-02-11 11:49:07 -05:00
GPayne 9d34a8d39e Added final tests for checking start time 2020-02-11 07:20:29 -07:00
GPayne 016baa7ce7 Added checks on resolution & start time restrictions, and tests for them 2020-02-10 22:07:39 -07:00
Alexander Bock c8799dcc80 Cherrypick remaining changes from the feature/catch2 branch sans the big switch to SGCT 3.0 2020-02-11 00:21:42 +01:00
Alexander Bock 9cb1169d58 Merge pull request #1063 from OpenSpace/bug/macosbuild
macos compile and build (still needs ring shader const fix)
2020-02-10 23:39:39 +01:00
Micah Acinapura faccb3d948 conditional uniform set for macos 2020-02-10 16:55:21 -05:00
Alexander Bock d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Micah Acinapura db8a0d16c9 Merge branch 'master' into bug/macosbuild 2020-02-10 15:43:44 -05:00
Alexander Bock 6fe993820f Remove spaces from property owners 2020-02-10 21:22:05 +01:00
Alexander Bock 8f81360628 Move the OpenSpace unit tests from GTest to Catch2
Fix for default.scene
2020-02-10 21:10:35 +01:00
Alexander Bock da8458ab40 Merge pull request #1052 from OpenSpace/feature/instrument-images-and-sequences
added sequenceTypeImageAndInstrumentTimes as option for partially comp…
2020-02-10 18:08:03 +01:00
Alexander Bock 752a013eb8 Merge pull request #1066 from OpenSpace/feature/iss-asset
Feature/iss asset
2020-02-10 18:07:51 +01:00
Alexander Bock a37a64d691 Merge branch 'master' into feature/iss-asset
Fix the rotation used for TLE elements by removing a factor of 2
Add interesting satellites to the default scene/profile
2020-02-10 18:05:45 +01:00
Alexander Bock 3c88ee5de3 Merge pull request #1068 from OpenSpace/issue/1065
Issue/1065
2020-02-10 14:54:03 +01:00
Alexander Bock 49c793d976 Update Ghoul version
Add initial Tracy profiling macros
2020-02-10 14:50:41 +01:00
GPayne 99021221e9 Added comment headers (no functional changes) 2020-02-09 20:01:24 -07:00
Alexander Bock 9491f73803 More GLM initialization fixes 2020-02-10 01:18:27 +01:00
Alexander Bock 24ce773da9 Update GLM version
Correctly initialize all values as they are no longer default-initialized
2020-02-10 00:09:31 +01:00
GPayne 27c2a33ee4 Added unit testing for timequantizer and improved quantizer solver 2020-02-07 01:46:41 -07: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
GPayne 24d744c5fe Fixed datetime string bug and improved solver performance 2020-02-05 15:47:40 -07: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 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
GPayne fa12ab7339 Algorithm bug fixes 2020-02-03 20:49:44 -07:00
Emma Broman 40d634d249 Fix precision error by getPosition returning vec3 instead of dvec3 2020-02-03 17:11:36 -05:00
Jonathas Costa e23efd61ad Updated shader file name on Apple. 2020-02-03 13:00:04 -05:00
Jonathas Costa d2e442203d Added new shaders and code for Apple's trails lines. 2020-02-03 12:59:29 -05:00
Lingis cf8472cf34 Added accessors for rendering control points, for debugging 2020-02-03 11:19:31 -05:00
GPayne bf8d724642 Fixed compile errors 2020-01-31 10:17:06 -07:00
Your Name b61efaf965 Updated trail fade property 2020-01-31 11:42:34 -05:00
Micah Acinapura f15dc43e9d uniform cleanup 2020-01-31 10:31:41 -05:00
Micah Acinapura 1b4e32d8f2 cleanup of ringshader; fix singlefisheyegui 2020-01-31 10:28:37 -05:00
Your Name 58b1400051 Renamed ext to FileSuffix 2020-01-31 10:17:00 -05:00
Micah Acinapura 723e7e220e Merge branch 'issues/1062' into bug/macosbuild 2020-01-31 09:38:13 -05:00
Micah Acinapura a943ad5bb8 Merge branch 'bug/macosbuild' of github.com:OpenSpace/OpenSpace into bug/macosbuild 2020-01-31 09:36:54 -05:00