mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-12 14:29:42 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,622 Commits 79 Branches 48 Tags
98df4bc099c6473ef6f57f01b352e98a2160f6df
Commit Graph

3280 Commits

Author SHA1 Message Date
Kollberg b27399128c Added possibility to go to now, without program freezing, and improved lifecycle with already downloaded field lines 2019-09-12 16:15:56 -04:00
Sovanny Huy 2b5aace213 Merge remote-tracking branch 'origin/thesis/2019/spaceweather-stream' into thesis/2019/spaceweather-stream 2019-09-09 15:11:14 -04:00
Sovanny Huy ae5707dae5 quick fix for demo magnetogram 2019-09-09 15:11:06 -04:00
Kollberg eb53d41cc2 Added keycommands for wow-room demo 2019-09-09 09:01:34 -04:00
Kollberg 2545d4a88c Added slight improvent to showing fieldlines when progressing fast in time, also added parker solar probe field line assets + the trail. 2019-09-06 11:41:05 -04:00
Kollberg 05ed1ae546 Fixed a bug that made the program crash in upstart 2019-09-06 09:06:48 -04:00
Kollberg 4ec00dc977 Merge branch 'thesis/2019/spaceweather-stream' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceweather-stream 2019-09-06 08:15:21 -04:00
Kollberg 3c35c8d246 Merged with master branch, date of master branch 4/9/2019 2019-09-06 08:14:55 -04:00
Sovanny Huy 58b93cda23 change polarity fl colors and add option (in comments) for white and gray texture 2019-09-04 15:48:02 -04:00
Sovanny Huy eeb0638827 Merge remote-tracking branch 'origin/thesis/2019/spaceweather-stream' into thesis/2019/spaceweather-stream 2019-09-04 14:35:52 -04:00
Sovanny Huy 7e5b0ca105 variablename 2019-09-04 14:35:42 -04:00
Sovanny Huy 067fca0ff1 suntexture manager now takes wsa and makes it black, blue and red 2019-09-04 14:34:54 -04:00
Kollberg 86fb1969c4 Bugfixes 2019-09-04 13:02:45 -04:00
Sovanny Huy 7e38292395 Merge remote-tracking branch 'origin/thesis/2019/spaceweather-stream' into thesis/2019/spaceweather-stream 2019-08-29 14:55:12 -04:00
Kollberg 6e77217ba3 Fixed bugg where openspace would crash because download worker didn't get to finish donwloading a file, also started to move out API-urls to asset file, so they are not hardcoded anymore 2019-08-29 11:09:05 -04:00
Sovanny Huy d45c167b95 Auto stash before merge of "thesis/2019/spaceweather-stream" and "origin/thesis/2019/spaceweather-stream" 2019-08-28 16:37:25 -04:00
Sovanny Huy 19d99c6332 Auto stash before merge of "thesis/2019/spaceweather-stream" and "origin/thesis/2019/spaceweather-stream" 2019-08-28 16:29:43 -04:00
Sovanny Huy 14d3372932 Merge remote-tracking branch 'origin/thesis/2019/spaceweather-stream' into thesis/2019/spaceweather-stream 2019-08-28 15:38:12 -04:00
Kollberg 5ed0f924fc Tried to fix bug where openspace crashed when closing, but still seems to be there, possibly has to do with downloads still running in the background 2019-08-28 15:06:34 -04:00
Kollberg 26f860398c OpenSpace can now be powered by iSWA-servers, and is doing it asynchronously 2019-08-28 14:44:39 -04:00
Alexander Bock d4e7885a71 Correctly set camera space normal for local patches (closes #945) 2019-08-26 11:42:03 +02:00
Jonathas Costa fbbcc6fc56 Fixing shader on Mac. 2019-08-23 13:18:06 -04:00
Alexander Bock 157c653afc Moved the volume.asset from customization to scene/milkyway/milkyway/volume.asset 
Make the Galaxy volume a default
Small changes here and there
 2019-08-23 16:36:43 +02:00
Jonathas Costa ae58cdc093 Merged 2019-08-22 17:35:19 -04:00
Jonathas Costa d46b5d458c Merge branch 'feature/DUUpdates' into integration/FXAA_Vol_Milkway 2019-08-22 17:04:59 -04:00
Jonathas Costa 766051c837 Changes to correct orient the Milky Way. 2019-08-22 16:01:04 -04:00
Jonathas Costa 54a5746815 Changes in DU for have back old Stars colors and align Constellations and stars. 2019-08-22 13:02:02 -04:00
Alexander Bock 7064c02738 Merge branch 'feature/FXAA' into integration/FXAA_Vol_Milkway 2019-08-22 17:45:43 +02:00
Alexander Bock e68de29ec6 Merge branch 'master' into integration/FXAA_Vol_Milkway 2019-08-22 17:45:20 +02:00
Alexander Bock 071d4af9dc Remove warnings duplicating property initialization for renderabletrails 2019-08-22 16:09:54 +02:00
Kollberg a4c940ca10 Started to incorporate iswa endpoint to webfieldlines 2019-08-22 09:12:44 -04:00
Alexander Bock 21d799dd29 Force an even number of vertices for the RenderableSpheres (closes #957) 2019-08-22 09:31:07 +02:00
Kollberg 8e76c5648b Added check to suntexturemanager, to see if the server is online(has to be made general in the future, currently specific with the local server) 2019-08-21 13:01:27 -04:00
Jonathas Costa b51eb799a5 Clean up and re-nameing. 2019-08-21 11:25:38 -04:00
eriksunden 8bfea472d5 Increased shine of galaxy stars to match volume nicer. 2019-08-21 10:23:18 +02:00
Jonathas Costa 33ce712e3a Fixed Model rendering to work with the new HDR. 2019-08-20 15:34:48 -04:00
Alexander Bock dfd85fddb6 Merge branch 'feature/FXAA' into integration/FXAA_Vol_Milkway 2019-08-20 14:49:31 +02:00
Alexander Bock aa3ac0e3f2 Merge branch 'master' into feature/FXAA 
# Conflicts:
#	include/openspace/rendering/framebufferrenderer.h
#	include/openspace/rendering/renderer.h
#	src/rendering/framebufferrenderer.cpp
 2019-08-20 14:47:01 +02:00
eriksunden 7509d1abd6 Proper discard of stars if the volume is not visible. 2019-08-20 10:59:42 +02:00
Alexander Bock 2806935c64 Merge pull request #943 from OpenSpace/feature/hdrOS 
HDR Rendering Branch
 2019-08-20 02:05:42 -06:00
Alexander Bock ed6082aace Some smaller fixes 2019-08-20 10:04:20 +02:00
Jonathas Costa e1ef84fb16 Merge branch 'feature/milkyway-galaxy' into integration/FXAA_Vol_Milkway 2019-08-19 15:41:54 -04:00
Jonathas Costa 53fee40937 Merge branch 'master' into feature/FXAA 2019-08-19 14:57:37 -04:00
Alexander Bock 67b736dd26 Merge branch 'master' into feature/FXAA 2019-08-19 17:54:14 +02:00
eriksunden ebb433584e Dictionary fix. 2019-08-19 14:25:39 +02:00
eriksunden a9fd242386 Fixed boundary artifacts in general for volume rendering. Look and feel of rendering is now very nice. Also the stars fade nicely now. 2019-08-19 14:16:36 +02:00
Alexander Bock ac867c4e9e Some rudimentary cleanup 2019-08-19 11:35:48 +02:00
Jonathas Costa bb44ed59d1 Ultra fast OpenSpace (still need some cleanning here and there). :-p 2019-08-18 15:59:17 -04:00
Jonathas Costa 701afc7daf Fixed bug causing atm leaking. 2019-08-18 11:50:22 -04:00
GPayne ab873cd699 Merge branch 'feature/satellitesgroupednodes' of https://github.com/OpenSpace/OpenSpace into feature/satellitesgroupednodes 2019-08-16 17:32:59 -06:00