Commit Graph

1288 Commits

Author SHA1 Message Date
Joakim Kilby 2529d4c4d6 added definitions of which scripts should be shared over parallel connection 2015-06-26 09:37:51 +02:00
Joakim Kilby 4fb40ceeb9 also changed name of scripts variable in header file.... 2015-06-26 09:23:30 +02:00
Joakim Kilby 22af992078 removed a comment, changed name of script storing variable to something that makes more sense 2015-06-25 12:31:11 +02:00
Joakim Kilby 46757113fd removed debug printf 2015-06-25 12:28:17 +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 80df2a0abd added decoding of requester ID in init request message 2015-06-25 11:19:48 +02:00
Joakim Kilby c32841e0ac added a vector of executed scripts to parallel connection.
vector is filled every time a script is sent or received
2015-06-24 19:44:17 +02:00
Joakim Kilby 7fa460e9dc changed definition of Lua function slightly to incorporate a boolean defining if the script should be shared or not.
added a constructor with the sharing variable as default to zero so every script doesn't have to be changed.
added functionality in runScript function to check if a script should be shared and if so send it.
2015-06-24 19:41:59 +02:00
Joakim Kilby 77ecdcec74 removed call to sendScript from script engine.
Not all scripts should be synchronised
2015-06-24 18:00:55 +02:00
Joakim Kilby ff49a7cdd2 code cleanup, commenting, refactoring, and renaming.
fixed a bug where threads would not close down correctly on Unix systems
2015-06-24 17:52:21 +02:00
Joakim Kilby 13eb012a04 added a current run time variable for the openspace engine + get/set method.
run time is set in preSync from SGCT runtime at the moment
2015-06-24 17:51:32 +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 466d9028f9 changed ghoul version 2015-06-23 11:34:43 +02:00
Joakim Kilby b6bd205304 Added init request handling for non-hosts
osparallelconnection is no longer a property owner
2015-06-23 11:33:20 +02:00
Joakim Kilby 77720b6985 Merge branch 'feature/remote' of openspace.itn.liu.se:/openspace into feature/remote 2015-06-23 10:21:21 +02:00
Joakim Kilby fabbd3c1e8 added a vector containing all executed scripts for this session and method to get it.
added a call to sending of scripts via parallel connection as soon as they are executed.
2015-06-23 09:34:34 +02:00
Joakim Kilby b2b7563018 added functionality to send and decode scripts 2015-06-23 09:33:09 +02:00
Joakim Kilby ba49755d83 removed dummy frames 2015-06-18 11:36:38 +02:00
Joakim Kilby 4c06a76eae removed dummy frames 2015-06-18 11:04:34 +02:00
Joakim Kilby 45c7053729 Merge branch 'feature/remote' of openspace.itn.liu.se:/openspace into feature/remote
* 'feature/remote' of openspace.itn.liu.se:/openspace:
  added buffering of samples and changed how samples are handled when received. fixed a bug where client did not regain control after host disconnected
2015-06-18 10:45:41 +02:00
Joakim Kilby 8f1f2dafa9 changed so that 10 samples per second are sent 2015-06-18 10:45:36 +02:00
Joakim Kilby ca3628e505 added buffering of samples and changed how samples are handled when received.
fixed a bug where client did not regain control after host disconnected
2015-06-18 10:44:38 +02:00
Joakim Kilby b723751c1b added functionality to disconnect and request hostship via LUA.
fixed bug in threading
2015-06-18 09:10:15 +02:00
Joakim Kilby be21b8e43d added quaternion interpolation 2015-06-17 16:03:42 +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 78f170048e moved deleteion of osparallelconnection 2015-06-17 15:04:55 +02:00
Joakim Kilby 206b47d675 quick fix for testing 2015-06-17 13:21:29 +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 74ab05ec37 rename of mutex 2015-06-17 08:39:49 +02:00
Joakim Kilby 91247d4ac9 added keyframe struct and functionality to broadcast keyframes 2015-06-17 08:39:34 +02:00
Joakim Kilby cce351af69 removed all references to remotecontroller 2015-06-17 08:39:02 +02:00
Joakim Kilby f35ec6f8d4 Removed remotecontroller class 2015-06-17 08:38:25 +02:00
Joakim Kilby 8da76f6d1e added message specific decoding functions 2015-06-16 16:37:07 +02:00
Joakim Kilby 8f05d64316 added lua scripting functionality and fixed authentication to server 2015-06-16 15:45:00 +02:00
Joakim Kilby 20ea924fbf Merge branch 'feature/remote' of openspace.itn.liu.se:/openspace into feature/remote
* 'feature/remote' of openspace.itn.liu.se:/openspace:
  Removed redefinition of BOOST_ROOT
  changed default scene from NH to standard scene and commented out a printf.
2015-06-16 13:57:51 +02:00
Joakim Kilby 2d3ef442fb adding parallelconnection 2015-06-16 13:56:34 +02:00
Joakim Kilby 91d991b45c Merge branch 'feature/remote' of openspace.itn.liu.se:/openspace into feature/remote 2015-06-16 11:32:57 +02:00
Joakim Kilby e156e6f21a Removed redefinition of BOOST_ROOT 2015-06-16 11:31:34 +02:00
Joakim Kilby 57fb1a1dd4 changed default scene from NH to standard scene and commented out a printf. 2015-06-16 08:20:25 +02:00
Joakim Kilby 52161cbe41 changed default scene 2015-06-16 08:04:38 +02:00
Joakim Kilby 61934f824b Merge branch 'develop' into feature/remote 2015-06-12 10:47:41 +02:00
Alexander Bock 3fee6e8baf Added more logging text to detect errors 2015-06-10 19:03:06 +02:00
Alexander Bock 726a8e84ef Adding parsing of scene files to Launcher application 2015-06-10 02:05:52 +02:00
Alexander Bock fab3b3e177 Move FileSystem initialization into ghoul::initialize 2015-06-10 02:05:20 +02:00
Alexander Bock 511f103430 Make APPLICATION_LINK_TO_OPENSPACE actually include the libOpenSpace and Ghoul as well 2015-06-10 02:04:41 +02:00
Alexander Bock 4c415ef502 Some more work restructuring the launcher 2015-06-08 01:55:38 +02:00
Alexander Bock b190695474 Add initial version of launcher 2015-06-08 01:08:58 +02:00
Alexander Bock e17b39a851 Cleanup string generation 2015-06-07 19:20:56 +02:00