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
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
Alexander Bock
dcfef3557f
Update copyright header
2017-12-29 20:11:22 +01:00
Jonathan Bosson
d9fa55581f
changes from PR comments
2017-07-13 20:10:35 -06:00
Jonathan Bosson
8b46b2a63a
build fix by using new path to lib and adding CMake include paths
2017-07-13 16:50:43 -06:00
Jonathan Bosson
ed15412bce
update libTUIO11 submodule
2017-07-13 15:53:35 -06:00
Jonathan Bosson
4df24723e9
remove old libTUIO
2017-07-13 15:51:48 -06:00
Jonathan Bosson
3322a3100f
use libTUIO as submodule
2017-07-13 15:49:57 -06:00
Jonathan Bosson
c4e4e141af
spaces instead of tabs
2017-07-13 13:09:25 -06:00
Jonathan Bosson
5caf871e06
improve LMA converging ability on zoom cases and limit max iterations to 3k instead of 5k
2017-06-23 15:24:07 -06:00
Jonathan Bosson
7f39ebb49c
cleanup and commented all code
2017-06-20 15:06:38 -06:00
Jonathan Bosson
612b207d19
mute mouse input when we have touch input (for feedback on linux)
2017-05-18 19:19:26 -06:00
Jonathan Bosson
7f82454114
small clean of LMA
2017-05-17 13:09:15 -06:00
Jonathan Bosson
63c02a72ae
build fix
2017-05-17 11:00:54 -06:00
Jonathan Bosson
7e1514d165
fix printed name on data
2017-05-16 17:14:19 -06:00
Jonathan Bosson
90faf09fa2
fix .csv print on unit test
2017-05-12 15:27:27 -06:00
Jonathan Bosson
f10c3783fa
set lmverbose to false as default
2017-05-12 09:42:46 -06:00
Jonathan Bosson
00ce0dd56f
improvement on unit test
2017-05-11 16:45:36 -06:00
Jonathan Bosson
cb3e31212a
do a unit test on the LM algorithm and save the data to .csv
2017-05-11 13:37:45 -06:00
Jonathan Bosson
9bc653ec01
save lm data for plots later
2017-05-10 17:07:54 -06:00
Jonathan Bosson
8f36159cba
add prints of gradient if verbose
2017-05-02 15:24:42 -06:00
Jonathan Bosson
9111151913
Using slerp to interpolate to new local rotation when choosing new focusnode, tried central difference on gradient calc to resolve zoom/roll bug
2017-04-26 16:10:23 -06:00
Jonathan Bosson
b5a058121d
put direct-manipulation in its own function, dynamic time step for all but the zoom-DOF
2017-04-25 17:06:46 -06:00
Jonathan Bosson
556e81afeb
fix diagonal-orbit-only bug and cleanup of code
2017-04-25 13:11:40 -06:00
Jonathan Bosson
0542e7cef5
Levmarq gives right q values, need to transform them to camera space correctly
2017-04-20 15:22:53 -06:00
Jonathan Bosson
099c343693
levmarq using correct gradient (finite derivative) and using the error to determine next delta step
2017-04-19 18:14:47 -06:00
Jonathan Bosson
0e1b399458
instead of projecting to screen-space the error is now calculated in modelspace (tracing current viewplane pos to surface coordinates)
2017-04-18 16:52:16 -06:00
Jonathan Bosson
58796ca390
func in levmarq now handles the distance between two screen points (one projected from the spheres surface), need to define gradient correctly
2017-04-18 15:57:07 -06:00
Jonathan Bosson
581f29ba95
Using levmarq correctly now, need to double check if grad is the partial derivative of s(xi,q). Added name on credits
2017-04-14 14:58:11 -06:00
Jonathan Bosson
3635bbcefc
start testing levmarq use
2017-04-14 12:02:11 -06:00
Jonathan Bosson
626c39b62e
fix number of iterations
2017-04-13 16:59:34 -06:00
Jonathan Bosson
99c5956588
merge with feature/planetradius for boundingSphere
2017-04-13 16:56:55 -06:00
Jonathan Bosson
f2aebcd880
one step closer, need to figure out gradient of func and how to send cam/node/aspectratio with void* fdata
2017-04-12 16:54:13 -06:00
Jonathan Bosson
ab877feaf9
first step for LM algorithm on screen-space points, camera/focusnode causes crashes if not initialized, where do we do this best?
2017-04-12 14:37:28 -06:00
Jonathan Bosson
1451d26851
Include right directories on posix files as well
2017-03-07 10:48:22 -07:00
Jonathan Bosson
436da23cd2
Include posix files in lubTUIO if its built on a UNIX unit. Small cleanup in touchmodule
2017-03-07 10:24:07 -07:00
Jonathan Bosson
c4bd08c19e
change TUIO protocol from v2.0 to v1.1 to support a wider range of sender applications
2017-02-21 14:00:36 -07:00
Jonathan Bosson
2d223dc250
using std::mutex over boost, debug prints for touch input in touchmodule
2017-02-18 22:11:48 -07:00
Jonathan Bosson
5e84b7f6a2
new touch module with TUIO library to make OpenSpace tuio-aware
2017-02-16 12:52:39 -07:00
