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

Update Ghoul and SGCT

Browse Source 
Adapt to changes by using more string_view
This commit is contained in:
Alexander Bock
2020-08-09 20:11:40 +02:00
parent 968080abc4
commit e3699a43a8
30 changed files with 235 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/openspace/interaction/websocketinputstate.h
View File

@@ -25,6 +25,8 @@
#ifndef __OPENSPACE_CORE___WEBSOCKETINPUTSTATE___H__
#define __OPENSPACE_CORE___WEBSOCKETINPUTSTATE___H__
#include <ghoul/misc/assert.h>
#include <ghoul/misc/exception.h>
#include <ghoul/misc/stringconversion.h>
#include <array>
#include <memory>
@@ -115,10 +117,25 @@ struct WebsocketInputStates : public std::unordered_map<size_t, WebsocketInputSt
namespace ghoul {
template <>
std::string to_string(const openspace::interaction::WebsocketAction& action);
inline std::string to_string(const openspace::interaction::WebsocketAction& action) {
switch (action) {
case openspace::interaction::WebsocketAction::Idle: return "Idle";
case openspace::interaction::WebsocketAction::Press: return "Press";
case openspace::interaction::WebsocketAction::Repeat: return "Repeat";
case openspace::interaction::WebsocketAction::Release: return "Release";
default: throw MissingCaseException();
}
}
template <>
openspace::interaction::WebsocketAction from_string(const std::string& str);
constexpr openspace::interaction::WebsocketAction from_string(std::string_view string) {
if (string == "Idle") { return openspace::interaction::WebsocketAction::Idle; }
if (string == "Press") { return openspace::interaction::WebsocketAction::Press; }
if (string == "Repeat") { return openspace::interaction::WebsocketAction::Repeat; }
if (string == "Release") { return openspace::interaction::WebsocketAction::Release; }
throw RuntimeError("Unknown action '" + std::string(string) + "'");
}
} // namespace ghoul