Commit Graph

2715 Commits

Author SHA1 Message Date
GPayne
addfa65fa6 Merge with latest master 2020-02-19 09:25:33 -07:00
Alexander Bock
81fda6c8db Update Ghoul repository
Adapt to changes in Ghoul
2020-02-12 00:01:24 +01:00
Alexander Bock
5f1c5d8ba8 Compile fix 2020-02-11 14:15:43 +01:00
Alexander Bock
126f2ac4cf Check for selfinclusion of assets (closes #1032)
Make sure that OpenSpace doesn't crash when bailing out early
2020-02-11 14:09:14 +01:00
Alexander Bock
9a714524ce Add try/catch block when downloading files to prevent an exception escaping the thread and killing the application (closes #1074) 2020-02-11 11:57:09 +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
b1f8f1536b Add missing file 2020-02-10 21:52:01 +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
f6507b9b57 Warn when user tries to map a command to Shift+Keypad on Windows (#closes 1069) 2020-02-10 18:38:07 +01: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
9491f73803 More GLM initialization fixes 2020-02-10 01:18:27 +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
Micah Acinapura
12b04f38bd macos compile and build (still needs ring shader const fix) 2020-01-29 21:43:06 -05:00
Jonathas Costa
bfa64a6aae Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-01-27 17:23:13 -05:00
Jonathas Costa
607451e04b Changes to fix Dawn scene. 2020-01-27 17:23:05 -05:00
Your Name
f560224143 GetProperty filter on groupname and update in base.asset 2020-01-27 16:49:36 -05:00
Alexander Bock
6a94b2267e Merge pull request #1053 from OpenSpace/feature/profile
Feature/profile
2020-01-27 16:18:01 -05:00
Alexander Bock
8a8748daaa Small fixes 2020-01-27 22:17:08 +01:00
GPayne
f682352b53 Merging with master 2020-01-27 09:14:35 -07: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
a1a4e56b5b Merge pull request #1037 from sa5bke/master
support curl version < 7.32.0, i.e. rhel/centos 7
2020-01-11 20:21:52 +01:00
GPayne
1ac68f8236 Fixed profile parser so it gets the profile input file first 2020-01-10 15:22:26 -07:00
GPayne
3ef1b8d511 Fixes to allow using temp directory for profile-to-asset conversion 2020-01-03 12:31:20 -07:00
Alexander Bock
e3afd82c47 Move the mapping target->frame from SpiceManager to SpacecraftInstrumentModule (#closes 21) 2019-12-28 00:25:17 +01:00
Alexander Bock
207db3c824 Remove PowerScaledCoordinates and rename PowerScaledSphere to Sphere (closes #4) 2019-12-27 23:29:28 +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
Eric Söderman
1343b206ab support curl version < 7.32.0, i.e. rhel/centos 7 2019-12-24 23:50:53 +01:00
GPayne
797c674f12 Moved profile-to-asset conversion to openspaceengine and using temp dir 2019-12-20 14:12:25 -07: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
Emil Axelsson
98079cea3c Feature/get navigation state (#1001)
Implement lua function getNavigationState
2019-10-30 14:26:53 +01:00
liuloppan
da8beff8e9 Feature/interaction monitor (#999)
* interaction monitor first commit

* Renaming some member variables with underscore

* Interaction monitor registering mouse events and touch events

* Added setIdleTime

* Adding to CMakeLists

* Moved interactionmoitor.cpp to correct locatioN

* Cleanup after review. Removed interaction type string and fixed indentation

* Changed documentation description

* Renamed hasNewWebInput to processNewWebInput

* Some cleanup

* Rename registerInteraction to markInteraction
Add markInteraction calls to mouse and keyboard event sin OpenSpaceEngine
2019-10-30 13:18:46 +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
GPayne
e3a842b53f Moving path to lua converter script 2019-10-21 15:38:45 -06:00
GPayne
18810384dc Initial commit of profiles, containing convert-to-scene script 2019-10-18 17:12:57 -06: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