Commit Graph

510 Commits

Author SHA1 Message Date
Kollberg a54051faf9 Adds latest downloaded texture to texturesondisklist 2019-06-03 16:21:35 -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
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
Sovanny Huy 7d00788241 Merge branch 'master' into thesis/2019/spaceweather-stream 2019-05-16 15:20:42 -04:00
Sovanny Huy ce14ffce2b change texture based on time 2019-05-16 15:10:24 -04:00
Alexander Bock 4b800ac819 Various small fixes 2019-05-16 12:59:28 -06:00
Sovanny Huy a165f9ea77 some renderloop testing 2019-05-15 14:55:11 -04:00
Sovanny Huy 5f2d9e9d00 tried using 3d textures
to store different timesteps. but couldn't figure out how to sample the 3rd dimension
2019-05-14 22:01:46 -04:00
Jonathas Costa 8bb70e328d Issue/425 (#860)
* Working on the fix for the depth sorting problem.
* Changed grids and billboards to additive blending.
2019-05-14 17:05:40 +02:00
Sovanny Huy 41582d06b1 don't need fieldlines right now 2019-05-13 16:58:32 -04:00
Sovanny Huy bf7575856b some fbo testing 2019-05-13 16:54:10 -04:00
Alexander Bock 595cbc4bcf Feature/cleanup (#837)
* Style guide fixes
* Various cleanups
* Update SGCT
2019-05-03 13:27:43 +02:00
Emil Axelsson 50ff2d96d2 Cleanup for Spheres and PSC (#827)
* Fade fixes
  * Clean up RenderableSphere. Add orientation properties.
  * Sane defaults for Digital Universe
  * Clean up New Horizons related code
  * Add basic scene
  * Add ability to initialize rotation as quaternion and mat3
  * Adapt legacy code to new Renderable interface
2019-04-24 13:34:49 +02:00
Emil Axelsson e78121febc Feature/screenspace renderables (#830)
* Add ability to position screen space renderables in 3D
  * Independent face camera setting
  * More intuitive local rotation
  * Cleanup
  * Introduce global and master rotation. Remove DisableSceneOnMaster. Revisit screenspace renderables.
2019-04-24 13:34:01 +02:00
Emil Axelsson 55979fa2c8 Feature/statistics (#810)
* Add statistics options for dashboarditemframerate
2019-03-24 13:09:31 +01: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 b5eb41e27f Guard against potential nullpointer dereferencing 2019-02-22 17:58:08 +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 c7a96a6b59 Address clang tidy complaints
Update Ghoul repository
Update SGCT repository
2018-11-30 15:34:09 -05:00
Alexander Bock d37cfa4f18 Add guard to gaia.scene to log error if the Gaia module was not compiled
Point to correct shader paths
Remove warnings
2018-11-20 18:40:04 -05:00
Emil Axelsson 0d2935c43b Feature/gaia mission merge (#766)
* Add Adam Aslegård's module that renders Gaia mission stars
 * Add module for Gaia mission
 * Add CCfits and cfitsio submodules and the implemented fitsfilereader module from the OpenSpace-sun-earth-event branch
 * Add a TaskRunner to read from a fits file
2018-11-20 18:19:08 -05:00
Emil Axelsson 1632c09af3 Coordinate Axes
* Add coordinate axes renderable
 * Add debug helper
 * Add example asset
 * Fix bug with dynamic loading of assets. (#763)
2018-11-13 08:09:14 -05:00
Alexander Bock 7a3a8a5cf6 Misc coding style cleanups 2018-11-06 12:02:56 -05:00
Jonathas Costa 5c0da9e606 Fixed issue 747 and labels orientation. 2018-10-31 17:32:16 -04:00
Alexander Bock 8abf1849a4 Change originChange origin of the radiosphere to Earth
Do not show radiosphere before 1936
2018-10-08 16:59:12 -06:00
Alexander Bock 8ddc794cda Feature/alex is flying (#729)
* Correctly specify maximum text sizes for grids
 * Use StaticScale transformations in grids and remove fixed radius
 * Fix Verifier to let grids accept non-integer min and max sizes
 * Add a new scale that changes it's value based on the current time and a reference time
 * Add a proper radiosphere that grows in real time (closes #728)
 * Add default globe customization folders to the assets (closes #724)
 * Add new dashboarditem that shows the current camera velocity (closes #702)
 * Add ability to add interesting times to a scene (closes #715)
 * Reenable keybindings gui element
 * Add ShortcutManager
 * Add ability to bind keyless keybinds to use as arbitrary shortcuts (closes #710)
2018-10-08 03:00:35 -04:00
Alexander Bock 9f57d80541 Check_style fixes 2018-09-01 21:57:36 -04:00
Emil Axelsson 518b43db02 Fix compiler warnings 2018-08-31 14:30:35 +02: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
Alexander Bock 74fd38c260 Adapt to Ghoul change (use ghoul::to_string instead of std::to_string) 2018-07-20 13:56:15 -04:00
Alexander Bock f55828198f Adapt to UniformCache changes when updating uniform locations (closes #648) 2018-07-19 17:46:21 -04:00
Alexander Bock 0774348fc2 General cleanup
Adapt to changes in Ghoul
Make use of TextureManager
Jenkins compile fix
2018-07-19 14:43:53 -04:00
Alexander Bock dbdc5dfd28 Fix setting of FixedRotation values through assets (closes #647) 2018-07-18 19:20:49 -04:00
Alexander Bock 9a928231be Enable OrVerifier and AndVerifier to have an arbritrary (>=2) number of verifiers
Make specifying the line number in TLETranslation optional
2018-07-18 18:22:18 -04:00
Alexander Bock 54d1a506c3 Add rotation class that provides a constant rotation based on in-game time (closes #662)
Refactor functions for rotation, scaling, and translation to take UpdateData rather than current time
2018-07-18 15:28:24 -04:00