mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-09 13:14:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rearranged profile initializations and verified that all init correctly

Browse Source
This commit is contained in:
GPayne
2021-09-12 21:05:00 -06:00
parent 284c68f952
commit 51f6c9d45b
17 changed files with 231 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/interaction/actionmanager.cpp
View File

@@ -24,7 +24,6 @@
#include <openspace/interaction/actionmanager.h>
#include <openspace/scene/profile.h>
#include <openspace/scripting/lualibrary.h>
#include <openspace/scripting/scriptengine.h>
#include <ghoul/logging/logmanager.h>
@@ -104,37 +103,6 @@ void ActionManager::triggerAction(const std::string& identifier,
}
}
void ActionManager::setFromProfile_actions(const Profile& p)
{
for (Profile::Action a : p.actions) {
if (a.identifier.empty()) {
LERROR("Identifier must to provided to register action");
}
if (hasAction(a.identifier)) {
LERROR(fmt::format("Action for identifier '{}' already existed & registered",
a.identifier));
}
if (a.script.empty()) {
LERROR(fmt::format("Identifier '{}' doesn't provide a Lua command to execute",
a.identifier));
}
interaction::Action action;
action.identifier = a.identifier;
action.command = a.script;
if (!a.name.empty()) {
action.name = a.name;
}
if (!a.documentation.empty()) {
action.documentation = a.documentation;
}
if (!a.guiPath.empty()) {
action.guiPath = a.guiPath;
}
action.synchronization = interaction::Action::IsSynchronized(a.isLocal);
registerAction(std::move(action));
}
}
scripting::LuaLibrary ActionManager::luaLibrary() {
return {
"action",

17
src/interaction/keybindingmanager.cpp
View File

@@ -142,23 +142,6 @@ std::string KeybindingManager::generateJson() const {
return json.str();
}
void KeybindingManager::setFromProfile_keybindings(const Profile& p)
{
for (Profile::Keybinding k : p.keybindings) {
if (k.action.empty()) {
LERROR("Action must not be empty");
}
if (!global::actionManager->hasAction(k.action)) {
LERROR(fmt::format("Action '{}' does not exist", k.action));
}
if (k.key.key == openspace::Key::Unknown) {
LERROR(fmt::format("Could not find key '{}'",
std::to_string(static_cast<uint16_t>(k.key.key))));
}
bindKey(k.key.key, k.key.modifier, k.action);
}
}
scripting::LuaLibrary KeybindingManager::luaLibrary() {
return {
"",