Commit Graph

68 Commits

Author SHA1 Message Date
Joakim Kilby
2f801a4171 adding a password check when changing hosts 2015-07-07 15:29:56 +02:00
Joakim Kilby
326f42f224 changed it so the buffer is completely flushed if there are messages queued when send function is called 2015-07-07 14:05:09 +02:00
Joakim Kilby
b75743a0ba stability fix to ensure socket isn't shutdown when first message has not yet been queued 2015-07-07 13:37:23 +02:00
Joakim Kilby
414e8d1182 renaming function for sending
minor bugfix
2015-07-07 13:23:32 +02:00
Joakim Kilby
9cdc9c30d2 code cleanup and optimisation in the way threads are handled 2015-07-07 12:49:48 +02:00
Joakim Kilby
2a0787386e adding a forced time jump to trigger recomputation of trails when an init message is received 2015-07-07 08:21:10 +02:00
Joakim Kilby
987af4fb76 removing more obsolete functions 2015-07-06 18:55:49 +02:00
Joakim Kilby
8efbf8e3da removing LUA script from .inl file 2015-07-06 18:49:52 +02:00
Joakim Kilby
bf14a2bcc2 Merge branch 'feature/remote_redesign' of openspace.itn.liu.se:/openspace into feature/remote_redesign
* 'feature/remote_redesign' of openspace.itn.liu.se:/openspace:
  Fixing proper decoding of initialization messages
2015-07-06 18:49:21 +02:00
Joakim Kilby
b0eef21a2c removing obsolete functions and lua scripts 2015-07-06 18:49:17 +02:00
Joakim Kilby
07a3c6fb0c Fixing proper decoding of initialization messages 2015-07-06 18:44:47 +02:00
Joakim Kilby
36db7c37bf minor fix 2015-07-06 15:09:08 +02:00
Joakim Kilby
0550ffd0db recommit of previous fix 2015-07-06 15:06:48 +02:00
Joakim Kilby
f01278be60 test 2015-07-06 14:56:02 +02:00
Joakim Kilby
51bab14dcc adding initialization messages functionality 2015-07-06 14:06:54 +02:00
Joakim Kilby
e8809ac84c changes to syncing of scripts for properties 2015-07-06 11:28:15 +02:00
Joakim Kilby
34412b7a8b more work on communication protocol 2015-07-06 10:00:07 +02:00
Joakim Kilby
d76e18d9ee more work on scripting synchronization and state saving 2015-07-05 17:21:23 +02:00
Joakim Kilby
b53efe4f0e changed how time keyframes are used 2015-07-05 16:41:38 +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
a9824dabc1 Merge branch 'develop' into feature/remote 2015-07-03 16:18:59 +02:00
Joakim Kilby
8c2b5bb199 Tons of stability improvements to threading of parallel connection.
changed name of variables and functions to reflect more what they do.
removed obsolete functions.
parallel connection is no longer in contact with main thread unless to be deleted
2015-07-03 14:43:48 +02:00
Alexander Bock
304a328cde Let TimelineView handle multiple instances of Labelparser and HongkangParsers 2015-07-03 00:00:48 +02:00
Joakim Kilby
19af895752 changed it so parallel connection scripts are only run ont he master mode. 2015-07-02 17:28:04 +02:00
Joakim Kilby
2bd2270434 fixed compile issue on mac 2015-07-02 17:10:43 +02:00
Joakim Kilby
6f3b534969 minor bugfixes 2015-07-02 15:07:28 +02:00
Joakim Kilby
c11c0eb81f changed time scripts to not include "" in them.
moved thread deletion to prevent deadlock
2015-07-02 14:48:17 +02:00
Joakim Kilby
cb9bd514f6 added message type saying if initialisation is done and lua function + script
added current time and current delta time to initialisation scripts
2015-07-02 14:01:54 +02:00
Joakim Kilby
19c7022220 added current time sync 2015-07-02 12:25:44 +02:00
Alexander Bock
bae990babb Some work on making the TimelineGui work with the new hybrid parsers 2015-07-01 23:40:38 +02:00
Joakim Kilby
532e2b1004 even more fixes to thread safety, fixed an issue on Mac where logging kept going after connection was lost 2015-07-01 14:31:45 +02:00
Joakim Kilby
c9f3402cae moved assignment of variable 2015-07-01 14:23:46 +02:00
Joakim Kilby
ae877bbcb4 Merge branch 'feature/remote' of openspace.itn.liu.se:/openspace into feature/remote 2015-07-01 14:19:56 +02:00
Joakim Kilby
a89bce72cc Merge branch 'feature/remote' of openspace.itn.liu.se:/openspace into feature/remote
fixed decoding of init messages to include data size
2015-07-01 14:17:23 +02:00
Joakim Kilby
7159dd8246 further fixes to thread stability 2015-07-01 14:16:18 +02:00
Joakim Kilby
762e70f14b fixes to init message construction 2015-07-01 13:33:33 +02:00
Joakim Kilby
aea4a1ac0c added a receive thread. fixed a bug where threads tried to join/delete themselves 2015-07-01 12:17:20 +02:00
Joakim Kilby
6697eeb7b7 changes to how messages are sent 2015-07-01 10:18:45 +02:00
Joakim Kilby
d6cb939474 created a send que for messages and a thread to handle sending 2015-07-01 09:55:13 +02:00
Joakim Kilby
0b3552ea09 added initialization message encoding + sending and receiving + decoding 2015-06-30 09:23:25 +02:00
Joakim Kilby
06ca17326e fixed a bug where received sscripts sometimes got an extra character when converted from vector<char> to string 2015-06-26 11:15:14 +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
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
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
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
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
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