Commit Graph

3381 Commits

Author SHA1 Message Date
Alexander Bock
5e29145395 Coding style cleanup 2020-02-14 19:37:06 +01:00
Alexander Bock
43851899c7 Cleanup of more copyright headers
Add debug groups and object names to the OpenGL objects in the framebuffer renderer
2020-02-13 14:59:13 +01:00
Micah Acinapura
eaa1b5025f cmake macos fixes 2020-02-12 23:38:21 -05:00
Alexander Bock
de24e81bda Fix copyright header information
Remove TimelineView application
2020-02-12 22:36:11 +01:00
Alexander Bock
3355e85385 All stars to be rendered with a fixed color (closes #910) 2020-02-12 22:02:10 +01:00
Alexander Bock
7abac51223 No longer add .txt extension to all UrlSynchronizations 2020-02-12 21:08:02 +01:00
Alexander Bock
cf7b1f7505 Merge pull request #1086 from OpenSpace/feature/sssb
feature/sssb for Small SolarSystem Bodies (asteroids/comets/etc.)
2020-02-12 11:00:35 +01:00
Alexander Bock
324f33dbb8 Small cleanups 2020-02-12 10:58:36 +01:00
Alexander Bock
3a80a6f2f7 Merge pull request #1085 from OpenSpace/issue/574
Issue/574
2020-02-12 09:37:42 +01:00
Alexander Bock
be8d850ef7 Some cleanup of timequantizer and its test 2020-02-12 09:36:09 +01:00
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
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
GPayne
24d744c5fe Fixed datetime string bug and improved solver performance 2020-02-05 15:47:40 -07:00
GPayne
fa12ab7339 Algorithm bug fixes 2020-02-03 20:49:44 -07: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
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
Alexander Bock
9b43b08368 Convert property owner identifiers to camel case 2020-01-31 08:22:40 -05:00
GPayne
1ba505d8cc Additional work on time quantizer 2020-01-31 02:55:26 -07:00
ElonOlsson
11aa87bd36 fix for mercury magnetosphere (#1064)
- updated transfer function
- removed extra text files
2020-01-30 19:39:48 -05:00
Your Name
99137de797 Added commment 2020-01-30 18:19:44 -05:00
GPayne
685579cd4f Work in progress for new quantization scheme 2020-01-30 16:16:06 -07:00