mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 08:58:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

removed a comment, changed name of script storing variable to something that makes more sense

Browse Source
This commit is contained in:
Joakim Kilby
2015-06-25 12:31:11 +02:00
parent 46757113fd
commit 22af992078
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/parallelconnection.cpp
View File

@@ -351,9 +351,9 @@ namespace openspace {
OsEng.scriptEngine()->queueScript(script);
//add script to all executed scripts
_sentScriptsMutex.lock();
_sentScripts.push_back(script);
_sentScriptsMutex.unlock();
_executedScriptsMutex.lock();
_executedScripts.push_back(script);
_executedScriptsMutex.unlock();
}
void ParallelConnection::decodeHostInfoMessage(){
@@ -545,9 +545,9 @@ namespace openspace {
}
void ParallelConnection::sendScript(const std::string script){
_sentScriptsMutex.lock();
_sentScripts.push_back(script);
_sentScriptsMutex.unlock();
_executedScriptsMutex.lock();
_executedScripts.push_back(script);
_executedScriptsMutex.unlock();
uint16_t msglen = static_cast<uint16_t>(script.length());
std::vector<char> buffer;

3
src/scripting/scriptengine.cpp
View File

@@ -155,7 +155,7 @@ bool ScriptEngine::runScript(const std::string& script) {
return false;
}
//if we're currently hosting the parallel session find out if script should be synchronized.
//if we're currently hosting the parallel session, find out if script should be synchronized.
if(OsEng.parallelConnection()->isHost()){
//"deconstruct the script to find library and function name
@@ -212,7 +212,6 @@ bool ScriptEngine::runScript(const std::string& script) {
//function was found!
if(funcit->name.compare(func) == 0){
//is the function of a type that should be shared via parallel connection?
//and are we currently hosting the session?
if(funcit->parallelShared ){
OsEng.parallelConnection()->sendScript(script);
}