Rearranged profile initializations and verified that all init correctly

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
@@ -26,7 +26,6 @@
#define __OPENSPACE_CORE___ACTIONMANAGER___H__
#include <openspace/interaction/action.h>
#include <openspace/scene/profile.h>
#include <unordered_map>
namespace ghoul { class Dictionary; }
@@ -44,12 +43,6 @@ public:
void triggerAction(const std::string& identifier,
const ghoul::Dictionary& arguments) const;
/**
* Registers actions from the contents of a profile.
*
* \param p The Profile to be read.
*/
void setFromProfile_actions(const Profile& p);
static scripting::LuaLibrary luaLibrary();
private:
@@ -27,7 +27,6 @@
#include <openspace/documentation/documentationgenerator.h>
#include <openspace/scene/profile.h>
#include <openspace/util/keys.h>
namespace openspace {
@@ -52,13 +51,6 @@ public:
std::vector<std::pair<KeyWithModifier, std::string>> keyBinding(
const KeyWithModifier& key) const;
/**
* Registers keybindings from the contents of a profile.
*
* \param p The Profile to be read.
*/
void setFromProfile_keybindings(const Profile& p);
static scripting::LuaLibrary luaLibrary();
void keyboardCallback(Key key, KeyModifier modifier, KeyAction action);