aniisaaden
c428f097ea
Started expanding the module and renderable to include luminosity and velocity
2020-10-13 10:15:09 +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
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
660d2b6311
Merge pull request #1309 from OpenSpace/issue/1308
...
Fix for compile errors for Linux in exoplanets module
2020-10-09 15:37:31 +02: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
aniisaaden
0598ae5c1c
master merge conflict
2020-09-28 16:58:53 +02: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
83a8d7f018
Merge pull request #1300 from OpenSpace/thesis/2018/exoplanets
...
Thesis/2018/exoplanets
2020-09-28 11:39:08 +02:00
Emma Broman
754128a9e7
Some final cleanup
2020-09-28 11:37:28 +02: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
Emma Broman
0b2ba8d13a
Merge branch 'master' into thesis/2018/exoplanets
2020-09-24 16:34:15 +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
5f95282e66
Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
2020-09-23 17:02:37 +02:00
aniisaaden
1a46847c82
Code clean up
2020-09-23 15:56:21 +02:00
Emma Broman
5860f6fcbf
Fix problem with extra symbol when returning string_view from format conversion
2020-09-23 10:43:37 +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
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
johannagranstroem
4760cf81a2
Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
2020-09-17 17:35:57 +02:00
johannagranstroem
17f41e0405
Space added
2020-09-17 17:35:02 +02:00
johannagranstrom
29a42e2c55
Started the process of creating a callback in our module for property changes in our renderable
2020-09-17 17:04:51 +02:00
Emma Broman
5671ea1463
Update copyright end year (woops)
2020-09-17 16:36:02 +02:00
Alexander Bock
617dadb9d4
Merge pull request #1297 from OpenSpace/feature/orion_nebula
...
Feature/orion nebula
2020-09-16 23:16:24 +02:00
Alexander Bock
dffa7b914a
Minor cleaup
2020-09-16 23:07:32 +02:00
Alexander Bock
1a13a5a763
Merge pull request #1293 from OpenSpace/feature/cfitsio-update
...
Feature/cfitsio update
2020-09-16 21:51:55 +02:00
