58261ece73
Merge branch 'thesis/2020/software-integration' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
...
# Conflicts:
# modules/softwareintegration/softwareintegrationmodule.cpp
2020-10-14 13:36:43 +02:00
ba683f980e
Fixed: Exception error
2020-10-14 11:48:20 +02:00
6f6f526423
Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
2020-10-13 15:35:37 +02:00
b2e837dc5f
Camera retargets and focuses on pointdatas sgn - does not reset the camera state when removing sgn
2020-10-13 15:33:43 +02:00
f136dc6a6d
Update documentation string
2020-10-13 14:14:25 +02:00
6907678f32
Slight cleanup of reading exoplanet system names
2020-10-13 14:03:53 +02:00
42889906cc
wip
2020-10-13 13:50:55 +02:00
07ad1ddb00
Expanded the module to include luminosity and velocity data
2020-10-13 11:41:13 +02:00
21774b937b
sending exoplanet names for gui panel
2020-10-13 05:24:26 -04:00
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
c428f097ea
Started expanding the module and renderable to include luminosity and velocity
2020-10-13 10:15:09 +02:00
6a97c3862a
Avoid errors for exoplanet host stars without color data
2020-10-12 20:48:14 +02:00
e1b02b3c5a
Add option to add several exoplanet systems at once
2020-10-12 20:31:49 +02:00
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
7e34e1b1d8
Resolve merge conflict
2020-10-12 09:30:51 +02:00
bf49ad76f2
Cleanup
2020-10-12 09:15:07 +02:00
0cd38217d4
Prevent crash when removing a globebrowsing layer
2020-10-10 17:32:15 +02:00
9a030bd7db
Update GLFW to 3.03
...
Remove some warnings
2020-10-10 16:29:12 +02:00
96ed6cfb70
Merge branch 'master' into feature/asset-meta-update
2020-10-10 12:01:56 +02:00
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
d48950e3a6
Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
2020-10-09 16:19:42 +02:00
1e15aba4ce
Debugging code to see what messages are sent and recieved
2020-10-09 16:17:30 +02:00
9616782ab7
Remove the old data preparation task
2020-10-09 15:52:41 +02:00
e11a8f80a4
Merge branch 'master' into issue/1303
2020-10-09 15:41:47 +02:00
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
04ea70365a
Compute star position from data if not found in speck file
2020-10-09 12:48:16 +02:00
518bcdeeba
Add fix for std::from_chars not working on Linux
2020-10-09 12:48:16 +02:00
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
f617331c33
update to solarsystem for description on scene graph node. added earth observing trails for planets
2020-10-08 23:39:30 -04:00
064a01281b
Point data has correct postion in OpenSpace. Speckfile code removed from module and renderable.
2020-10-08 15:02:32 +02:00
c71465f507
Added if-statements for onChange-messaging. Renderable updated to receive point data, position is wrong.
2020-10-08 14:20:05 +02:00
2eb943110c
Refractor code in pointscloud
2020-10-08 08:56:03 +02:00
3cc2d2aedf
Fix for compile errors in Linux in exoplanets module
2020-10-07 17:12:06 +02:00
0ccf4dfd1f
update for gui meta panel
2020-10-04 16:26:52 -04:00
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
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
3310d954b3
Fix typo
2020-09-28 16:14:55 +02:00
ceb5c85e5c
Removed duplicated documentation for vec4 color
2020-09-28 16:02:39 +02:00
754128a9e7
Some final cleanup
2020-09-28 11:37:28 +02:00
2e61a0ba72
start of asset meta update
2020-09-25 17:14:41 -04:00
0538ba6bf6
Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
2020-09-25 09:36:09 +02:00
fdf25f18a2
Merge branch 'master' into thesis/2018/exoplanets
2020-09-25 08:56:30 +02:00
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
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
2401ee5b26
Refractor and clean code
2020-09-24 11:41:00 +02:00
1a46847c82
Code clean up
2020-09-23 15:56:21 +02:00
193923e33b
Merge branch 'master' into thesis/2018/exoplanets
2020-09-23 09:56:41 +02:00
c32de00bd8
Remvoe trailing whitespaces
2020-09-23 08:41:33 +02:00
9eb33f6775
Toggling visibility of SGN works from Glue and from OpenSpace
2020-09-22 15:33:44 +02:00
6cd82e8e8a
Opacity & Size message types added
2020-09-22 14:51:27 +02:00
Johanna Granström