Commit Graph

1659 Commits

Author SHA1 Message Date
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
2806935c64 Merge pull request #943 from OpenSpace/feature/hdrOS
HDR Rendering Branch
2019-08-20 02:05:42 -06:00
Alexander Bock
ed6082aace Some smaller fixes 2019-08-20 10:04:20 +02:00
Jonathas Costa
53fee40937 Merge branch 'master' into feature/FXAA 2019-08-19 14:57:37 -04: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
1fb65887d2 Even faster... 2019-08-19 10:39:48 -04:00
Jonathas Costa
bb44ed59d1 Ultra fast OpenSpace (still need some cleanning here and there). :-p 2019-08-18 15:59:17 -04:00
Jonathas Costa
701afc7daf Fixed bug causing atm leaking. 2019-08-18 11:50:22 -04:00
Jonathas Costa
844ea5f3d2 Added FXAA. 2019-08-16 13:44:56 -04:00
Jonathas Costa
f69545a4d7 Added HDR bypass. 2019-08-15 17:07:25 -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
Emil Axelsson
e06993332c Cancel follow anchor node rotation interpolation when the anchor is changed 2019-08-13 18:35:22 +02:00
Emil Axelsson
904811f60d Small cleanup 2019-08-13 11:28:33 +02:00
Emil Axelsson
137e012cd1 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/hdrOS 2019-08-13 08:52:07 +02:00
Gene Payne
dc45be045b Added a check to prevent buffer sync buffer overflow, and expand buff… (#937)
* Added a check to prevent buffer sync buffer overflow, and expand buffer size if needed.

* Removed unnecessary asserts and added sync buffer overflow check to encode template
2019-08-12 13:25:56 -06:00
Jonathas Costa
482631aa54 Fixed failed merging of master. 2019-07-31 15:05:52 -04:00
Alexander Bock
87ce1925b9 Fixing issue displaying negative numbers when download sizes are bigger than 2 GB (closes #925) 2019-07-31 11:46:20 +02: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
Alexander Bock
566fe7f434 Adding documentation to RenderableGlobe and layers (closes #651)
Fix mars after detecting that identifiers were missing
2019-07-30 17:48:43 +02:00
Alexander Bock
0426367572 Allow the user to abort the loading screen through ESC (closes #668) 2019-07-30 15:22:31 +02:00
Alexander Bock
4a070c939f Add the ability to query and rearrange globebrowsing layers at runtime 2019-07-30 14:28:23 +02:00
Alexander Bock
f7fafa5255 Add scripts to manipulate the camera
Add example asset using the new scripts for an IPAC
2019-07-29 13:13:16 +02: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
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
Emil Axelsson
9934fc03b9 Fix scaling issue with screenspace renderables (#939) 2019-07-19 11:09:04 +02:00
Alexander Bock
fc28b98db9 Add basic instrumentation options to the renderengine and globebrowsing module
Instrumentation is disabled on default, but can be enabled in CMake
2019-07-19 09:55:41 +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
Emil Axelsson
6d725a7d50 Revive screen space browser and add example (#932)
* Revive screen space browser and add example
* Add reload triggerproperty and change autoplay policy
2019-07-16 13:29:21 +02:00
Emil Axelsson
f43bcadee3 Feature/navigation state (#930)
* Replace setCameraState with setNavigationState + equivalents
* Add documentation and verification of NavigationState-related interfaces
* Documentation and verification fixes
* Change reference frame behavior
* Scene fixes
* Replace earthrise recording with navigation state and time
2019-07-16 13:13:33 +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
Jonathas Costa
cb36a25d5a Improve FB renderer pipeline. 2019-07-14 18:32:00 -04:00
Jonathas Costa
2e751d0c66 Improved final image quality. Enabled automatic bloom. Fixed inverse HDR. 2019-07-14 18:01:49 -04:00
Jonathas Costa
3c5f4afc3f Super duper bloom. 2019-07-13 16:54:44 -04:00
Jonathas Costa
470a6d56d5 Faster bloom. 2019-07-13 15:39:31 -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
420879c28b Fixed and Improved ping pong. 2019-07-03 09:43:55 -04:00
Jonathas Costa
db1dc5b1bb Changed ATM to ping pong. Geometry queue had a bad performance. 2019-07-02 21:44:46 -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
d0c04cfc6b Various code cleanup 2019-06-18 10:47:15 +02: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
Micah Acinapura
1149a61dce resurrecting consolidated documentation (#897)
* Resurrecting consolidated documentation, lots to improve still but better then before
2019-06-03 06:19:45 -06:00
Alexander Bock
9f6733ed72 Misc cleanup in session recording 2019-05-23 03:03:04 -06: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
Alexander Bock
62728e84d0 Remove binary property. Make volume modules part of default build (#878) 2019-05-20 18:03:36 -06:00