mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge with develop and solve conflicts.

Browse Source
This commit is contained in:
Kalle Bladin
2016-07-18 17:26:30 -04:00
parent 6691dab91e a244defdbc
commit 541fbba322
62 changed files with 754 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/openspace/interaction/interactionhandler.h
View File

@@ -92,7 +92,7 @@ public:
* \return The Lua library that contains all Lua functions available to affect the
* interaction
*/
static scripting::ScriptEngine::LuaLibrary luaLibrary();
static scripting::LuaLibrary luaLibrary();
// Callback functions
@@ -108,6 +108,7 @@ public:
void distanceDelta(const PowerScaledScalar& distance, size_t iterations = 0);
void lookAt(const glm::quat& rotation);
void setRotation(const glm::quat& rotation);
private:
// Remove copy and move constructors
@@ -187,7 +188,7 @@ public:
* \return The Lua library that contains all Lua functions available to affect the
* interaction
*/
static scripting::ScriptEngine::LuaLibrary luaLibrary();
static scripting::LuaLibrary luaLibrary();
// Callback functions
void keyboardCallback(Key key, KeyModifier modifier, KeyAction action);
@@ -197,6 +198,7 @@ public:
void saveCameraStateToFile(const std::string& filepath);
void restoreCameraStateFromFile(const std::string& filepath);
void writeKeyboardDocumentation(const std::string& type, const std::string& file);
private:
void setInteractionMode(std::shared_ptr<InteractionMode> interactionMode);