Commit Graph

35 Commits

Author SHA1 Message Date
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
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
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
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
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
GPayne
40bf64fe70 Added exponential zoom for faster zoom with increased distance from focus node 2018-02-17 19:56:36 -07:00
GPayne
9b8aaef1fb Merge master into touch study branch 2018-01-18 15:52:48 -07:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
afa1d6d33e Add strict test for whitespace at end of line
More work on coding style
2017-11-09 23:47:51 -05:00
Alexander Bock
fc048cd455 Merge branch 'master' into touch-user-study
# Conflicts:
#	modules/touch/include/touchmarker.h
#	modules/touch/src/touchinteraction.cpp
#	modules/touch/src/touchmarker.cpp
2017-11-09 10:30:45 -05:00
Alexander Bock
b50b52d351 Cleanup for coding style
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Emil Axelsson
16efa28470 Guard against accessing outside bounds 2017-11-03 15:48:00 +01:00
Emil Axelsson
aa63ec68b0 Add debug properties to touch GUI with a compile time flag 2017-11-03 11:28:39 +01:00
Alexander Bock
ca69408366 Enable minimum picking distance in NDC 2017-11-02 12:05:09 -04:00
Alexander Bock
e661324002 Remove style guide errors
Add missing newline errors
2017-07-21 11:52:25 -04:00
Alexander Bock
d571970487 Touch module capitalization compile fix 2017-07-19 19:01:10 -04:00
Alexander Bock
d246f8fb58 Renaming touch include files 2017-07-19 11:01:02 -04:00