Commit Graph

65 Commits

Author SHA1 Message Date
Kalle
fc53905131 Store interaction modes in interaction handler in a std::map 2016-07-01 13:13:31 -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
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
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
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
Alexander Bock
1de7a76cde Making changing the coordinate system a property in InteractionHandler 2015-07-06 16:14:49 +02:00
Alexander Bock
678362eee2 Add a global propertyowner namespace to which the InteractionHandler is added, removing the need for the earlier hack 2015-07-06 15:55:42 +02:00
Joakim Kilby
446aa544b8 Making origin a property 2015-07-06 13:10:59 +02:00
Joakim Kilby
93e4a9b526 redesigning the communication protocol and message types.
also added time keyframes which are sent on a per-frame basis
2015-07-05 16:09:57 +02:00
Joakim Kilby
2cd827a4fd added method to clear keyframes and call to that method when hostship is switched 2015-06-25 11:28:18 +02:00
Joakim Kilby
9a74bd60b7 renamed osparallelconnection to parallel connection. Updated all files and CMakeLists to use new name.
started rebase work on parallel connection
2015-06-24 11:23:36 +02:00
Joakim Kilby
e42d160773 added interpolation and mutex protection
changed TCP protocol to no delay
2015-06-17 15:11:34 +02:00
Joakim Kilby
8297f2e683 First test of actual remote controlling 2015-06-17 13:10:19 +02:00
Joakim Kilby
4e4cf4cd6a temporarily removed references to keyframes in interactionhandler.
changed how keyframes are encoded/decoded and sent in osparallelconnection
2015-06-17 11:18:50 +02:00
Joakim Kilby
9d6b9a3ad1 adding first version of keyframe functionality for interactionhandler 2015-06-17 09:52:12 +02:00
Joakim Kilby
cce351af69 removed all references to remotecontroller 2015-06-17 08:39:02 +02:00
Joakim Kilby
1bcf11412e adding remotecontroller class, changes to CMake to include it and (temporary) functionality to use it, should be declared in CFG file 2015-06-04 12:53:32 +02:00
Alexander Bock
f1e6ad6f3d Remove more warnings 2015-05-23 22:42:51 +02:00
Alexander Bock
b6e0bd1043 Added interaction speed modifiers/inverters
Disable cotire
Enable Xcursor and Xinerama libraries on Linux builds
2015-02-23 15:58:05 +01:00
Alexander Bock
a6ebddb8eb Updated copyright header in all files 2015-02-17 14:20:03 +01:00
Joakim Kilby
a8abfa74bd Added proper synchronization for mouse controller and camera.
Camera class now contains three instances of synched variables. a local copy changed on master. a shared copy only used for sharing in serialize/deserialize. and finally a synched copy never written to except in post sync
2015-02-10 11:34:12 +01:00
Joakim Kilby
fe0cd2c130 Added call to update of MouseController in update function.
Added distance and orbit functions.
modified setRotation function to actually set rotation of camera (was empty)
2015-02-06 11:22:34 +01:00
Alexander Bock
73143b8b47 Reenable methods for limiting closeness to focus object
Renable key binding feature that was broken by merging
2014-11-18 19:40:24 +01:00