mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-02 08:49:20 -05:00
Simplify Property code (#1575)
* Remove the PropertyDelegate * Remove some unused and redundant property types * Use helper functions for Lua/Json conversion * Solve a bug in SelectionProperty that occurred when re-setting options * General simplification and refactoring of the code
This commit is contained in:
@@ -27,6 +27,7 @@
|
||||
#include <openspace/engine/globals.h>
|
||||
#include <openspace/scripting/lualibrary.h>
|
||||
#include <openspace/scripting/scriptengine.h>
|
||||
#include <openspace/util/json_helper.h>
|
||||
#include <ghoul/misc/profiling.h>
|
||||
#include <ghoul/glm.h>
|
||||
#include <sstream>
|
||||
@@ -195,7 +196,8 @@ std::string KeybindingManager::generateJson() const {
|
||||
json << R"("script": ")" << escapedJson(p.second.command) << "\",";
|
||||
json << R"("remoteScripting": )"
|
||||
<< (p.second.synchronization ? "true," : "false,");
|
||||
json << R"("documentation": ")" << escapedJson(p.second.documentation) << "\",";
|
||||
json << R"("documentation": ")"
|
||||
<< escapedJson(p.second.documentation) << "\",";
|
||||
json << R"("name": ")" << escapedJson(p.second.name) << "\"";
|
||||
json << "}";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user