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
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
97811d82d0
Fix error with time quantizer string conversion
...
Fix error with uninitialized memory in GlobeBrowsing
Remove dynamic memory allocation from on-screen rendering
2020-08-14 14:10:54 +02:00
Alexander Bock
77db3b6ce8
Remove caching of inverse model transform for every scene graph node
2020-08-11 11:43:50 +02:00
Alexander Bock
caf125c592
Some more work on this
2020-08-09 11:21:25 +02:00
Alexander Bock
b78d1dd033
Merge branch 'master' into feature/memory-allocations
...
# Conflicts:
# include/openspace/scene/scenegraphnode.h
# modules/imgui/include/gui.h
2020-08-05 19:06:04 +02:00
Alexander Bock
6e9db78f40
Remove performance measurements that have been supersceded by using Tracy
2020-08-05 18:28:08 +02:00
Alexander Bock
696bc31861
Moving over more allocations to the memory pool
2020-08-05 11:19:09 +02:00
Jonathas Costa
393fbdca3d
OpenGL State Caching.
2020-07-31 15:59:28 -04:00
Emma Broman
a7ea25d311
Merge branch 'master' into issue/733
2020-07-08 15:33:39 +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
Emma Broman
6b4c329a29
Refactor
2020-06-30 14:00:32 +02:00
Jonathas Costa
e64f557bb4
Proposed solution.
2020-06-29 15:58:04 -04:00
Alexander Bock
89f1835994
Add the option to add vertical offset to the on-screen log
...
Set the default vertical offset when using the user interface
2020-06-22 22:15:34 +02:00
Alexander Bock
f1fe2f197b
General code cleanup
2020-04-14 15:48:58 +02:00
Alexander Bock
d8e9db76a3
Update the copyright header to 2020
2020-02-10 21:51:01 +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
Alexander Bock
a51cee1f36
Add a method for creating a unique name for screenspace renderable ( closes #652 )
2019-12-27 21:25:22 +01:00
Alexander Bock
cf3a641103
Some small cleanup
...
Remove virtual attribute from some of the raycaster functions
2019-12-16 09:50:34 +01:00
Jonathas Costa
60813e3209
Final version with volume depth interpolation.
2019-11-26 11:06:39 -05:00
Jonathas Costa
aaa73415e9
Final touches in MW volume.
2019-11-13 15:36:13 -05:00
Jonathas Costa
9aba885b15
Merge branch 'master' into feature/FastVolume
2019-11-10 14:50:59 -05:00
Jonathas Costa
0fce6a8d26
Super-fast volume (aka Downscaled Volume Rendering).
2019-11-10 14:17:23 -05:00
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
liuloppan
78eb673611
Feature/gui for touch ( #967 )
...
Merging in feature gui for touch. Enable touch module to run.
Currently only run on development mode with the "touch" scene.
2019-09-18 23:49:51 +02:00
Jonathas Costa
2c5fab7120
Removed unsused files and code.
2019-08-22 18:04:06 -04:00
Alexander Bock
e68de29ec6
Merge branch 'master' into integration/FXAA_Vol_Milkway
2019-08-22 17:45:20 +02: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
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
904811f60d
Small cleanup
2019-08-13 11:28:33 +02: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
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
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
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