mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-29 23:39:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

One Property Tree (#500)

Browse Source 
* Organize properties in one single property tree
* Update scenes to work with one property tree. Fix documentation issues.
This commit is contained in:
Emil Axelsson
2018-03-06 16:59:06 +01:00
committed by GitHub
parent ebd69d1333
commit 4675554471
53 changed files with 527 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/interaction/keybindingmanager.cpp
+2 -11
View File
@@ -159,7 +159,7 @@ std::string KeyBindingManager::generateJson() const {
first = false;
json << "{";
json << "\"key\": \"" << std::to_string(p.first) << "\",";
json << "\"script\": \"" << p.second.command << "\",";
json << "\"script\": \"" << escapedJson(p.second.command) << "\",";
json << "\"remoteScripting\": "
<< (p.second.synchronization ? "true," : "false,");
json << "\"documentation\": \"" << escapedJson(p.second.documentation) << "\"";
@@ -167,16 +167,7 @@ std::string KeyBindingManager::generateJson() const {
}
json << "]";
std::string jsonString = "";
for (const char& c : json.str()) {
if (c == '\'') {
jsonString += "\\'";
} else {
jsonString += c;
}
}
return jsonString;
return json.str();
}
scripting::LuaLibrary KeyBindingManager::luaLibrary() {