Commit Graph

156 Commits

Author SHA1 Message Date
Alexander Bock
51e1541cf1 Fix static initialization fiasco with touch input
Restore backwards compatibility of mod files
Provide better feedback about specification errors
2017-07-26 16:12:13 -04:00
Alexander Bock
dc79a94142 Remove warnings
Update SGCT repository
Update Ghoul repository
2017-07-26 11:59:48 -04:00
Alexander Bock
036b271d0d Change capitalization of property names 2017-07-22 18:22:44 -04:00
Alexander Bock
04bac9293b Encapsulate identifier, guiName, and description into a PropertyInfo struct 2017-07-22 17:36:03 -04:00
Alexander Bock
b584f0197e Add description to Propertys 2017-07-21 16:31:58 -04:00
Alexander Bock
e661324002 Remove style guide errors
Add missing newline errors
2017-07-21 11:52:25 -04:00
Alexander Bock
4b3037144f Jenkins compile fix 2017-07-19 21:19:39 -04:00
Alexander Bock
d571970487 Touch module capitalization compile fix 2017-07-19 19:01:10 -04:00
Alexander Bock
669af35b6b Fix capitalization of includes 2017-07-19 16:42:26 -04:00
Alexander Bock
77b15724b5 More shader cleanup
Remove dedicated logs folder
Change openspaceengine to create logs folder automatically
2017-07-19 15:44:30 -04:00
Alexander Bock
d246f8fb58 Renaming touch include files 2017-07-19 11:01:02 -04:00
Alexander Bock
e7b08e1e25 Cleanup copyright information in shaders 2017-07-18 16:24:57 -04:00
Alexander Bock
4cc6e11f68 Second part of turning touch classes to lower case 2017-07-18 15:53:04 -04:00
Alexander Bock
a1505422d2 First step of turning touch classes into lower case 2017-07-18 15:52:26 -04:00
Alexander Bock
008ab4e613 Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&) 2017-07-18 15:47:48 -04:00
Alexander Bock
0963184293 Removing more warnings 2017-07-18 01:05:59 -04:00
Alexander Bock
7737b082d9 Removing more warnings 2017-07-17 18:03:37 -04:00
Alexander Bock
0e9edaeb12 Fix byte order mark commits
Update Ghoul
2017-07-17 15:54:00 -04:00
Alexander Bock
096e751de2 Some more cleanup with nested namespaces 2017-07-16 11:59:01 -04:00
Alexander Bock
6a198c5d93 Started some warning cleanup 2017-07-14 14:21:01 -04:00
Kalle Bladin
2e4f31ded8 Interaction Updates (#353)
* Interaction speed is not dependent on framerate

* Split up interaction code in files and perform smooth interpolation when changing focus

* Abstract interaction code in to functions.

* Interpolation time is dependent on angle to focus node.

* Use correct delta time when interpolating

* Fix bug regarding decomposition of camera rotation.

* Make orbital interaction mode behave as globe browsing and no longer use interactiondepth below ellipsoid.

* Do not always rotate with object. Depending on distance

* Remove interaction depth below ellipsoid. Now able to interact without renderable

* Remove specification of interactionDepthBelowEllipsoid and cameraMinHeight

* Remove GlobeBrowsingInteractionMode

* Rename OrbitalInteractionMode to OrbitalNavigator and no longer extend interactionmode.

* Move properties from interaction handler to orbital navigator

* Use smooth step for follow rotation interpolator

* Rename KeyframeInteractionMode to KeyframeNavigator

* Rename files

* Clean up.

* Separate mousestate from orbitalnavigator

* Clean up

* Split keybindingmanager from interactionhandler interactionhandler

* Rename interactionhandler to navigationhandler

* Rename files

* Clean up

* Take back usage of gotochunk and gotogeo

* Rename lua library navigation

* Move functionality from navigationhandler to keyframenavigator

* Update scripts for navigation

* Comment code

* Clean up

* Solve but that caused NaN values for camera position when being in center of globe and setting focus to the globe.

* Update jenkins file to remove build folder before building.

* Fix error in jenkins script

* Update jenkins file

* Update jenkins file

* Revert jenkins file

* I hope this makes Jenkins happy.

* Line endings God damnit

* Line endings

* Clean up

* Fix compilation issue

* Take back default scene.

* Fix indentation

* Move functions goToGeo and goToChunk to GlobeBrowsingModule.

* Include algorithm for std::find

* Remove auto and other clean up
2017-07-14 17:17:17 +02:00
Jonathan Bosson
bca8af78c3 build fix, cannot bind non-const lvalue reference 2017-07-13 20:15:58 -06: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
784343a731 link to right directory for ext lib CMakeLists 2017-07-13 16:04:37 -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
30e1b2b4f1 make touchmarkers render on render callback over postdraw 2017-07-12 11:18:55 -06:00
Jonathan Bosson
99a450fccd std on all algorithms 2017-07-10 19:04:39 -06:00
Jonathan Bosson
5a2e217bcb limit finger input to LMA to 3 (makes it easier to converge on 3+ cases) 2017-07-10 17:18:50 -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
7bb83abe08 constructor looks more clean 2017-06-21 11:31:04 -06:00
Jonathan Bosson
f94d58d738 improvement to tap interpretation by time instead of path size 2017-06-21 11:30:16 -06:00
Jonathan Bosson
7f39ebb49c cleanup and commented all code 2017-06-20 15:06:38 -06:00
Jonathan Bosson
ad142580c2 cleanup 2017-06-16 17:57:08 -06:00
Jonathan Bosson
b1be00a0eb added transparency, thickness and color control to the markers 2017-06-14 14:09:54 -06:00
Jonathan Bosson
c53bcaac05 markers working, alpha and textures are not 2017-06-13 13:54:43 -06:00
Jonathan Bosson
5ef64aa513 gl_position is vec4, cleanup/tests 2017-06-09 17:48:07 -06:00
Jonathan Bosson
23f524d141 cleanup and shader compile fix 2017-06-09 15:43:35 -06:00
Jonathan Bosson
d3f574ba23 render TouchMarkers, currently causes crash on runtime 2017-06-09 15:24:36 -06:00
Jonathan Bosson
d0492b2516 fix misinterpretation on roll, fixed step size in LMA gradient the projectionmatrix caused, fixed infinite spin bug on LMA failure 2017-06-06 14:17:53 -06:00
Jonathan Bosson
de75f783ba using projectionMatrix instead of hardcoded projection, seems to have affected the gradient step size h (much larger now) 2017-06-01 16:56:26 -06:00
Jonathan Bosson
776d688899 improved performance by choosing step size more intelligently in gradient of LMA 2017-05-30 16:55:01 -06:00
Jonathan Bosson
8c5e33be13 refinement on gradient step size and fix to 'freeze' issue 2017-05-25 16:50:32 -06:00
Jonathan Bosson
c3e1f54b45 stubb for TouchMarker class to render where the contact points are on the screen 2017-05-24 16:25:16 -06:00
Jonathan Bosson
1eeb01d22d use an iterative method to find a good step size to take in gradient 2017-05-24 16:03:51 -06:00
Jonathan Bosson
f8b9310416 first pass on gradient step size that works with 1m - 1e10m 2017-05-23 17:10:04 -06:00
Jonathan Bosson
3386b5906f include scene.h 2017-05-19 14:00:55 -06:00