Commit Graph

153 Commits

Author SHA1 Message Date
Alexander Bock af6e15da40 Merge remote-tracking branch 'origin/master' into feature/openglstatecache
# Conflicts:
#	ext/ghoul
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	src/util/screenlog.cpp
2020-09-04 14:02:17 +02:00
Alexander Bock 2cca451898 Coding style adaptations
Adapt to changes in Ghoul
2020-08-25 13:47:03 +02:00
Alexander Bock aa4d68aac9 Adding some zones to RenderableBillboardClouds 2020-08-21 14:39:54 +02:00
Jonathas Costa f0c397d6be Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet). 2020-08-20 15:34:40 -04:00
Alexander Bock 88b6fdd9fe Add more Tracy markers in different renderables 2020-08-18 12:58:40 +02:00
Alexander Bock c4db2a8ff9 No longer keep textures for RenderablePlanesCloud in RAM 2020-08-18 11:02:44 +02:00
Jonathas Costa 393fbdca3d OpenGL State Caching. 2020-07-31 15:59:28 -04:00
Emma Broman 41d5a6db5f Merge pull request #1240 from OpenSpace/issue/1196
Issue/1196 - Unify usage of color, transparency/opacity
2020-07-13 12:23:33 +02:00
Emma Broman cb19f730df Mixed cleanup 2020-07-10 11:25:26 +02:00
Emma Broman ef0eef842d Add opacity for text labels and fix constellation label opacity 2020-07-10 11:25:26 +02:00
Emma Broman bdb6e626ba Color values specified with vec3 instead of vec4 2020-07-10 11:25:26 +02:00
Alexander Bock 254edd0490 Small indentation fix 2020-07-09 00:40:48 +02:00
Emma Broman b14eba72f8 Change properties and variables to opacity instead of transparency 2020-07-08 15:54:12 +02:00
Jonathas Costa 607a13da31 Added new Renderbin PostDeferredTransparency and PreDeferredTransparency. Fixed trails definitions when needed and satellites too. 2020-06-30 12:05:07 -04:00
Micah Acinapura 6db7d503a3 Linux fixes clang (#1216)
* Changes to work on Linux.

* Multiple small fixes for Linux.

* Changes to have trails working on Linux again.

* Bring back AA Trail Lines on Linux.

* Included new branch with correction in cfitsio library linking.

* Updated SGCT.

* Changes to work on Linux.

* Remove extra #endif

* Changes to compile in Clang on Linux.

* Other fixes.

* Bring back some of the changes lost and updated clang building commands.

* requiring 10.15 for sgct, upadating sgct

Co-authored-by: Jonathas <jon.costa@gmail.com>
Co-authored-by: Tom Schober <tom@tomschober.com>
Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
2020-06-25 18:55:20 -04:00
Alexander Bock 7c24a96b9e Add ability to change the line width of wire-type DU meshes (closes #1153) 2020-05-12 15:46:30 +02:00
Alexander Bock f1fe2f197b General code cleanup 2020-04-14 15:48:58 +02:00
Alexander Bock 5e29145395 Coding style cleanup 2020-02-14 19:37:06 +01:00
Alexander Bock d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Alexander Bock 9491f73803 More GLM initialization fixes 2020-02-10 01:18:27 +01:00
Alexander Bock 24ce773da9 Update GLM version
Correctly initialize all values as they are no longer default-initialized
2020-02-10 00:09:31 +01:00
eriksunden e3b3aec1ed Fixed issue 1049(using first viewport size as framebuffer size) and 554(loading and ending screen will be visible on the first viewport only). Also fixed such that Lua Console adapts to window size and not framebuffer size. 2020-01-24 15:53:29 +01:00
Alexander Bock a430883c1e Merge pull request #1034 from OpenSpace/issue/990
Issue/990
2019-12-17 11:05:41 +01:00
Jonathas Costa c6b460ab74 Added planet label rendering. Added Earth's label. 2019-11-22 18:11:49 -05:00
Jonathas Costa 5eb9949293 Improved performance of RenderableBillboardsClod. 2019-09-26 11:38:41 -04:00
Alexander Bock c6c2eb85fb Feature/du updates (#972)
* Updating DU for new data.
* Changed how OS handles partiview colormaps.
* Multiple changes to adapt OS' behavior for cmaps.
* Small tweaks. MW sphere is now fading in the correct spacetime.
* Added all the Star Orbits.
* Fixing bug in speck reading procedure.
* Changed code to allow comments into data region of a speck file.
* Added deep sky objects.
* Added Home label
* Fixed bug in drawelements.
* Added Sun as a separated star for better control.
* Update version numbers on DU assets
* Move starorbits into their own asset file
* Making some of the digital universe renderables fully opaque for performance gains
2019-09-09 13:46:57 +02:00
Jonathas Costa 54a5746815 Changes in DU for have back old Stars colors and align Constellations and stars. 2019-08-22 13:02:02 -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
Alexander Bock d0c04cfc6b Various code cleanup 2019-06-18 10:47:15 +02:00
Jonathas Costa c4781b01de Feature/new stars rendering (#784)
* Physically-based star rendering.
 * New Tully Pic Galaxies speck file w/o Milky Way
 * Removed PSC from stars rendering.
 * Avoiding extra calculations during shading.
 * Removed bug in billboard maximum size code.
 * New method to get the current viewport resolution. Used e.g. when rendering stereo side-by-side configuration.
 * Same as stereo stars.
 * Improved configuration.
 * Stars camera orientation.
 * Separated changes in billboards.
 * Adde min size control.
 * Setting minimum size.
 * Changed eye position. Changed data array nome inside shaders to a more accurate representation of the data.
 * Billboards reflecting actual stars sizes.
 * Scaling stars size based on luminosity, Abs Mag and size.
 * Rendering to a texture instead of fragment calculation for each star.
 * Added default parameters, new configurations and updated parameters.
 * Updated speck file handling to reflect a more general specification.
 * Added apparent magnitude from the speck files.
 * Set correct star values values for Apogee and Galah
 * Changed position from vec4 to vec3 to save GPU memory.
2019-05-17 01:16:17 +02:00
Jonathas Costa 2b183b721b Feature/new globe labels (#783)
Adding globe labels for planets

https://github.com/OpenSpace/OpenSpace/issues/213
2019-05-16 21:34:07 +02: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
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
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
Alexander Bock c7a96a6b59 Address clang tidy complaints
Update Ghoul repository
Update SGCT repository
2018-11-30 15:34:09 -05:00
Alexander Bock cba6201b67 Minor coding style changes 2018-11-07 13:49:33 -05: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
Alexander Bock 35855de9f5 Remove warnings 2018-09-01 21:48:53 -04: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 64524e8f44 Renamed "RenderOptionInfo" to "RenderOption" (closes #692) 2018-08-29 12:20:14 -04:00
Alexander Bock 5ad69b841b Remove extra opacity value from renderablebillboardscloud and make text labels listen to the opacity (closes #693) 2018-08-24 02:09:01 -06:00
Jonathas Costa ac76151941 Let's stop copying objs. 2018-08-06 11:03:22 -04:00
Jonathas Costa 06119d0830 Merge branch 'master' into issue/675 2018-08-01 10:42:27 -04:00
Jonathas Costa 65658e9b46 Changes from code review. 2018-08-01 10:34:59 -04:00
Jonathas Costa 4e30d9c3b8 Fixed issue 675. 2018-07-31 14:50:10 -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
Jonathas Costa 335beb8dd3 Removed commented code. 2018-07-19 11:51:28 -04:00
Alexander Bock 8dce177d33 Remove more warnings on Jenkins 2018-07-05 14:40:54 -04:00