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
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
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
91247d4ac9
added keyframe struct and functionality to broadcast keyframes
2015-06-17 08:39:34 +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
2d3ef442fb
adding parallelconnection
2015-06-16 13:56:34 +02:00
Alexander Bock
98024ca29d
Remove warnings
2015-05-24 00:09:52 +02:00
Alexander Bock
433d0ba3a6
Fixing CMake for Mac OS
2015-05-23 19:50:03 +02:00
Alexander Bock
a96a34575c
Fix initial message queueing by introducing a sleeping timer
2015-05-13 00:17:46 +02:00
Alexander Bock
b5846cc69b
Initiate thread sleeping after each initial message to not spam clients
2015-05-12 22:41:53 +02:00
Alexander Bock
b5aa86873a
Fix many warnings
2015-05-12 13:05:35 +02:00
