Commit Graph

3747 Commits

Author SHA1 Message Date
aniisaaden
07ad1ddb00 Expanded the module to include luminosity and velocity data 2020-10-13 11:41:13 +02:00
aniisaaden
04b0cb9ba6 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
# Conflicts:
#	openspace.cfg
2020-10-13 10:23:10 +02:00
aniisaaden
c428f097ea Started expanding the module and renderable to include luminosity and velocity 2020-10-13 10:15:09 +02: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
aniisaaden
3321be2a81 Added boolean that makes sure that a message is not sent when onChange reacts to new property values from Glue 2020-10-12 15:26:24 +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
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
aniisaaden
d48950e3a6 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration 2020-10-09 16:19:42 +02:00
aniisaaden
1e15aba4ce Debugging code to see what messages are sent and recieved 2020-10-09 16:17:30 +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
aniisaaden
064a01281b Point data has correct postion in OpenSpace. Speckfile code removed from module and renderable. 2020-10-08 15:02:32 +02:00
aniisaaden
c71465f507 Added if-statements for onChange-messaging. Renderable updated to receive point data, position is wrong. 2020-10-08 14:20:05 +02:00
aniisaaden
2eb943110c Refractor code in pointscloud 2020-10-08 08:56:03 +02: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
aniisaaden
e21467c04f Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
# Conflicts:
#	data/assets/base.asset
2020-09-28 16:57:37 +02:00
aniisaaden
779dfb88a9 OpenSpace can receive data from Glue as a long string, then read the data and separate x,y,z-coordinates into vectors 2020-09-28 16:53:51 +02: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
aniisaaden
0538ba6bf6 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration 2020-09-25 09:36:09 +02: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
Johann Granström
5413ca7ddf Merge branch 'thesis/2020/software-integration' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
# Conflicts:
#	modules/softwareintegration/softwareintegrationmodule.cpp
2020-09-24 11:47:21 +02:00
Johann Granström
2401ee5b26 Refractor and clean code 2020-09-24 11:41:00 +02:00
aniisaaden
1a46847c82 Code clean up 2020-09-23 15:56:21 +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
aniisaaden
9eb33f6775 Toggling visibility of SGN works from Glue and from OpenSpace 2020-09-22 15:33:44 +02:00
aniisaaden
6cd82e8e8a Opacity & Size message types added 2020-09-22 14:51:27 +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
aniisaaden
424e99ebed OpenSpace and Glue can both send and receive messages, and update their properties. 2020-09-18 13:39:41 +02:00
aniisaaden
3282dc80b2 Softwareintegrationmodule and Softwareconnection are two separte files. 2020-09-18 11:53:17 +02:00
aniisaaden
3d2a14b830 Splitting classes to two separate files 2020-09-18 11:19:27 +02:00