a9824dabc1
Merge branch 'develop' into feature/remote
2015-07-03 16:18:59 +02:00
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
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
bae990babb
Some work on making the TimelineGui work with the new hybrid parsers
2015-07-01 23:40:38 +02:00
2188fc1809
Merge branch 'develop' into feature/remote
...
* develop: (72 commits)
Disable blackout on startup
Fixed path bug
Remove the rendering method override
Fix crash that happens when SpiceManager is deinitialized
Adding convenient scripts for showing 67P and changing coordinate system to 67P
Adding hybrid read method for Pluto Cleanups + logical changes to parsing and sequencing
Adding the possibility to project to arbitrary bodies model files
Adding support for imageplanes for multiple instruments
Fixing bug in model magnification
Made destination optional in data specifications
Renamed OpenSpaceModule's initialize method to create Created new initialize method that gets called in OpenSpaceEngine initialize
Remove setName function from OpenSpaceModule and move naming into constructor
Always build libtorrent as a static library
Set Launcher as default application Don't copy curl.dll on non-windows system
Correct CURL cmake specification
Add the FindCurl module from CMake into the support directory
Fix method renaming error in volume module
Updated data folder reference
Make SpiceManager derive from Singleton
Allow left-aligned and right-aligned messages in Launcher
...
Conflicts:
modules/kameleon/CMakeLists.txt
openspace.cfg
src/engine/openspaceengine.cpp
2015-07-01 14:38:33 +02:00
7159dd8246
further fixes to thread stability
2015-07-01 14:16:18 +02:00
aea4a1ac0c
added a receive thread. fixed a bug where threads tried to join/delete themselves
2015-07-01 12:17:20 +02:00
d6cb939474
created a send que for messages and a thread to handle sending
2015-07-01 09:55:13 +02:00
2bde14b728
Fix crash that happens when SpiceManager is deinitialized
2015-06-26 19:20:56 +02:00
8cc1498b57
made functions for script sharing public for now, temporary fix
2015-06-26 13:54:00 +02:00
42dbf6a6a1
moved script parsing for library/function names into a separate function
2015-06-26 10:42:35 +02:00
4fb40ceeb9
also changed name of scripts variable in header file....
2015-06-26 09:23:30 +02:00
2cd827a4fd
added method to clear keyframes and call to that method when hostship is switched
2015-06-25 11:28:18 +02:00
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
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
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
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
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
b6bd205304
Added init request handling for non-hosts
...
osparallelconnection is no longer a property owner
2015-06-23 11:33:20 +02:00
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
b2b7563018
added functionality to send and decode scripts
2015-06-23 09:33:09 +02:00
5227ce2213
Renamed OpenSpaceModule's initialize method to create
...
Created new initialize method that gets called in OpenSpaceEngine initialize
2015-06-22 23:09:19 +02:00
978b535a2f
Remove setName function from OpenSpaceModule and move naming into constructor
2015-06-22 22:57:15 +02:00
1906c525e3
Make SpiceManager derive from Singleton
2015-06-22 16:01:23 +02:00
df1da946cf
Merge remote-tracking branch 'origin/feature/abuffer' into feature/downloadmanager
...
Conflicts:
include/openspace/abuffer/abufferframebuffer.h
src/abuffer/abuffer.cpp
2015-06-22 13:43:57 +02:00
4d6663f824
Add a time-remaining counter to Launcher
2015-06-18 22:46:24 +02:00
7401b7d48b
Enable FrameBuffer-based rendering on Windows
2015-06-18 15:42:41 +02:00
f58d6d91b5
Enable setting the capabilities verbosity using the configuration file
2015-06-18 14:29:34 +02:00
b723751c1b
added functionality to disconnect and request hostship via LUA.
...
fixed bug in threading
2015-06-18 09:10:15 +02:00
e42d160773
added interpolation and mutex protection
...
changed TCP protocol to no delay
2015-06-17 15:11:34 +02:00
8297f2e683
First test of actual remote controlling
2015-06-17 13:10:19 +02:00
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
9d6b9a3ad1
adding first version of keyframe functionality for interactionhandler
2015-06-17 09:52:12 +02:00
74ab05ec37
rename of mutex
2015-06-17 08:39:49 +02:00
91247d4ac9
added keyframe struct and functionality to broadcast keyframes
2015-06-17 08:39:34 +02:00
cce351af69
removed all references to remotecontroller
2015-06-17 08:39:02 +02:00
f35ec6f8d4
Removed remotecontroller class
2015-06-17 08:38:25 +02:00
54186e5dcb
Fix layout issues
2015-06-17 01:43:01 +02:00
850d9d3789
Multithreading the downloadrequests
2015-06-17 01:02:07 +02:00
8da76f6d1e
added message specific decoding functions
2015-06-16 16:37:07 +02:00
8f05d64316
added lua scripting functionality and fixed authentication to server
2015-06-16 15:45:00 +02:00
2d3ef442fb
adding parallelconnection
2015-06-16 13:56:34 +02:00
2122369d92
Enable to abort downloads
2015-06-16 02:58:16 +02:00
886c8d2da6
Reenable bootstrapping of torrent DHTs
...
Enable setting of overwrite settings for download files
2015-06-15 19:58:23 +02:00
5967063754
More file cleanups
2015-06-15 19:37:06 +02:00
13bee28974
Enable multi-threaded download support for filerequests
2015-06-15 02:41:27 +02:00
0a233eb6bc
More work on correct displaying status of single download files
2015-06-15 02:25:54 +02:00
fb7f49a6bb
Making single file download fully (and correctly) multithreaded
2015-06-15 02:05:56 +02:00
0a02906d8e
More restructuring
2015-06-15 00:37:48 +02:00
61934f824b
Merge branch 'develop' into feature/remote
2015-06-12 10:47:41 +02:00
Joakim Kilby