Commit Graph

1171 Commits

Author SHA1 Message Date
Alexander Bock 43851899c7 Cleanup of more copyright headers
Add debug groups and object names to the OpenGL objects in the framebuffer renderer
2020-02-13 14:59:13 +01:00
Alexander Bock c8799dcc80 Cherrypick remaining changes from the feature/catch2 branch sans the big switch to SGCT 3.0 2020-02-11 00:21:42 +01:00
Alexander Bock 9cb1169d58 Merge pull request #1063 from OpenSpace/bug/macosbuild
macos compile and build (still needs ring shader const fix)
2020-02-10 23:39:39 +01:00
Alexander Bock d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Micah Acinapura db8a0d16c9 Merge branch 'master' into bug/macosbuild 2020-02-10 15:43:44 -05:00
Alexander Bock 49c793d976 Update Ghoul version
Add initial Tracy profiling macros
2020-02-10 14:50:41 +01:00
Alexander Bock d2ae5f1ca2 Fix rendering issue due to uninitialized variables 2020-02-10 11:27:02 +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
Micah Acinapura a69e9bc60f added loading screen fix for hdpi 2020-01-31 10:15:48 -05:00
Jonathas Costa 607451e04b Changes to fix Dawn scene. 2020-01-27 17:23:05 -05: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
Mikael Pettersson 4e75b161db Feature/internal touchhandling (#1038)
* Removal of dead code and compiler warnings

* Added basic internal touch

This commit only adds the description-shell of the touch implementation

* Added callbacks and first WIP of internal touch

Makes use of the TouchInput/TouchInputs class in the TouchModule.
Internally we cache the TouchInputs as an input deque and utilizes it
for motion-vectors.
This commit has bugs and issues, which will be worked upon.

* Happy new year!

Bumped year on branch-local files

* Improvements to internal touch

Almost reached feature-parity with tuio-handled touch events

- Added most of the touch-logic to touchinteraction
- Added helper functions to new TouchInput/TouchInputs classes

* Naming changes to touch interface

* Translate TUIO to TouchInput

This commit translates TUIO messages to an internal TouchInput structure
while still trying to keep feature parity.
Removed TUIO-dependencies from many files.
Changed behavior on tuioear to lock-swap its content.

* Minor cleanup and fixes

- Should fix touch roll
- Simplified some functions

* Build fix

* Use internal touch in webgui

- Added consume-logic to touch callbacks
- Constrained touch-input to either webgui or 3D application as mouse is
  - This fixes some flaws with previous implementation,
    such as ghost inputs

- Initialize touchmodule through init-functions rather than constructor

* Cleanup of comments

* Simplified touch classes

Added timestamp through constructor meaning no more sprinkled timestamps
Renamed TouchInputs to TouchInputHolder for clarity
Added helper functions to the Holder to see if it holds an input
Remade addInput as tryAddInput which return true on successful insertion
+ other cleanup

* Code style cleanup and tweaks

Removed avoidable zero-comparison for code clarity
Cleanup of code style

* Added comments to DirectInputSolver

Clarifying the use of the DirectInputSolver.

* Changes for coding style
Change SGCT version to make it checkout-able

* Clarify magic bitmask

* const -> constexpr const for magic bitmasks

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
2020-01-13 08:27:13 +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 ce7795a67b Do not assume that the GuiName or a DashboardItem is provided (closes #1006)
Do not try to load an empty URL as it triggers an assert
2019-12-27 20:10:48 +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 e2e86c12ab Ops. Cleaning depth buffer now. 2019-11-26 17:07:27 -05: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 caa02ca20a Clean up. Added the raycasting number of steps as a slider for user's control. 2019-11-12 17:19:23 -05:00
Jonathas Costa 7e8cae4a51 Improved volume border color. 2019-11-11 14:48:35 -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
Jonathas Costa bd27ac1ee1 Issue/988 (#989)
* Added new FXAA implementation for test.
* Fixed ghosting MW.
2019-10-30 10:47:22 +01:00
Ingela Rossing f9cece3e99 Fix case sensitivity issue 2019-09-24 17:12:42 +02: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
Alexander Bock 9c1cb0c966 Make Hue slider behave as expected (closes #958) 2019-09-16 14:53:36 +02:00
Jonathas Costa 33c8ca719d Fixed FXAA on Mac. 2019-08-27 11:27:31 -04:00
Micah Acinapura 6c84170a59 readded globebrowsing cusomization asset;temp disabled fxaa on mac; temp not unsetting directories on deinit of webgui; added single_fisheye_gui.xml; 2019-08-23 13:47:27 -04: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 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 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 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 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
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