Commit Graph

6770 Commits

Author SHA1 Message Date
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 cae91a5b7c univeral path for tle/iss 2020-02-10 16:55:48 -05:00
Micah Acinapura faccb3d948 conditional uniform set for macos 2020-02-10 16:55:21 -05:00
Alexander Bock b1f8f1536b Add missing file 2020-02-10 21:52:01 +01: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 f6507b9b57 Warn when user tries to map a command to Shift+Keypad on Windows (#closes 1069) 2020-02-10 18:38:07 +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
Alexander Bock 0b34c0bb9f Merge pull request #1075 from OpenSpace/feature/new-glm
Feature/new glm
2020-02-10 11:28:40 +01:00
Alexander Bock d2ae5f1ca2 Fix rendering issue due to uninitialized variables 2020-02-10 11:27:02 +01: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
Mikael Pettersson b96fa43b27 Changed glm include path 2020-02-07 13:25:08 +01:00
liuloppan 4d500fc6dc Reset cef web gui scale
Resetting to use the default GUI scale of 1
2020-02-06 15:06:18 +01:00
Alexander Bock 1c35459ba9 Update SGCT and Ghoul repository to newest stable version 2020-02-04 09:46:43 +01:00
Lovisa Hassler 4cb9587522 Removed unused satellite image 2020-02-04 09:13:22 +01: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
liuloppan d07a41a7b6 Remove satImages
We do not use this
2020-02-03 17:07:38 +01:00
Your Name f8330d18b9 Applying rotations facing Earth 2020-01-31 16:55:39 -05:00
Your Name b076a6f3c6 Removed unnecessary scale 2020-01-31 16:11:42 -05: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
Your Name 30dada1fcc Replaced duplicated code with tle_helper 2020-01-31 10:16:26 -05:00
Micah Acinapura a69e9bc60f added loading screen fix for hdpi 2020-01-31 10:15:48 -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
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
Your Name b05df8778e Iss asset with model added 2020-01-30 18:15:38 -05:00
Jonathas Costa 4651f6db38 Set the maximum number of samples to 7. 2020-01-30 18:10:16 -05:00
Jonathas Costa 823e83047d Second round adding constant parameters. 2020-01-30 17:46:53 -05:00
Micah Acinapura cbec45db3e Merge branch 'issues/1062' into bug/macosbuild 2020-01-30 15:13:10 -05:00
Jonathas Costa b6b1817160 Number of shadow samples are now a compiling constant. 2020-01-30 15:10:15 -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
Micah Acinapura 12b04f38bd macos compile and build (still needs ring shader const fix) 2020-01-29 21:43:06 -05:00
Lovisa Hassler 826caf6954 Adding iss asset as a renderablesatellite 2020-01-27 18:38:18 -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