Commit Graph

75 Commits

Author SHA1 Message Date
Emma Broman 0cc5704b6a Add isGuiWindow check for mouse and keyboard callbacks
Fix interaction problems when hovering/clicking with the mouse in a non-GUI window, when having a setup with more than one window (e.g. the single_gui.json setup)

Previously, clicking with the mouse in the rendering window without the GUI also triggered mouse clicks in all the other windows, including the GUI windows. This was disturbing for interaction in the single_gui setup

Now, the GUI modules check to see if the clicked window is actually an interaction window
2022-08-05 11:41:10 +02:00
Emma Broman 0161d514b7 Fix collision between ImGui and WebGui
The callbacks of WebGui (which is on top) now gets priority
2022-08-05 11:41:10 +02:00
Alexander Bock 163ac4dcef Cleanup of mostly asset files
- Fixes for all files
 - constexpr cleanup
 - Cosmetic changes
 - Remove punctuation from the end of messages
2022-07-28 17:21:59 +02:00
Alexander Bock 9cc4c595a8 Code Cleanup (#2191)
* constexpr const -> constexpr
* const char* -> std::string_view
2022-07-25 15:57:45 +02:00
Ylva Selling b24181e206 Remove --ignore-gpu-blocklist CEF flag 2022-07-21 18:40:03 -04:00
Alexander Bock 9b1143f02f Ubuntu 22.04 and GCC11 fixes (#2163)
* Update CEF version
* Update Ghoul
* Update SGCT
* Update codegen
* Remove warnings happening on Ubuntu 22.04 with GCC 11
* AppleClang warning fixes
* Compile fix for Ubuntu and MacOS
* Add Qt 6.2.3 to the CMAKE_PREFIX_PATH
2022-06-28 00:46:01 +02:00
Gene Payne 7893210eff Removed superfluous X11 error handler code in CEF process helper 2022-05-16 15:09:03 -06:00
GPayne 6af8c004e0 Merging master in to sync with new release 2022-05-12 14:59:15 -06:00
Ylva Selling 9dc1f492e4 Remove flag that was causing rendering problems 2022-04-27 11:04:47 -04:00
Ylva Selling 3b76ac711b Update CEF flags 2022-04-27 08:55:00 -04:00
Ylva Selling 1e180a6fa7 Update CEF flags 2022-04-26 18:39:08 -04:00
Ylva Selling 75aaa0abb3 Remove CEF-command line flag to prevent GPU crash 2022-04-25 17:06:51 -04:00
Gene Payne cf134701ee Created cef processhelper file specific to linux 2022-04-14 13:41:22 -06:00
GPayne fff91f27e4 Initial attempts at getting CEF working in ubuntu linux 2022-04-11 23:01:49 -06:00
Micah Acinapura 8dd7bd9314 update cef and a few calls for it (#1916)
* update cef and a few calls for it

* fixing ref ptf for cef

* fixes for macos cef update; fixes #1114

* roll back cef version to 91

* remove print from cmake
2022-03-29 13:09:13 -04:00
Alexander Bock d7d279ea16 Happy new year 2022-01-01 12:32:55 +01:00
Alexander Bock 76b9c7587b Adapt to explicit specifcation of texture size (#1794)
* Adapt to explicit specifcation of texture size
2021-12-26 19:19:04 +01:00
Malin E 8bddf38f02 Split InputState into MouseInputState and KeyboardInputState 2021-11-03 15:28:37 +01:00
Emma Broman 77bdfaefd6 Move camera path code into core and refactor navigation code a bit 2021-06-23 09:12:36 +02:00
Alexander Bock d2f9530885 Windows fix 2021-05-25 20:11:26 +02:00
Alexander Bock 6cf6e450fb Address MacOS compile issues, make ISS model scene graph node visible 2021-05-25 17:50:31 +02:00
Alexander Bock c3ba532bdb Feature/cleanup (#1608)
* Revert screenlog back to showing Info and above messages
 * Various code cleanup
2021-05-25 14:08:33 +02:00
Alexander Bock 92432caed2 Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string 2021-05-17 00:23:15 +02:00
Alexander Bock ccdc5a5dc3 Feature/filesystem cleanup (#1587)
* Adapting to the changes in Ghoul
* First step of moving filesystem functions to std
* Remove persistence flag from cachemanager
2021-05-16 20:26:49 +02:00
Alexander Bock 7004c02b86 Happy new year 2021-01-02 15:26:51 +01:00
Alexander Bock 067c0f4b27 Introduction of new Dictionary class (#1446)
* Adapting to introduction of new Dictionary class in Ghoul
 * Mainly replacing usage of float instead of doubles as expected
 * Adjust to the lack of the hasKeyAndValue function
2021-01-02 15:07:11 +01:00
Alexander Bock d95c6c4a47 Removing Clang on MacOS warnings. No longer create external control that doesn't work anymore 2020-12-08 00:24:24 +01:00
Alexander Bock 51470c0a0d Issue/1355 (#1424)
* Move glfw init after macOS window is ready
* MacOS fixes for BigSur
* Compile fixs
* Rename hirise.asset since linux filenames are case-sensitive
* Modified globals DataStorage method to make Linux and Mac happy
* Switched to unsecure http URLs for satellites due to httprequest problem
* Keep the QApplication around on Mac because of some reason otherwise the keyboard handler crashes
* Add comment explaining the madness
* Apply same techniques to the globalscallback file

Co-authored-by: Micah Acinapura <micahnyc@gmail.com>
Co-authored-by: Gene Payne <payne.gene@gmail.com>
2020-12-07 23:41:20 +01:00
Alexander Bock efffc25ce0 Feature/globals handling (#1352)
* Cleaner handling of global state
* Prevent Lua memory corruption (closes #982)
* Initialize glfw first thing to prevent weird joystick loading bug during startup
2020-10-21 22:30:05 +02:00
Alexander Bock 7e06f310eb Update submodules
Remove warnings and MSVC analyzer information messages
2020-09-01 01:18:17 +02:00
Alexander Bock 5a94c486f0 Removing warnings 2020-04-14 22:32:26 +02:00
Alexander Bock f1fe2f197b General code cleanup 2020-04-14 15:48:58 +02:00
Mikael Pettersson fa5bbc5a44 Added keymodifiers to touch event handling 2020-03-25 09:52:16 +01:00
Mikael Pettersson 3210dfd315 Made these changes only apply on Win32 builds 2020-03-25 09:52:16 +01:00
Mikael Pettersson c9b5ffd021 Changed webbrowser to use cef touch events
rather than injected mouse events.
2020-03-25 09:52:16 +01:00
Alexander Bock 5e29145395 Coding style cleanup 2020-02-14 19:37:06 +01:00
Alexander Bock de24e81bda Fix copyright header information
Remove TimelineView application
2020-02-12 22:36:11 +01:00
Alexander Bock d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Alexander Bock 49c793d976 Update Ghoul version
Add initial Tracy profiling macros
2020-02-10 14:50:41 +01:00
Alexander Bock 6a94b2267e Merge pull request #1053 from OpenSpace/feature/profile
Feature/profile
2020-01-27 16:18:01 -05: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 a51cee1f36 Add a method for creating a unique name for screenspace renderable (closes #652) 2019-12-27 21:25:22 +01:00
Alexander Bock 8feb6d1d2b Small cleanup
Make sure OpenSpace compiles in debug mode
2019-12-17 10:57:37 +01:00
Stefan Seibert a66e872e4e Improvements in Performance due to adopted usage of CEF Message Loop (#1017)
* Changing the way how we pump the CEF update loop to improve performance

* Updated Intervall description
2019-12-04 10:01:35 +01:00
Emil Axelsson c96794bf27 Update modules to call InteractionMonitor.markInteraction 2019-10-30 16:20:26 +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
Emil Axelsson ce15381fb2 Fix browser mask bug introduced when flipping y axis 2019-07-19 22:16:13 +02:00
Emil Axelsson 14d9bbe58b Fix crash related to deinitialization of screenspacebrowser 2019-07-19 16:52:23 +02:00