Commit Graph

104 Commits

Author SHA1 Message Date
Erik Broberg
649d8d2f67 Remove shared and synced versions of data members in MouseStates 2016-09-03 22:54:02 -04:00
Erik Broberg
2116f5c987 Rename preSync and postSync in InteractionHandler to more descriptive names 2016-09-03 22:14:10 -04:00
Alexander Bock
193e2bdc64 Fix linking error when OpenSpace is compiled without the globebrowsing module 2016-08-29 10:45:59 +02:00
Alexander Bock
6d20c8301f Remove Globebrowsing restrictions from InteractionHandler header file 2016-08-29 01:07:27 +02:00
Alexander Bock
be67131c33 Remove Globebrowsing restrictions from InteractionHandler header file 2016-08-29 00:56:28 +02:00
Erik Broberg
23c4a05a96 Merge from globebrowsing 2016-08-17 20:25:58 -04:00
Erik Broberg
d4f635513d Merge branch 'develop' into feature/globebrowsing 2016-08-17 19:53:28 -04:00
Alexander Bock
6c43d8404a Added missing files 2016-08-17 16:27:13 +02:00
Alexander Bock
c93d882ea6 Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files)
Updating SGCT and Ghoul references
2016-08-17 16:26:14 +02:00
Kalle Bladin
d91dd3dbb7 Implement ability to update camera in two steps. still using old method. 2016-08-04 19:16:36 -04:00
Kalle Bladin
541fbba322 Merge with develop and solve conflicts. 2016-07-18 17:26:30 -04:00
Alexander Bock
f7f8f279de Move the LuaLibrary definition into its own file 2016-07-18 12:40:29 +02:00
Alexander Bock
dc32dfe075 Added functionality to print all keybindings to file when a scene is loaded 2016-07-14 00:28:09 -04:00
Kalle
7e7a1cb720 Change friction to bool properties 2016-07-13 11:29:29 -04:00
Kalle
fc53905131 Store interaction modes in interaction handler in a std::map 2016-07-01 13:13:31 -04:00
Kalle
3c7d1e22fc Globe browsing interaction mode follows the rotation of the globe. 2016-07-01 12:46:16 -04:00
kbladin
a89f474502 Solve merge conflict and add properties for friction and interaction parameters. 2016-06-30 14:07:51 -04:00
Kalle Bladin
161d722623 Enable setting of friction, sensitivity and followscalefactor in interaction handler. 2016-06-29 21:13:04 -04:00
Alexander Bock
5a5ffd76bb Add InteractionHandler to global property gui
Add property to interactionhandler to enable/disable rotational and zoom friction
2016-06-29 22:42:12 +02:00
Kalle Bladin
35a095c448 Change camera dictionary state representation to consider position, rotation and focus node. 2016-06-29 15:23:37 -04:00
Kalle Bladin
6cb82f691a Save and restore camera state as lua tables. 2016-06-29 13:04:41 -04:00
Kalle Bladin
5807919ac7 Start changing camera write and restore functions. 2016-06-29 10:45:26 -04:00
Kalle Bladin
e5ccf185cd Remove rotation state variables from interaction mode and enable more freely local rotation. 2016-06-28 22:28:56 -04:00
Alexander Bock
8886eeec9d Compile fix for when globebrowsing is not available 2016-06-26 03:38:42 +02:00
Erik Broberg
745c51c4e4 Add unimplemented initialize to InteractionModes 2016-06-22 18:22:46 -04:00
Erik Broberg
7c0e80b866 Enable basic saving and restoring camera position between runs 2016-06-22 17:37:55 -04:00
Erik Broberg
60da53c00e Divide InteractionHandler and Interaction modes into different files 2016-06-22 14:42:24 -04:00
Erik Broberg
6e5796107c Remove Camera pointer from all InteractionModes. Pass it into update() instead 2016-06-22 12:32:11 -04:00
Erik Broberg
16564a69e3 Remove InputState pointer from all InteractionModes. Pass it in in update() instead 2016-06-22 12:12:48 -04:00
Kalle Bladin
69aef205af Interaction mode inertia is no longer dependent on the framerate. 2016-06-21 13:42:56 -04:00
Kalle Bladin
bc21643f06 Add the ability to change the interaction mode dynamically and via lua script. 2016-06-07 17:25:00 -04:00
Kalle Bladin
96c4f0e1c9 Solve merge conflict 2016-06-02 12:57:25 -04:00
Kalle Bladin
a5b6eb935a Include list to compile on OSX 2016-06-02 12:55:59 -04:00
Kalle Bladin
e0814a23dd The ellipsoid of a globe is used to determine how to move the camera in a new interaction mode. 2016-05-26 18:56:36 -04:00
Kalle Bladin
eed5885f25 Improve interaction. 2016-05-25 21:32:03 -04:00
Kalle Bladin
d5d59302e2 Update interaction 2016-05-24 22:50:42 -04:00
Kalle Bladin
f2c7a826b3 Smooth movements using delay. 2016-05-24 19:34:57 -04:00
Kalle Bladin
54a824e667 Some basic orbital interaction via mouse control. 2016-05-24 18:30:41 -04:00
Kalle Bladin
09ca260778 Rotating with orbital interaction mode. 2016-05-24 13:26:07 -04:00
Kalle Bladin
f438535579 Add classes that are not yet used. 2016-05-23 13:02:24 -04:00
Kalle Bladin
9d235f42b2 Remove old parts of the interface to interaction handler. 2016-05-20 18:50:11 -04:00
Kalle Bladin
c2ef5cca58 Remove all implementation from the interaction handler class. Interface is still the same. 2016-05-20 17:39:32 -04:00
Kalle Bladin
dcd00e77d0 Minor structural changes in interaction handler. 2016-05-20 16:03:30 -04:00
Alexander Bock
906470f28e Untabify the rest of the source files
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock
352e7283d6 Enable the usage of modifiers in bindKey calls (closing #158) 2016-04-08 18:03:09 +02:00
Alexander Bock
8d3c667ada Untabify InteractionHandler files 2016-04-08 15:13:21 +02:00
Alexander Bock
877a4d1ba6 Updated copyright header 2016-02-05 17:43:21 +01:00
Alexander Bock
c7cc137da9 Started cleanup of LuaConsole 2016-01-03 11:27:50 -05:00
Alexander Bock
49dbb1ce20 More work on converting to SGCT window handler
Adapting to change in SGCT key callback handling
2015-10-26 09:19:28 -05:00
Alexander Bock
d84edc4090 More work on transitioning to windowwrapper for keyboard and mouse interaction 2015-10-25 17:34:03 -05:00