Commit Graph

157 Commits

Author SHA1 Message Date
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
GPayne
97ef55b4be Default-disable debug logging, exponential zoom coeff change and additional debug log statement 2018-03-16 12:39:39 -06:00
GPayne
cf3a3d6e63 Found error in the deceleration algorithm 2018-03-16 12:16:07 -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
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
47233b8e6f Make use of UniformCache in many Renderables and switch from setUniform(const std::string&, ...) to setUniform(GLint, ...) in those cases 2017-12-31 17:31:10 -05:00
Alexander Bock
6089449bba Fix crash with MSAA buffer generation when compiling in Debug on Windows
Cleanup of logging behavior
2017-12-30 20:24:05 -05:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
23a446cb2c Update Ghoul repository
Adapt to changes that absPath is not called automatically as often anymore
Remove atmosphereearth.scene
2017-12-13 21:55:29 -05:00
Alexander Bock
a08c678bb0 Remove erraneous enabled OpenGL checking code
Remove warnings
Reset using the star glare texture as billboard for the Sun
2017-12-12 13:07:56 -05:00
Alexander Bock
a631b7e0a3 Making most logger categories constexpr 2017-12-11 23:46:34 -05:00
Alexander Bock
38338725b9 Strict coding style adherence 2017-11-26 14:57:26 -05:00
Alexander Bock
719130b6b7 Jenkinswarnings (#419)
* Remove more warnings

* Removing more warnings

* More warning fixes

* More warnings

* More warnings

* Update ghoul
2017-11-16 21:19:28 -05:00
Alexander Bock
3a7f221793 Remove GCC warnings 2017-11-13 16:22:07 -05: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
Emil Axelsson
2c486ac38b Fix stack corruption bug in TouchMarker 2017-11-02 20:50:56 +01:00
GPayne
ad1a4a21fb Version of touch interface for user study that has disabled panning and limited zoom to prevent zooming through the planet surface 2017-11-02 20:50:56 +01:00
Alexander Bock
ca69408366 Enable minimum picking distance in NDC 2017-11-02 12:05:09 -04:00
Alexander Bock
c275b2f833 Feature/cmake cleanup (#381)
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00
Alexander Bock
8a62e6e791 Add description to PropertyOwner 2017-08-01 17:05:52 -04:00
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
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
669af35b6b Fix capitalization of includes 2017-07-19 16:42:26 -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
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
c4e4e141af spaces instead of tabs 2017-07-13 13:09:25 -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