diff --git a/CMakeLists.txt b/CMakeLists.txt index c23990f..e3ee115 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,6 @@ set(EXEC_SRC_LIST src/main.cpp) #set compilation option set(IS_LIBRARY True) set(USE_IMGUI True) -set(USE_CEREAL True) set(SFML_MODULES window system) set(CMAKE_TEMPLATE_PATH "../CMakeTemplate") diff --git a/src/keybindings.cpp b/src/keybindings.cpp index 7b25e85..077161f 100644 --- a/src/keybindings.cpp +++ b/src/keybindings.cpp @@ -5,27 +5,6 @@ #include "keybindings.h" #include -//#define ACTION_PROPERTY_CODE AbstractProperty::NB_PROPERTY_TYPES + 1000 - -/* Function used for serialization of Action - * - */ -/* -template <> std::ostream& Property::saveBinary(std::ostream& os) -{ - return os.write((char*)&m_value.action, sizeof(Action)); -// return os.write((char*)&m_value.source, sizeof(int)); -// return os.write((char*)&m_value.controller_id, sizeof(int)); -} -template <> std::ostream& Property::saveAscii(std::ostream& os) { return os;}// << m_value; } -template <> std::istream& Property::loadBinary(std::istream& is) { return is.read((char*)&m_value, sizeof(Action)); } -template <> std::istream& Property::loadAscii(std::istream& is) { return is;}// >> m_value; } -template <> AbstractProperty::PropertyType Property::getStaticPropertyType() { return AbstractProperty::REFERENCE; } - -*/ -//INIT_SERIALIZABLE(Action) -//INIT_SERIALIZABLE(Binding) - /* Implementation of IKeysMap class * @author: Thomas Brandého * @info: This class register all the association between key and action. diff --git a/src/keybindings.h b/src/keybindings.h index 732506c..d3799a3 100644 --- a/src/keybindings.h +++ b/src/keybindings.h @@ -7,8 +7,8 @@ #include -#include "SparrowSerializer/serializable.h" #include +#include #include @@ -68,17 +68,13 @@ struct Action struct Binding// : public Serializable { Action action; -// PROPERTY(Action,action) int key; -// P_INT(key) int type; -// P_INT(type) Binding& operator=(const Binding newBinding); - //SERIALIZABLE(Binding,CAST(action),CAST(key),CAST(type)) }; -class IKeysMap// : public Serializable +class IKeysMap { public: enum {PRESSED, RELEASED, HOLD}; @@ -87,8 +83,6 @@ public: std::vector& data(){return keys;} protected: std::vector keys; -// P_VECTOR_(Binding, keys) -// SERIALIZABLE(IKeysMap,CAST(keys)) }; class Context {