304a328cde
Let TimelineView handle multiple instances of Labelparser and HongkangParsers
2015-07-03 00:00:48 +02:00
19af895752
changed it so parallel connection scripts are only run ont he master mode.
2015-07-02 17:28:04 +02:00
2bd2270434
fixed compile issue on mac
2015-07-02 17:10:43 +02:00
6f3b534969
minor bugfixes
2015-07-02 15:07:28 +02:00
c11c0eb81f
changed time scripts to not include "" in them.
...
moved thread deletion to prevent deadlock
2015-07-02 14:48:17 +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
19c7022220
added current time sync
2015-07-02 12:25:44 +02:00
a7a86c06b5
Merge branch 'develop' into feature/remote
2015-07-02 10:12:30 +02:00
bae990babb
Some work on making the TimelineGui work with the new hybrid parsers
2015-07-01 23:40:38 +02:00
cc5e6074ad
Rename imagesequencer2 to imagesequencer
2015-07-01 22:03:52 +02:00
bacdc1abbb
Merge branch 'develop' into feature/remote
2015-07-01 16:19:11 +02:00
86fc74770b
Fixing issues that occurred with newer nVidia drivers and ABuffer rendering
2015-07-01 16:17:51 +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
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
c9f3402cae
moved assignment of variable
2015-07-01 14:23:46 +02:00
ae877bbcb4
Merge branch 'feature/remote' of openspace.itn.liu.se:/openspace into feature/remote
2015-07-01 14:19:56 +02:00
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
7159dd8246
further fixes to thread stability
2015-07-01 14:16:18 +02:00
762e70f14b
fixes to init message construction
2015-07-01 13:33:33 +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
6697eeb7b7
changes to how messages are sent
2015-07-01 10:18:45 +02:00
d6cb939474
created a send que for messages and a thread to handle sending
2015-07-01 09:55:13 +02:00
0b3552ea09
added initialization message encoding + sending and receiving + decoding
2015-06-30 09:23:25 +02:00
cafd89e9fa
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
...
Conflicts:
scripts/default_startup.lua
2015-06-29 16:40:09 -04:00
d102a16a82
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
...
modules/newhorizons/rendering/renderableplanetprojection.cpp
modules/newhorizons/util/hongkangparser.cpp
modules/newhorizons/util/hongkangparser.h
modules/newhorizons/util/imagesequencer2.cpp
modules/newhorizons/util/labelparser.cpp
modules/newhorizons/util/labelparser.h
2015-06-29 16:39:09 -04:00
4abb7f210b
Disable blackout on startup
2015-06-29 16:18:17 +02:00
0d0c963bce
Fixed path bug
2015-06-27 15:00:55 -04:00
9afc4b73ac
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2015-06-26 16:51:20 -04:00
2bde14b728
Fix crash that happens when SpiceManager is deinitialized
2015-06-26 19:20:56 +02:00
6057019d20
added proper return value to cachedScripts function
2015-06-26 14:06:20 +02:00
c1cf5f4581
added temporary functionality to be able to ensure that startup scripts are also synchronised over parallel connection if they should be.
2015-06-26 13:55:02 +02:00
8cc1498b57
made functions for script sharing public for now, temporary fix
2015-06-26 13:54:00 +02:00
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
42dbf6a6a1
moved script parsing for library/function names into a separate function
2015-06-26 10:42:35 +02:00
2529d4c4d6
added definitions of which scripts should be shared over parallel connection
2015-06-26 09:37:51 +02:00
bbca384a9c
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
2015-06-25 20:29:27 -04:00
8fbd027a1e
Adding convenient scripts for showing 67P and changing coordinate system to 67P
2015-06-25 20:28:36 -04:00
e0ea622989
Adding hybrid read method for Pluto
...
Cleanups + logical changes to parsing and sequencing
2015-06-25 20:19:08 -04:00
22af992078
removed a comment, changed name of script storing variable to something that makes more sense
2015-06-25 12:31:11 +02:00
46757113fd
removed debug printf
2015-06-25 12:28:17 +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
80df2a0abd
added decoding of requester ID in init request message
2015-06-25 11:19:48 +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
77ecdcec74
removed call to sendScript from script engine.
...
Not all scripts should be synchronised
2015-06-24 18:00:55 +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
77720b6985
Merge branch 'feature/remote' of openspace.itn.liu.se:/openspace into feature/remote
2015-06-23 10:21:21 +02:00
Alexander Bock