Commit Graph

2650 Commits

Author SHA1 Message Date
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
8ce9fde91b Enable the user to specify a custom temporary folder to keep the OS's temp folder clean
Change the configuration file to point the temp folder into the OpenSpace folder
Update Ghoul to not overwrite default font files (closes #944)
2019-08-22 15:37:08 +02:00
Emil Axelsson
13cb950480 Fix bug with camera following anchor node 2019-08-22 10:29:03 +02:00
Alexander Bock
0f36cf0dd4 Always add transformation property owners, even if the defaults are not overwritten 2019-08-22 09:52:35 +02:00
Alexander Bock
5675a495b0 GCC compile fix 2019-08-22 09:39:01 +02:00
Alexander Bock
9d2d3d8a83 Merge branch 'master' into feature/FXAA 2019-08-21 15:58:02 +02:00
Alexander Bock
dd76a9bd7b Improve information presented for current frame number in stereo mode and when swap groups are used 2019-08-21 15:57:29 +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
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
Alexander Bock
f09f79f6c9 Upload "fix" for globebrowsing stuttering 2019-08-19 17:53:49 +02:00
Alexander Bock
194db41b81 Merge pull request #949 from OpenSpace/feature/cancel-rotation-interpolation
Cancel follow anchor node rotation interpolation when the anchor is changed
2019-08-19 03:47:44 -06:00
Alexander Bock
3097ea28a8 Small coding style fix 2019-08-19 11:47:34 +02:00
Gene Payne
1fbeb00646 Change AssetLoader unloadAsset to clear init/deinitialization functions for only one asset. (#953) 2019-08-19 02:01:32 -06: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
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
c0f48664dc Merge branch 'master' into feature/hdrOS 2019-08-15 16:28:15 -04:00
Jonathas Costa
312cbab3b5 Fixed scale for hue. 2019-08-15 14:36:04 -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
729bb18975 Fix typo leading to strange (currently unused) rotation value 2019-08-15 11:32:24 +02: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
188dffc63c Fix rendering bugs: White displaying as black. Overlay bin rendering invisible if odd numbers of atmospheres are rendered. 2019-08-13 15:10:28 +02:00
Emil Axelsson
1cba7e1d88 Render trails last 2019-08-13 11:57:08 +02:00
Emil Axelsson
137e012cd1 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/hdrOS 2019-08-13 08:52:07 +02:00
Emil Axelsson
4ab094e681 Fix camera jump when switching anchor when time is progressing 2019-08-13 08:50:58 +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
c7c8375ca0 Coding style fixes 2019-07-31 11:13:29 +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
fbeec151db Set correct interaction sensitivity factor when adjusting joystick sensitivity (closes #815) 2019-07-30 15:01:34 +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
Alexander Bock
c45e5de33a Update copyright header
Update Ghoul
2019-07-22 14:19:11 +02: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
Emil Axelsson
9934fc03b9 Fix scaling issue with screenspace renderables (#939) 2019-07-19 11:09:04 +02:00
Alexander Bock
852115e309 Compile fix if instrumentation is disabled 2019-07-19 11:08:07 +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
Jonathas Costa
dc1ab017c6 Adding back in the right buffer. 2019-07-17 18:28:06 -04:00
Alexander Bock
277aee5c0c Make constructor of Time explicit
Module breaking change
2019-07-17 15:39:43 +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