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

Update new ghoul string conversions

Browse Source
This commit is contained in:
Matthew Territo
2018-07-31 15:37:09 -06:00
parent aa6854a829
commit c23053aede
4 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/interaction/websocketcamerastates.h
+4 -7
View File
@@ -29,7 +29,7 @@
#include <openspace/interaction/websocketinputstate.h>
#include <ghoul/misc/boolean.h>
#include <ghoul/misc/fromstring.h>
#include <ghoul/misc/stringconversion.h>
#include <map>
#include <vector>
@@ -103,14 +103,11 @@ private:
} // namespace openspace::interaction
namespace std {
std::string to_string(const openspace::interaction::WebsocketCameraStates::AxisType& type);
} // namespace std
namespace ghoul {
template <>
std::string to_string(const openspace::interaction::WebsocketCameraStates::AxisType& type);
template <>
openspace::interaction::WebsocketCameraStates::AxisType
from_string(const std::string& string);
include/openspace/interaction/websocketinputstate.h
+4 -7
View File
@@ -25,7 +25,7 @@
#ifndef __OPENSPACE_CORE___WEBSOCKETINPUTSTATE___H__
#define __OPENSPACE_CORE___WEBSOCKETINPUTSTATE___H__
#include <ghoul/misc/fromstring.h>
#include <ghoul/misc/stringconversion.h>
#include <array>
#include <memory>
#include <unordered_map>
@@ -112,14 +112,11 @@ struct WebsocketInputStates : public std::unordered_map<size_t, WebsocketInputSt
} // namespace openspace::interaction
namespace std {
std::string to_string(openspace::interaction::WebsocketAction action);
} // namespace std
namespace ghoul {
template <>
std::string to_string(const openspace::interaction::WebsocketAction& action);
template <>
openspace::interaction::WebsocketAction from_string(const std::string& str);