mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-26 06:49:09 -06: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

8
include/openspace/interaction/interactionhandler.h
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;

35
src/interaction/interactionhandler.cpp
View File

@@ -649,11 +649,19 @@ InteractionHandler::InteractionHandler()
_inputState = std::make_unique<InputState>();
// Inject the same mouse states to both orbital and global interaction mode
_mouseStates = std::make_unique<OrbitalInteractionMode::MouseStates>(0.002, 1);
_orbitalInteractionMode = std::make_shared<OrbitalInteractionMode>(_mouseStates);
_globebrowsingInteractionMode = std::make_shared<GlobeBrowsingInteractionMode>(_mouseStates);
_interactionModes.insert(
std::pair<std::string, std::shared_ptr<InteractionMode>>(
"OrbitalInteractionMode",
std::make_shared<OrbitalInteractionMode>(_mouseStates)
));
_interactionModes.insert(
std::pair<std::string, std::shared_ptr<InteractionMode>>(
"GlobeBrowsingInteractionMode",
std::make_shared<GlobeBrowsingInteractionMode>(_mouseStates)
));
// Set the interactionMode
_currentInteractionMode = _orbitalInteractionMode;
_currentInteractionMode = _interactionModes["OrbitalInteractionMode"];
// Define lambda functions for changed properties
_rotationalFriction.onChange([&]() {
@@ -735,14 +743,19 @@ void InteractionHandler::setInteractionMode(std::shared_ptr<InteractionMode> int
_currentInteractionMode->setFocusNode(focusNode);
}
void InteractionHandler::setInteractionModeToOrbital() {
setInteractionMode(_orbitalInteractionMode);
LINFO("Interaction mode set to 'OrbitalInteractionMode'");
}
void InteractionHandler::setInteractionModeToGlobeBrowsing() {
setInteractionMode(_globebrowsingInteractionMode);
LINFO("Interaction mode set to 'GlobeBrowsingInteractionMode'");
void InteractionHandler::setInteractionMode(const std::string& interactionModeKey) {
if (_interactionModes.find(interactionModeKey) != _interactionModes.end()) {
setInteractionMode(_interactionModes[interactionModeKey]);
LINFO("Interaction mode set to '" << interactionModeKey << "'");
}
else {
std::string listInteractionModes("");
for (auto pair : _interactionModes) {
listInteractionModes += "'" + pair.first + "', ";
}
LWARNING("'" << interactionModeKey <<
"' is not a valid interaction mode. Candidates are " << listInteractionModes);
}
}
void InteractionHandler::lockControls() {

18
src/interaction/interactionhandler_lua.inl
View File

@@ -124,24 +124,12 @@ int setInteractionMode(lua_State* L) {
return luaL_error(L, "Expected %i arguments, got %i", 1, nArguments);
std::string interactionModeName = luaL_checkstring(L, -1);
std::string interactionModeKey = luaL_checkstring(L, -1);
if (interactionModeName.empty())
if (interactionModeKey.empty())
return luaL_error(L, "interactionmode name string is empty");
if (interactionModeName == "OrbitalInteractionMode") {
OsEng.interactionHandler().setInteractionModeToOrbital();
}
else if (interactionModeName == "GlobeBrowsingInteractionMode") {
#ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
OsEng.interactionHandler().setInteractionModeToGlobeBrowsing();
#else
return luaL_error(L, "OpenSpace compiled without support for GlobeBrowsing");
#endif
}
else { // Default
return luaL_error(L, "Unknown interaction mode. default is 'OrbitalInteractionMode'");
}
OsEng.interactionHandler().setInteractionMode(interactionModeKey);
return 0;
}