GPayne
df22eeb657
Fix for logging of asteroids data file error (downgrade to 'info')
2020-10-14 20:19:13 -06:00
Alexander Bock
d0aaaeb090
Merge remote-tracking branch 'origin/master' into feature/profile-gui
...
# Conflicts:
# data/profiles/apollo8.profile
# data/profiles/apollo_sites.profile
# data/profiles/asteroids.profile
# data/profiles/dawn.profile
# data/profiles/default.profile
# data/profiles/default_full.profile
# data/profiles/gaia.profile
# data/profiles/insight.profile
# data/profiles/juno.profile
# data/profiles/mars.profile
# data/profiles/messenger.profile
# data/profiles/newhorizons.profile
# data/profiles/osirisrex.profile
# data/profiles/rosetta.profile
# data/profiles/touch.profile
# data/profiles/voyager.profile
2020-10-13 16:32:58 +02:00
Emma Broman
f136dc6a6d
Update documentation string
2020-10-13 14:14:25 +02:00
Emma Broman
6907678f32
Slight cleanup of reading exoplanet system names
2020-10-13 14:03:53 +02:00
Micah Acinapura
b7c566089b
fixes to cmake for macos
2020-10-13 06:06:26 -04:00
Micah
21774b937b
sending exoplanet names for gui panel
2020-10-13 05:24:26 -04:00
Emma Broman
6a97c3862a
Avoid errors for exoplanet host stars without color data
2020-10-12 20:48:14 +02:00
Emma Broman
e1b02b3c5a
Add option to add several exoplanet systems at once
2020-10-12 20:31:49 +02:00
Emma Broman
7e34e1b1d8
Resolve merge conflict
2020-10-12 09:30:51 +02:00
Emma Broman
bf49ad76f2
Cleanup
2020-10-12 09:15:07 +02:00
Alexander Bock
5c054e008a
CMake fixes
2020-10-11 12:10:08 +02:00
Alexander Bock
0cd38217d4
Prevent crash when removing a globebrowsing layer
2020-10-10 17:32:15 +02:00
Alexander Bock
9a030bd7db
Update GLFW to 3.03
...
Remove some warnings
2020-10-10 16:29:12 +02:00
Alexander Bock
96ed6cfb70
Merge branch 'master' into feature/asset-meta-update
2020-10-10 12:01:56 +02:00
Alexander Bock
e33498f8a6
Linux fixes clang ( #1313 )
...
* Changes to work on Linux.
* Bring back AA Trail Lines on Linux.
* Included new branch with correction in cfitsio library linking.
* Updated SGCT
* Changes to compile in Clang on Linux.
Authored-by: Jonathas <jon.costa@gmail.com >
Authored-by: Tom Schober <tom@tomschober.com >
2020-10-09 18:43:10 +02:00
Emma Broman
9616782ab7
Remove the old data preparation task
2020-10-09 15:52:41 +02:00
Emma Broman
e11a8f80a4
Merge branch 'master' into issue/1303
2020-10-09 15:41:47 +02:00
Emma Broman
4d6fb59ea5
Add helper function to convert from ICRS to galactic coords
...
Also includes creating a util file for coordinate conversions
2020-10-09 12:48:16 +02:00
Emma Broman
04ea70365a
Compute star position from data if not found in speck file
2020-10-09 12:48:16 +02:00
Emma Broman
518bcdeeba
Add fix for std::from_chars not working on Linux
2020-10-09 12:48:16 +02:00
Emma Broman
250dbcc3f1
Add task for reading the new exoplanet data in csv format
...
Also cleanup old exoplanet code a bit based on that new data
2020-10-09 12:47:02 +02:00
Micah
f617331c33
update to solarsystem for description on scene graph node. added earth observing trails for planets
2020-10-08 23:39:30 -04:00
Emma Broman
3cc2d2aedf
Fix for compile errors in Linux in exoplanets module
2020-10-07 17:12:06 +02:00
Micah
0ccf4dfd1f
update for gui meta panel
2020-10-04 16:26:52 -04:00
Emma Broman
3310d954b3
Fix typo
2020-09-28 16:14:55 +02:00
Lovisa Hassler
ceb5c85e5c
Removed duplicated documentation for vec4 color
2020-09-28 16:02:39 +02:00
Emma Broman
754128a9e7
Some final cleanup
2020-09-28 11:37:28 +02:00
Micah
2e61a0ba72
start of asset meta update
2020-09-25 17:14:41 -04:00
Emma Broman
fdf25f18a2
Merge branch 'master' into thesis/2018/exoplanets
2020-09-25 08:56:30 +02:00
Emma Broman
eb330fed8f
Don't bind texture if nullptr
...
Lead to an exception when enabling the exoplanets renderablebillboardclouds during runtime. Should probably investigate why the renderBillboard function is called with a nullptr texture in the first place...
2020-09-25 08:55:41 +02:00
Emma Broman
193923e33b
Merge branch 'master' into thesis/2018/exoplanets
2020-09-23 09:56:41 +02:00
Emma Broman
c32de00bd8
Remvoe trailing whitespaces
2020-09-23 08:41:33 +02:00
Emma Broman
78996bb9d9
Cleanup and avoid using variable that might not have been defined
2020-09-22 11:13:26 +02:00
Emma Broman
5d9f6ec5a0
Increase trail resolution for highly eccentric orbits
2020-09-22 10:53:05 +02:00
Emma Broman
e74433b3f0
Add function to print a list of available exoplanet systems to the log
2020-09-22 08:21:57 +02:00
Emma Broman
7bd0e0bc00
Tiny refactor
2020-09-21 14:46:42 +02:00
Emma Broman
1a5c0d3672
More cleanup
...
string_view and avoid warnings from implicit conversions
2020-09-18 14:34:06 +02:00
Emma Broman
938fc49f82
Fix spelling mistake
2020-09-18 11:14:07 +02:00
Emma Broman
32c2e59330
Change uppercase struct variables to camelcase
2020-09-18 11:10:15 +02:00
Emma Broman
fe4bb00108
Even more cleanup
2020-09-18 10:23:47 +02:00
Emma Broman
614c523c69
Cleanup data reading in csvtobintask
2020-09-18 10:11:32 +02:00
Emma Broman
d0806e0136
Cleanup
2020-09-18 09:33:04 +02:00
Emma Broman
f2b4909a32
Some cleanup of helper functions
2020-09-18 08:50:06 +02:00
Emma Broman
5671ea1463
Update copyright end year (woops)
2020-09-17 16:36:02 +02:00
Emma Broman
0d1e464a64
Documentation cleanup and capitalize first letter in "Disc" in renderable
2020-09-16 15:16:15 +02:00
Emma Broman
57e25050e1
Abort if trying to add the same system twice
2020-09-16 14:34:37 +02:00
Emma Broman
e0333553cb
Some final cleanup
2020-09-16 14:33:55 +02:00
Emma Broman
2483d4a3fb
Cleanup rendering code
2020-09-16 11:19:55 +02:00
Emma Broman
0b4593a194
Put exoplanet data files on server and fetch using HttpSynchronization
2020-09-16 09:32:16 +02:00
Emma Broman
4e73a1b2ef
Cleanup csvtobin task slightly
2020-09-14 11:27:32 +02:00
