Commit Graph

518 Commits

Author SHA1 Message Date
Jonathas Costa
53fee40937 Merge branch 'master' into feature/FXAA 2019-08-19 14:57:37 -04:00
GPayne
c01e59635c Restored ability to change trail colors in satellite asset files. 2019-08-15 08:51:18 -06:00
GPayne
b99389ae30 Fixed problem with satellite trails rendered at a time prior to TLE epoch. Also debris added shader files to CMake file for space module. 2019-08-14 16:07:14 -06:00
GPayne
ba07837865 Merge branch 'thesis/2019/spaceDebris' into feature/satellitesgroupednodes 2019-08-13 09:56:51 -06:00
Emil Axelsson
1cba7e1d88 Render trails last 2019-08-13 11:57:08 +02:00
Emil Axelsson
904811f60d Small cleanup 2019-08-13 11:28:33 +02:00
Jonathas Costa
3a0b5f0c15 Changed rendering order back for orbits and other improvements. 2019-08-01 12:20:36 -04:00
Jonathas Costa
482631aa54 Fixed failed merging of master. 2019-07-31 15:05:52 -04:00
Alexander Bock
c7c8375ca0 Coding style fixes 2019-07-31 11:13:29 +02:00
Elon
029e67797f merging 2019-07-22 16:25:47 -06:00
Elon
46c22488d7 wrapping up thesis project 2019 space debris 2019-07-22 16:16:21 -06:00
Jonathas Costa
67ba8a14dc Fixed problems after merging master into this branch. 2019-07-22 17:52:30 -04:00
Jonathas Costa
a6b90991b2 Merging Master 2019-07-22 16:47:58 -04:00
Alexander Bock
8f112fa219 Compile and runtime fixes when running in Debug
Do not crash if ScreenSpaceLocalImage does not exist
Add ability to specify identifier/name when adding screenspace items in the UI
2019-07-22 14:14:12 +02:00
Jonathan Fransson
e3378bc615 Final Merge 2019-07-19 10:09:03 -06:00
Emil Axelsson
9934fc03b9 Fix scaling issue with screenspace renderables (#939) 2019-07-19 11:09:04 +02:00
Alexander Bock
277aee5c0c Make constructor of Time explicit
Module breaking change
2019-07-17 15:39:43 +02:00
Emil Axelsson
c97d5126ec Feature/timeline translation (#931)
* Work on timeline translations
* Add Apollo 11 Descent data
* Ability to display negative altitudes
* Expose globe translation properties
* Added timeline rotation, and some scene updates. 
* Cleaning up apollo_sites scene; fixing boulder 1 in place to adress heightmap issue
* Use quaternion slerp instaet of linear interpolation + Cleanup
* Change to old lem model while waiting for new version to be pushed to data repo
* Small fixes
2019-07-17 15:21:13 +02:00
Jonathas Costa
0f09c36aa2 Bring back changes for transparency and added new error protection for big components. 2019-07-15 10:31:08 -04:00
Alexander Bock
e9fdd31c56 Feature/flying fixes (#924)
* Removing various warnings
 * Fix the rendering of the touchbar on Mac
 * More warnings
 * Add ghoul deinitialize
 * Update SGCT repository
2019-07-04 09:28:42 +02:00
Jonathas Costa
6b5ce52173 Merged master. It broke the bloom filter. 2019-06-19 20:47:37 -04:00
Alexander Bock
d0c04cfc6b Various code cleanup 2019-06-18 10:47:15 +02:00
Alexander Bock
e5acc6c69a - Make current frame number available in the RenderEngine
- Add more information to the Dt-extremes case in the DashboardItem
 - Rename rawTiles to clearTiles in the asynctiledataprovider
2019-06-05 18:16:50 +02:00
Jonathas Costa
4b27cf7ac5 Fixed invalid OpenGL state. 2019-06-04 12:12:05 -04:00
Micah Acinapura
54d24605cf Feature/safe apollo (#879)
* Apollo missions with renderablemodel and spice rotation updates
* Added user control for face culling.
* Added gui property for disabling face culling.
* Changed rotation vector property to handle degrees instead of radians
* Separated apollo globebrowsing
2019-05-20 20:10:23 -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
Alexander Bock
4b800ac819 Various small fixes 2019-05-16 12:59:28 -06: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
Alexander Bock
595cbc4bcf Feature/cleanup (#837)
* Style guide fixes
* Various cleanups
* Update SGCT
2019-05-03 13:27:43 +02:00
Elon
abf686ddf6 line fade now works useing float for orbit and period 2019-05-02 14:52:34 -06:00
Elon
f21edec80d trying to figure out how to fade lines 2019-04-24 17:12:07 -06: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
Elon
f248c42ab1 appearance 2019-04-10 13:42:43 -06: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
Jonathas Costa
d918f2931a Merge branch 'master' into feature/hdrOS 2019-02-25 10:03:27 -05:00
Emil Axelsson
b5eb41e27f Guard against potential nullpointer dereferencing 2019-02-22 17:58:08 +01:00
Jonathas Costa
72ca49e43d Merge branch 'master' into feature/hdrOS 2019-02-21 20:03:03 -05: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
Jonathas Costa
88ad250c85 Copied changes from old HDR branch to new one. 2019-01-10 14:17:29 -05: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