Commit Graph

2915 Commits

Author SHA1 Message Date
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
Kollberg a4c940ca10 Started to incorporate iswa endpoint to webfieldlines 2019-08-22 09:12:44 -04: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
Kollberg 4a34f75a6b Added check if the smaller window is about to fetch data that is outside the bigger window 2019-08-12 13:36:24 -04:00
Kollberg 19fbba6332 Removed some LERRORs 2019-08-09 10:46:46 -04:00
Kollberg 1a71342007 Early version of webfieldlinesworker now working, will only upload field lines once during runtime at this point, in need of some sort of alert mechanism 2019-08-09 10:36:04 -04:00
Kollberg 4839e738e2 Added custom destructor to worker 2019-08-06 10:58:08 -04:00
Kollberg 95467f62df Updates to webfielslinesworker mainly, now 'downloads' the files that has not been downloaded yet 2019-08-05 15:39:06 -04:00
Sovanny Huy ec9ab75dd7 add some comments 2019-07-29 08:51:00 -04:00
Sovanny Huy 569b07933c new classes for download window-system 2019-07-29 08:41:01 -04:00
Sovanny Huy 0ce9424688 window + worker stubs 2019-07-15 15:39:30 -04:00
Sovanny Huy 94f26644b9 add assets for fieldlines with two extra quantities 2019-07-15 14:30:20 -04:00
Sovanny Huy 4bb2a4c583 small namechange 2019-07-10 09:46:42 -04:00
Sovanny Huy f72cd1bc02 some download functionality in place 2019-07-09 16:58:57 -04:00
Kollberg 112a0ecb57 Created an initializing function in webfieldlinesmanager 2019-07-09 13:11:25 -04:00
Sovanny Huy 13b753758b initial download in place 2019-07-09 10:59:11 -04:00
Sovanny Huy 077ba3b268 loop bug fix 2019-07-09 10:24:08 -04:00
Sovanny Huy b6ce61dd92 fixed errors, but not working yet
update/render not running when folder is empty
2019-07-03 09:41:02 -04:00
Sovanny Huy fe00eafc1b merge 2019-07-02 16:04:09 -04:00
Sovanny Huy 543f2a59cf restructure to use pointers 2019-07-02 15:55:49 -04:00
Kollberg da6b115b89 fixed conflicts 2019-07-02 14:58:53 -04:00
Kollberg 49d88ab56b Added webfieldlinesmanager as a member variable to renderable fieldlinessequence 2019-07-02 14:52:27 -04:00
Sovanny Huy 4551631bd5 fix bug (set LoadAtRunime to true) 2019-07-02 14:46:15 -04:00
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