Commit Graph

166 Commits

Author SHA1 Message Date
Emil Axelsson afb889ff82 Feature/serve screenshots (#1003)
* Take screnshots using lua function, returning screenshot number. Add screenshot endpoint.
* Change capitalization from screenShot to screenshot
* Fix screenshot filename collision bug when using multiple windows.
2019-11-01 10:41:59 +01:00
Jonathas Costa ff2e6db26a Merge branch 'master' into feature/FXAA 2019-08-22 16:03:14 -04:00
Alexander Bock 40545d99e5 Make Screenspace renderable work again (closes #959) 2019-08-22 16:31:55 +02:00
Alexander Bock aa3ac0e3f2 Merge branch 'master' into feature/FXAA
# Conflicts:
#	include/openspace/rendering/framebufferrenderer.h
#	include/openspace/rendering/renderer.h
#	src/rendering/framebufferrenderer.cpp
2019-08-20 14:47:01 +02:00
Alexander Bock ed6082aace Some smaller fixes 2019-08-20 10:04:20 +02:00
Jonathas Costa 15d6586e06 Get rid of MSAA GUI and updated framebuffer volume rendering (need more tests here). 2019-08-19 14:31:28 -04:00
Jonathas Costa 844ea5f3d2 Added FXAA. 2019-08-16 13:44:56 -04:00
Jonathas Costa 17d43d4c93 Removed unsused TMOs. Removed unused sliders and adjusted to default position others. 2019-08-15 14:23:14 -04:00
Jonathas Costa 67ba8a14dc Fixed problems after merging master into this branch. 2019-07-22 17:52:30 -04:00
Jonathas Costa 20d24764e7 Cleaned code and removed unused features. 2019-07-22 16:05:00 -04:00
Jonathas Costa df6c90b1ee Separated filters and cache from HDR. 2019-07-22 10:25:44 -04:00
Jonathas Costa 3c5f4afc3f Super duper bloom. 2019-07-13 16:54:44 -04:00
Jonathas Costa f3e972790b Fixed bloom. Improved performance. 2019-06-27 22:00:19 -04:00
Jonathas Costa 6b5ce52173 Merged master. It broke the bloom filter. 2019-06-19 20:47:37 -04:00
Jonathas Costa 5fc11c9df2 Version with no NVidia hdr (removed now), transparency back to previous and LDR to HDR in Colors. Fix compilation for testing. (JCC: Add back changes before clean up). 2019-06-19 20:14:34 -04:00
Alexander Bock 8f6520ea8f Feature/offline rendering (#906)
* Added functionality of saving out screenshots (with fixed FPS) from a recorded session during playback.
 * Test of feature to request if all data is ready to be rendered, primary used in GlobeBrowsing. Need to go over how chunkTiles are set to OK (some are never OK..).
 * Estimated having working request of checking if chunks with correct level have their color and height data loaded and ready to be rendered. Will re-enable frames saving and try making a movie.
 * Created adaptive LOD factor based on available/unavailable tile data (such that we don't run a lot of iterations with asking for a pile of data that does not fit in the tile cache).
 * Made it able to specify tile cache size in configurastion file. Renamed other Cache value to WMSCache, as we have the TileCache as well.
 * Fix for when focus node has nor renderable, when checking for if dersired data has been loaded. Should probably check all renderable/planets anyway, not just a focus object.
2019-06-18 10:15:35 +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
Alexander Bock a894e2cf5a Turn fade-in value into a property and move away from dedicated fadeIn, fadeOut methods (closes #869) 2019-05-22 22:08:54 -06:00
Gene Payne 64298dea8c Changes to SGCT and OpenSpace render engine to resolve issue #589 (#865)
* Added property for aspect ratio

* Working version with aspect ratio slider controlling the FOV, and also gets updated by a window resize.

* Created horizontal fov property / GUI control that preserves aspect ratio by adjusting vertical fov to match, and updates with window resizing.
2019-05-17 16:49:09 -06: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 53e07d90e1 Feature/documentation topic (#822)
- Implement documentation topic that can be used to query documentation using the network API.
- Implement a way to pass arguments to lua scripts using json (rather than formatting entire lua string clientside)
- Implement ability to attach callback to lua script executions
- Implement abillity to transport return values from lua scripts back to network API clients.
- Do not initialize server interface on slave nodes.
- Implement Dictionary -> json converter using nlohmann json library
2019-04-03 10:30:28 +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
Jonathas Costa 0502197336 Improved memory consumption and performance. Added default parameters. 2019-02-25 10:02:25 -05:00
Jonathas Costa 3f90e0eb30 Improved speed. Fixed bloom. Enabled mipmap based tmo again. 2019-02-21 17:01:11 -05:00
Jonathas Costa def560d943 Clean up hdr code and added better controls. Disabled histogram and global/local operators. 2019-02-19 16:57:44 -05:00
Jonathas Costa f7d2f065d1 Added faster TMO by mipmapping. Added image control, histogram, etc. 2019-02-15 11:42:15 -05:00
Jonathas Costa 3fea974f93 Added new tone mapping operator and enblead back the background color control. 2019-02-05 11:31:56 -05:00
Jonathas Costa 74220828bc More control over bloom filter. 2019-01-11 15:21:24 -05:00
Jonathas Costa 88ad250c85 Copied changes from old HDR branch to new one. 2019-01-10 14:17:29 -05: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 67dd887e52 Render text informing of ongoing shutdown (#696) 2018-08-24 03:15:55 -06:00
Alexander Bock 4952f8f977 Code cleanup branch (#618)
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
2018-06-10 04:47:34 +00:00
Alexander Bock 7068637c9d Make it possible to click on the friction markers in the image to toggle the friction (closes issue #576) 2018-04-21 19:04:47 +00:00
Alexander Bock 818ee225a5 Define a Cache path on default
Cleanup OpenSpaceEngine
Cleanup RenderEngine
  * ScreenSpaceRenderables are now owned by RenderEngine, rather than being shared_ptr
Cleanup LogFactory
2018-04-21 07:00:43 -04:00
Alexander Bock 40dbf875c5 Issue/525 (#593)
* Add initializeGL and deinitializeGL methods to OpenSpaceModule Call releaseAll from ProgramObjectManager in deinitializeGL to guard against errors when deinitializing assets

* Change removeProgramObject function in RenderEngine to take a non-owning pointer instead of a reference to a unique pointer to make it compatible with the ProgramObjectManager
Update Ghoul repository

* Using ProgramObjectManager in more modules to reduce the number of programs compiled at startup
2018-04-10 15:55:52 -04:00
Alexander Bock db7ae7e384 Issue/453 (#556)
* Introduced guiName to PropertyOwner
  * Added requirement that PropertyOwner::identifier may not contain whitespaces
  * Changed Name to Identifier in asset and scene files
  * Added new PropertyOwner to RenderEngine that owns the ScreenSpaceRenderables
  * Moved Name and GuiPath into GUI group
  * Added user-facing names to layer groups
2018-03-16 09:21:29 -04:00
Alexander Bock 475a9f6937 Hide the overlay information on slave nodes 2018-02-15 10:37:49 -05:00
Emil Axelsson 4c2f72226f Performance Optimizations (#450)
* Make derived transform classes less involved in simulation state
* Add performance measurements in openspaceengine
* Avoid redundant transformation lookups
* Fix bug causing redundant calls to GPULayerManager::bind
* Move water reflectance to alpha component of normal buffer. Remove otherData buffer.
2018-01-08 09:43:41 +01:00
Alexander Bock 4d58a2ae98 Render On-Screne Dashboard also for non-linear projections 2018-01-01 13:17:32 -05:00
Alexander Bock dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Jonathas Costa eead4b7f25 Merged master into NewAtmosphere. 2017-12-14 15:55:27 -05:00
Alexander Bock 167222c814 Feature/dashboard (#431)
Merging Dashboard branch that introduces the Dashboard, DashboardItem and moves most of the screen rendering code into a component-based layout that can also be displayed as a screenspace renderable

* Add Onscreen Dashboard
  * Add Dashboard class
  * Add DashboardItem classes and subclasses
  * Added font and fontsize customization to dashboarditems
  * Add default dashboard specifications to all scenes
  * Add tests.scene to test dashboard items
  * Add configuration options to DashboardItemDistance
  * Fix distance conversion to correctly use singular or plural values
  * Make DashboardItems unique when adding them to a dashboard
  * Correctly position test with different font sizes
  * Add Dashboard Item that enables spacing between other items
  * Add performance measurement to dashboard rendering
  * Add method to DashboardItemDistance that computes distance to surface
  * Add DashboardItemAngle that computes and prints the angle between three objects
  * Add DashboardItemInstruments that shows the instruments on New Horizons
  * Add ability to OpenSpaceModules to return a list of Luascripts defined by child objects
  * Make it possible for ScreenSpaceDashboard to work with its own dashboard or the main one
2017-12-13 17:11:54 -05:00
Jonathas Costa a797c2b6db Merged master into NewAtmosphere 2017-12-01 17:13:04 -05:00
Alexander Bock 8e0fde947d Cleanup ScreenSpaceFramebuffer (fix orientation issue)
Add Dashboard for on-screen information (#closes 201)
2017-11-26 14:46:54 -05:00
Jonathas Costa 6363fc0bb2 Added missing include and merged master into NewAtmosphere. 2017-11-25 22:39:18 -05:00
Alexander Bock 026f51735b Show distance from current focus object
Add conversions for time and space to show distance and delta time in manageable units
Remove warnings
Add deinitializeGL call to Renderengine
2017-11-25 18:30:13 -05:00
Jonathas Costa 0264a3026c Merged master into NewAtmosphere. 2017-11-15 18:12:58 -05:00
Alexander Bock 758e26789c More coding style conformance 2017-11-11 11:25:49 -05:00
Jonathas Costa 929bd9ae05 Merged. 2017-11-09 15:46:46 -05:00
Alexander Bock b50b52d351 Cleanup for coding style
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00