Commit Graph

149 Commits

Author SHA1 Message Date
Malin E
99d52ce144 Merge branch 'master' into feature/min-max-distance
* Solve conflicts
2023-03-27 15:43:22 +02:00
Emma Broman
284ee17fb7 Fix problem with touch module always aborting idle behavior (closes #2541) 2023-03-10 15:14:45 +01:00
Emma Broman
352c9dd5ec Touch module code cleanup (#2465)
* Remove unused feature that allowed us to "pick" nodes using touch (it didn't really work and had some nasty hardcoded and costly implementation). Fixes Touch interaction picking refactor #1041

* General refactoring of code and removing redundant code

* Make touch markers prettier (change default color and smoothen edges)

* Add module property to control which renderable types are "directly touchable"

* Add SGN property to control which individual nodes are "directly touchable" ("SupportsDirectInteraction")

* Fix stuttering when zooming in closer than the orbitalnavigator allows
2023-02-14 13:55:24 +01:00
Emma Broman
a0f9e88432 Feature/touch fixes (#2463)
* Add Ceres to touch interaction list (Forgotten in previous commit. OBS! This list will be removed)

* Small code updates (Logical ordering of functions, code standard)

* Fix compilation issue when using debug define

* Make touch navigation abort idle behavior

* Make reset a trigger property

* Fix some broken property sliders (the default step size was too big)

* Update interaction monitor state on touch interaction with WebGui

* Add some documentation of what "LM" means, and make unit test a developer property
2023-02-01 12:44:34 +01:00
Malin E
ef635c5676 Add property to disable direct manipulation 2023-01-16 15:38:40 +01:00
Malin E
45f4aa6a32 Add node bounding sphere multiplier zoom out limit in touch module 2023-01-12 14:18:27 +01:00
Alexander Bock
4f4764209f Happy new year 2023-01-02 11:19:33 +01:00
Malin E
715022a278 Add property to dissable zoom and roll interaction for touch 2022-11-04 13:57:43 +01: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
10ec6d3013 Revert pragma warnings 2022-07-11 14:26:13 +02:00
Alexander Bock
0b62d5cc4b Disable unknown pragma warnings and adapt to it 2022-07-05 14:27:40 +02:00
Alexander Bock
d7d279ea16 Happy new year 2022-01-01 12:32:55 +01:00
Alexander Bock
7004c02b86 Happy new year 2021-01-02 15:26:51 +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
Emma Broman
1a0eaf2df0 Use opacity instead of transparency in TouchMarker 2020-07-08 15:54:12 +02:00
Alexander Bock
66716a36a7 Merge branch 'master' into feature/imgui-touchhandling
# Conflicts:
#	modules/touch/src/touchinteraction.cpp
2020-03-28 20:41:47 +01:00
Mikael Pettersson
fb7036c497 Made imgui handle touch input as the webgui does
Also removed imgui-handling code in touchinteraction
2020-03-11 13:23:46 +01:00
Mikael Pettersson
7b282ae77c Replaced magic value with a property and added
a quick and dirty aspect ratio to the pinch-zoom handling
2020-03-10 17:58:14 +01:00
Mikael Pettersson
a991a80525 Made pinch input default to continuous zoom
- Added a directTouch bool field to touch step function
- Some logic of how to gather accumulated zoom value
2020-03-10 09:57:07 +01:00
Alexander Bock
d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +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
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
2f1805b651 Some general cleanup of the code 2019-12-16 10:09:41 +01:00
Mikael Pettersson
43296979d8 Fixed rotation matrices in touch
Fixed rotation matrices in the touchmodule, while at it I also moved out
the lev-marq solver from the touchinteraction.cpp to its own file, in an
effort to make the code lighter to read.

Also changed some logic in how touch intersection is made with the
scenenodes.
2019-12-10 15:15:52 +01:00
Mikael Pettersson
a33057d830 Feature/integrated touchserver (#1015)
* WINDOWS: Touch server integrated into module

The touch server functionality has been integrated into the touch module
which is enabled by-default when the touch module is used on a windows
build.
The touch-hook checks for a connected digitizer (pen or touchscreen, but
I haven't tested pen)

This commit should also fix two potential low-risk race conditions in
the tuioear.cpp file.

* Added comment regarding which window we use

* Added copyright notice on the win32_touch files

Also changed from #pragma to #ifndef

* Fixes based on review

- Added anonymous namespace
- Put win32hook in openspace namespace
- Fixed indentations and linebreaks
- Fixed an issue regarding global state deinitialization
2019-12-02 14:09:15 +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
Alexander Bock
bb3db7ada7 Feature/jenkins fix (#816)
* Cleanup
* CMake cleanups
* Update current year
* Update copyright header
* Use script to return list of all modules
* Update credits, license and ghoul
2019-03-24 11:19:39 +01:00
Gene Payne
c44290fe1f Feature/touch web gui support (#798)
* Added touch support for web GUI

* Code cleanup after master merge, no functionality changes

* Fixed alignment of function arguments
2019-02-21 07:35:47 -07:00
Emil Axelsson
2e71eaa4cb Feature/anchor and aim (#799)
Introduce the ability to navigate using an anchor and aim.
Example use: Set spacecraft as anchor and planet as aim to always look down at a planet, while followin the spacecraft in its orbit.
2019-02-19 18:46:58 +01:00
Gene Payne
568143638d Fixed touch interface bug github issue #682, and fixed upper-left corner menu tap toggle. (#739) 2018-10-29 10:01:49 -04:00
GPayne
db28b3e2a9 Merged master into touch-user-study branch 2018-07-05 15:33:46 -06:00
Alexander Bock
d86b78f2f5 Address PR comments 2018-07-05 09:47:35 -04:00
Alexander Bock
4952f8f977 Code cleanup branch (#618)
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
2018-06-10 04:47:34 +00:00
GPayne
305ae9d8fb Merge with master branch 2018-05-15 13:56:17 -06:00
GPayne
e31e80d851 Make lower-right corner double tap zoom-out a non-optional feature 2018-05-14 15:03:47 -06:00
GPayne
a767c2fd08 Fixed some touch behavior (especially zoom) and implemented lower-right corner double-tap for zooming out 2018-05-08 16:44:53 -06:00
GPayne
d686212b35 Added asymmetrical zooming to try for more balance between zooming in vs. out 2018-05-07 16:06:21 -06:00
GPayne
1d5298660b Modified control of gesture sensitivity settings to improve feel of interaction, fixed roll decay bug 2018-05-07 16:06:21 -06:00
GPayne
442817e9d0 Implemented velocity ceiling with nonlinear behavior with focus node distance 2018-04-20 16:07:23 -06:00
Alexander Bock
4041bbb935 Cleanup (#600)
* General Code Cleanup
 * Add check for TABs to check_style_guide.py
 * Removing warnings
2018-04-19 13:27:15 -04:00
GPayne
86534b7a17 Merged-in master branch 2018-04-11 12:24:27 -06:00
GPayne
dbb0915417 Working constant-time touch interaction decay. Needs a speed limit when close to camera focus node. 2018-04-11 11:40:40 -06:00
Gene Payne
5380636932 Update of touch table interface code (#561)
* Version of touch interface for user study that has disabled panning and limited zoom to prevent zooming through the planet surface

* Update starlabels.data file

* Enable minimum picking distance in NDC

* Fix stack corruption bug in TouchMarker

* Version of touch interface for user study that has disabled panning and limited zoom to prevent zooming through the planet surface

* Fix stack corruption bug in TouchMarker

* Add time limit to levmarq solver

* Add debug properties to touch GUI with a compile time flag

* Guard against accessing outside bounds

* Added exponential zoom for faster zoom with increased distance from focus node

* Refined the exponential zoom for better behavior on the touch table

* Added properties for disabling panning and node boundary sphere multiplier for zoom

* Added more debug logging and stopped using camera focusNode (looks deprecated) for distance calculation

* Found error in the deceleration algorithm

* Default-disable debug logging, exponential zoom coeff change and additional debug log statement
2018-03-20 10:25:28 -04:00
GPayne
97ef55b4be Default-disable debug logging, exponential zoom coeff change and additional debug log statement 2018-03-16 12:39:39 -06:00
GPayne
eba52193c4 Added more debug logging and stopped using camera focusNode (looks deprecated) for distance calculation 2018-03-16 12:12:01 -06:00
Alexander Bock
f38c26eff0 Remove warnings 2018-03-12 22:31:01 +01:00
Alexander Bock
7ccb42545c Remove Clang warnings 2018-03-08 20:18:18 +01:00
GPayne
237db975fe Added properties for disabling panning and node boundary sphere multiplier for zoom 2018-02-26 14:55:26 -07:00
GPayne
142702bbea Refined the exponential zoom for better behavior on the touch table 2018-02-23 13:14:25 -07:00