mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-23 20:49:00 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,055 Commits 83 Branches 46 Tags
1dbbdce00f87b9a321c116157be4d7fe711d4613
Commit Graph

2882 Commits

Author SHA1 Message Date
Sovanny Huy
1dbbdce00f Merge remote-tracking branch 'origin/thesis/2019/spaceweather-stream' into thesis/2019/spaceweather-stream 2019-07-02 11:09:10 -04:00
Sovanny Huy
31a99186d5 some cleanup, and now downloads initial list 2019-07-02 11:09:01 -04:00
Sovanny Huy
8764ff9c0c downloads initial dataset 2019-07-01 16:25:10 -04:00
Kollberg
2d7e621d5c Merge branch 'thesis/2019/spaceweather-stream' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceweather-stream 2019-07-01 13:36:01 -04:00
Kollberg
decc49d522 Added the possibility to read coloringmethod to field line asset file 2019-07-01 13:35:54 -04:00
Sovanny Huy
79e6552ec3 Merge remote-tracking branch 'origin/thesis/2019/spaceweather-stream' into thesis/2019/spaceweather-stream 2019-07-01 13:31:40 -04:00
Sovanny Huy
c4aace5df0 update member variables success 2019-07-01 13:31:18 -04:00
Kollberg
561bcd4a0f double jinx 2019-06-26 11:27:16 -04:00
Kollberg
3f3fb09d80 n00bs be trippin' 2019-06-26 11:20:12 -04:00
Kollberg
f175b4a11a Minor cleanup in the shader, the direction variable is still there 2019-06-26 09:07:27 -04:00
Kollberg
65a0c17a09 resolved conflicts 2019-06-26 09:02:43 -04:00
Kollberg
1dbb0b5b29 Added direction to fl-shader, to be able to have different directions in field lines 2019-06-26 08:58:20 -04:00
Sovanny Huy
8654ff09ab added more assets for demo 
and commented out experimental download function
 2019-06-25 10:34:54 -04:00
Sovanny Huy
d3bb858a41 create base for new class 2019-06-21 15:28:10 -04:00
Sovanny Huy
de55212c8d fixed unordered map bug 2019-06-18 14:53:07 -04:00
Sovanny Huy
f4b35ea36b added wsa to model in fieldlinesequence 2019-06-18 10:31:55 -04:00
Kollberg
bd9c8be95d Introduced new member variable to suntexturemanager, that keeps the direction that the user of openspace is moving in 2019-06-11 09:47:36 -04:00
Kollberg
027fb1ae56 Solved merge conflicts 2019-06-07 16:14:44 -04:00
Kollberg
6d9c4db8e1 Added a check to only apply a texture once that timeframe has been passed 2019-06-07 16:01:18 -04:00
Sovanny Huy
5f547c0f1f Some cleanup on SunTextureManager 2019-06-04 14:16:36 -04:00
Kollberg
bd7c45cf4e Fixed merge conflicts 2019-06-03 16:25:47 -04:00
Kollberg
a54051faf9 Adds latest downloaded texture to texturesondisklist 2019-06-03 16:21:35 -04:00
Sovanny Huy
c195a02936 fitsfilreading in thread and sync dir simplification 2019-06-03 16:19:11 -04:00
Kollberg
24375d7918 Now modifies fits image slighlty to compensate for sun rotation, experimenting with uploading textures on separate thread 2019-06-03 13:43:18 -04:00
Kollberg
7a57278433 Solved merge conflicts 2019-05-31 14:49:39 -04:00
Kollberg
d12d192920 Temporal images are now fetched on separate threads, to not freeze the program while waiting for response 2019-05-31 14:46:53 -04:00
Sovanny Huy
ca596b34ea Auto stash before merge of "thesis/2019/spaceweather-stream" and "origin/thesis/2019/spaceweather-stream" 2019-05-30 11:00:02 -04:00
Kollberg
91df0d409a Somewhat functioning temporal browsing, to add: backwardsbrowsing and multithreading 2019-05-29 16:14:19 -04:00
Kollberg
cdf6b25fba Solving merge conflicts 2019-05-29 13:58:14 -04:00
Kollberg
07558b872a CheckFilesInDirectory now populates member variable with only filename +extension 2019-05-29 13:52:30 -04:00
Sovanny Huy
f16bbf9707 implemented texture queue 2019-05-29 11:36:23 -04:00
Sovanny Huy
e0000fccbf change to vector 2019-05-28 15:33:09 -04:00
Sovanny Huy
23ee6c3c40 update texture based on set time 2019-05-28 14:28:36 -04:00
Sovanny Huy
7dfdee2141 downloading and uploading textures 
using new endpoints
 2019-05-28 13:32:04 -04:00
Sovanny Huy
d0e96672bb some new functions 2019-05-28 11:03:42 -04:00
Sovanny Huy
950df71c73 put changes in new class 2019-05-24 14:18:42 -04:00
Sovanny Huy
e2dbbe6ccd swapped sun to renderablesphere 2019-05-23 15:34:10 -04:00
Sovanny Huy
c9ea4c25f2 Merge remote-tracking branch 'origin/master' into thesis/2019/spaceweather-stream 2019-05-20 12:02:56 -04:00
Sovanny Huy
71f8d84149 download with thread 2019-05-20 11:51:27 -04:00
Micah Acinapura
8ae5016556 dont add labelproperty for globes with no labels; 2019-05-19 10:38:27 -04:00
Emil Axelsson
4783f8fc0a Cleanup 2019-05-19 02:33:14 +02:00
Emil Axelsson
4ec1f9ba1f Fix compilation with unix makefiles on mac. (#875) 2019-05-19 02:16:44 +02:00
Alexander Bock
0bb6b9d0e5 Cleanup 2019-05-18 17:31:06 -06:00
Alexander Bock
e03bf6fc2e Correctly reset uniform values when changing labels (closes #812) 2019-05-18 17:09:49 -06:00
Emil Axelsson
d0e9170658 Feature/cef cmake (#873) 
* Expose `CMAKE_BUILD_TYPE` to cmake gui (for single configuration generators)
* Use generator expressions to get debug vs release mode
* Fix mac app icon
 2019-05-18 22:50:00 +02:00
Jonathas Costa
916cc1d76d Issue/871 (#874) 
* Fixed wrong merging.
* Add flat qualifiers to both geometry and fragment shaders
 2019-05-18 22:46:10 +02:00
Jonathas Costa
368292aba6 Fixed global fade-out. (#867) 2019-05-18 11:17:53 -06:00
Jonathas Costa
ae5392dbeb Fixed depth sorting for Sun's glare. (#868) 
* Fixed depth sorting for Sun's glare.
 2019-05-18 11:12:05 -06:00
Micah Acinapura
0eabffe752 exposed renderable type to gui, fixed path for milkyway items (#866) 
* exposed renderable type to gui, fixed path for miklyway items
* Changes to session recording topic
* Update webgui
 2019-05-18 17:00:31 +02:00
Emil Axelsson
d6c5c98e6d Feature/time topic changes (#863) 
* Time topic updates
* Update web gui and patch jsonconverters
 2019-05-17 21:55:00 +02:00