mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Store interaction modes in interaction handler in a std::map

Browse Source
This commit is contained in:
Kalle
2016-07-01 13:13:31 -04:00
parent 3c7d1e22fc
commit fc53905131
3 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/interaction/interactionhandler.h
+4 -4
View File
@@ -161,8 +161,7 @@ public:
// Interaction mode setters
void setCameraStateFromDictionary(const ghoul::Dictionary& cameraDict);
void setInteractionModeToOrbital();
void setInteractionModeToGlobeBrowsing();
void setInteractionMode(const std::string& interactionModeKey);
void resetKeyBindings();
@@ -211,9 +210,10 @@ private:
std::shared_ptr<InteractionMode> _currentInteractionMode;
std::map<std::string, std::shared_ptr<InteractionMode>> _interactionModes;
std::shared_ptr<OrbitalInteractionMode::MouseStates> _mouseStates;
std::shared_ptr<OrbitalInteractionMode> _orbitalInteractionMode;
std::shared_ptr<GlobeBrowsingInteractionMode> _globebrowsingInteractionMode;
//std::shared_ptr<OrbitalInteractionMode> _orbitalInteractionMode;
//std::shared_ptr<GlobeBrowsingInteractionMode> _globebrowsingInteractionMode;
// Properties
properties::StringProperty _origin;