Commit Graph

7319 Commits

Author SHA1 Message Date
Emma Broman
c8e8cf315c Revert exoplanet star glare, for now 2020-09-14 09:12:28 +02:00
Emma Broman
2aa31abe45 Merge branch 'master' into thesis/2018/exoplanets 2020-09-11 13:43:01 +02:00
Emma Broman
a57003f272 Fix asteroids profile not running due to whitespace instead of tab 2020-09-09 13:35:41 +02:00
Alexander Bock
bbef4ea22b Update keybindingmanager.cpp
Fix tiny typo
2020-09-09 11:04:46 +02:00
Jonathas Costa
9b8f2a8efc Added missing header to fix compilation on Linux. 2020-09-08 11:07:51 -04:00
Alexander Bock
e0671700fc Merge pull request #1281 from OpenSpace/issue/1277
Issue/1277 - Layer assets should add themselves on initialize
2020-09-07 15:41:12 +02:00
Alexander Bock
7c784e08c8 Merge pull request #1288 from OpenSpace/feature/openglstatecache
Feature/openglstatecache
2020-09-04 16:20:09 +02:00
Alexander Bock
13a62a5f79 Missing commit 2020-09-04 16:19:39 +02:00
Alexander Bock
463bb6b868 Update ghoul repository 2020-09-04 14:03:22 +02:00
Alexander Bock
af6e15da40 Merge remote-tracking branch 'origin/master' into feature/openglstatecache
# Conflicts:
#	ext/ghoul
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	src/util/screenlog.cpp
2020-09-04 14:02:17 +02:00
Alexander Bock
539a8b8274 Merge pull request #1287 from OpenSpace/feature/general-performance
Feature/general performance
2020-09-04 13:53:11 +02:00
Alexander Bock
00a00c9cc8 Merge branch 'master' into feature/general-performance
# Conflicts:
#	apps/OpenSpace/main.cpp
#	modules/server/src/topics/timetopic.cpp
2020-09-04 13:49:00 +02:00
Alexander Bock
b99a4c7390 Update submodules 2020-09-04 13:47:26 +02:00
Alexander Bock
6eb0aea757 Address PR comments 2020-09-04 13:46:20 +02:00
Emma Broman
6bbc0342f4 Todo comment 2020-09-03 11:29:24 +02:00
Emma Broman
2bc0dd8efd Add a glare to the host star, similar to the sun 2020-09-03 11:29:12 +02:00
Emma Broman
bf7695ef69 Reduce disc opacity a bit, so that trails are more visible 2020-09-02 11:12:18 +02:00
Emma Broman
6e5695b5dd Rename disc texture and remove debug texture for planets (cat..) 2020-09-02 11:07:31 +02:00
Emma Broman
1ea486fb1b Render disc using blending, to avoid problems with trails being covered by disc 2020-09-02 10:55:15 +02:00
Alexander Bock
20d1e391cb Adding a new ImGui component for explicitly adding GIBS layer 2020-09-01 02:27:08 +02:00
Alexander Bock
1b69842cdc Merge pull request #1290 from OpenSpace/feature/more-cleanup
Feature/more cleanup
2020-09-01 01:20:24 +02:00
Alexander Bock
7e06f310eb Update submodules
Remove warnings and MSVC analyzer information messages
2020-09-01 01:18:17 +02:00
Emma Broman
15eaea1bc5 Remove eccentricity uncertainty discs
They can be reimplemented later, if desired. But that requires creating useful textures.
2020-08-31 15:32:08 +02:00
Emma Broman
01f198bfb0 Add consts and refactor planet translation 2020-08-31 12:06:11 +02:00
Emma Broman
12fc3d5ab6 Combine star parent node with renderable globe 2020-08-31 11:48:55 +02:00
Emma Broman
4b1d8da972 Fix problem with parent node's tranformation being applied twice
Scene graph nodes inherit their parent's transformation nowadays, but not when this code was implemented.
2020-08-31 11:20:06 +02:00
Emma Broman
3d97585483 Add GUI path and cleanup node indentifiers 2020-08-31 10:12:51 +02:00
Emma Broman
acbf670bc4 Avoid problems with exoplanets names that include whitespaces 2020-08-31 09:18:00 +02:00
Alexander Bock
d0508be631 First commit 2020-08-30 22:00:13 +02:00
Emma Broman
cef3fb69f4 Some more cleanup 2020-08-28 16:59:23 +02:00
Emma Broman
99720d95ca Helper file for exoplanet data structure and replace magic numbers with constants 2020-08-28 16:31:48 +02:00
Emma Broman
08e5c42d24 Remove discovery methods code 2020-08-28 08:29:18 +02:00
Emma Broman
00814d07b1 Simplify shader and increase readability 2020-08-27 16:31:05 +02:00
Emma Broman
9e5251630a Clean up code and get it to run (using correct data files) 2020-08-27 16:30:03 +02:00
Emma Broman
9fac7fbd83 Untabify and start cleanup 2020-08-25 16:19:43 +02:00
Emma Broman
993be1b504 Make branch run with new master 2020-08-25 15:26:40 +02:00
Alexander Bock
313e1801a8 Update Ghoul repository 2020-08-25 13:53:26 +02:00
Alexander Bock
2cca451898 Coding style adaptations
Adapt to changes in Ghoul
2020-08-25 13:47:03 +02:00
Emma Broman
0ebe523bce Merge branch 'master' into thesis/2018/exoplanets 2020-08-25 13:40:33 +02:00
Emma Broman
19c110a4c2 Update gui hash 2020-08-25 13:08:54 +02:00
Emma Broman
329798fa74 Merge pull request #1289 from OpenSpace/issue/1174
Delta time steps server code cleanup
2020-08-25 11:06:55 +02:00
Emma Broman
63a61b3cba Tiny cleanup (const is good) 2020-08-25 11:04:14 +02:00
Emma Broman
fe13ff7e48 Some cleanup 2020-08-25 10:42:41 +02:00
Emma Broman
64b23e172a Include delta time steps in time topic
In case anyone wants to create a GUI that contains the delta time steps
2020-08-25 10:11:58 +02:00
Emma Broman
157df5ff93 Clean-up: Include delta time steps in time topic 2020-08-25 08:55:30 +02:00
Jonathas Costa
11ad1df863 Removed personal configuration. 2020-08-24 13:50:36 -04:00
Jonathas Costa
25cd3fdc0b Merged master again. 2020-08-24 13:44:26 -04:00
Alexander Bock
95db615dab Merge branch 'master' into feature/general-performance 2020-08-24 15:09:45 +02:00
Alexander Bock
3b786c0bb8 Merge pull request #1282 from OpenSpace/issue/1174
Issue/1174 - step between delta time steps using GUI or keybindings
2020-08-24 14:17:30 +02:00
Alexander Bock
96625b8467 Merge pull request #1286 from OpenSpace/issue/1189
Add text to the render window if Tracy is enabled
2020-08-24 13:58:58 +02:00