Commit Graph

104 Commits

Author SHA1 Message Date
Kollberg
3c35c8d246 Merged with master branch, date of master branch 4/9/2019 2019-09-06 08:14:55 -04:00
Kollberg
86fb1969c4 Bugfixes 2019-09-04 13:02:45 -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
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
Alexander Bock
f2a0cb18b0 Feature/websocketnavigation (#882)
* Upgrade JSON Library
* Added support for navigation based on websocket communication
2019-07-31 11:07:25 +02: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
Alexander Bock
277aee5c0c Make constructor of Time explicit
Module breaking change
2019-07-17 15:39:43 +02: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
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
f4b35ea36b added wsa to model in fieldlinesequence 2019-06-18 10:31:55 -04:00
Emil Axelsson
0dcf65ce4f Feature/cef speedup (#806)
* Improve cmake errors
  * Calling doMessageLoopWork more often to increase gui performance
  * Introduce frequent callbacks
  * Restructure browser update callbacks
  * Cleanup cef speedup
  * Add flag to toggle updating browser between renderable calls
  * CEF should not be used in single process mode
  * Update CEF version
  * Postbuild step for finding framework from web helper
  * Load libcef dynamically to fix issue with CEF update
  * Only include dynamic library loader on mac
  * Improve keyboard mapping support on MacOS
  * Add arrow keys
  * Rename manifest
  * Fix bug with missing blinking cursor in text fields
  * Bump minimum cmake version
  * CEF fixes: Runtime and correct helper path
  * Be true to actual sandbox compatibility specified by CEF
  * Cleanup
2019-04-24 10:53:46 +02:00
Alexander Bock
bb3db7ada7 Feature/jenkins fix (#816)
* Cleanup
* CMake cleanups
* Update current year
* Update copyright header
* Use script to return list of all modules
* Update credits, license and ghoul
2019-03-24 11:19:39 +01:00
Emil Axelsson
2e71eaa4cb Feature/anchor and aim (#799)
Introduce the ability to navigate using an anchor and aim.
Example use: Set spacecraft as anchor and planet as aim to always look down at a planet, while followin the spacecraft in its orbit.
2019-02-19 18:46:58 +01:00
Alexander Bock
9f1c4e847d Feature/globals (#690)
* Move global objects out of OpenSpaceEngine
 * General cleanup of main.cpp
 * Add default_joystick asset to all scenes
 * No longer suppress mouse interaction on slave nodes
 * Window delegate uses function pointers rather than subclassing
 * Fix for false overwriting of ImGUI configuration file
 * Change default color and tilt angle of fisheye rendering
 * Restructured performance manager
 * Simplify screenshot handling
2018-08-30 11:38:47 -04:00
Emil Axelsson
902e3e6dac Feature/time interpolation (#669)
* Initial implementation
* Better approximation of target time
* Correctly use double precision for time passing
* Cleanup
* Adding proportional adjustment of delta time at end of interpolation
* Keyframe based time interpolation
* Add property for time interpolation duration. Move time interpolation methods to TimeManager.
* Fix bugs with time gui
* Make several clicks on delta time buttons work as expected
* Clean up
* Improve time interpolation for parallel connection
* Improve time API. Fix time interpolation bugs.
* Fix mac compile issue
* Add hour button
* Add missing + sign
* Remove newer images from projection buffer when going back in time
* Add comment about clearing projection buffer
* Fix bug with jumping time in parallel connection
* Rename integrateFromTime to previousFrameTime
* Compile fix for iswa module
* Address code review comments
* Code cleanup
* Fix bug causig unsmooth behaviour when pausing while interpolating in time
2018-07-13 11:07:35 +02:00
Alexander Bock
ef61dc8c16 Rename DashboardGlobeLocation to DashboardItemGlobeLocation
Remove JSON from iswa module and use openspace one instead
Remove warnings
General code cleanup
2018-07-05 12:00:32 -04:00
Alexander Bock
99a6efca8e Declare PropertyInfo as constexpr, rather than const 2018-06-28 17:08:56 -04:00