EpicSparrow/SparrowInput
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed all uses or mentions or the SparrowSerializer

Browse Source
This commit is contained in:
Anselme 2018-05-13 20:36:07 +02:00
parent 4ea0189a36
commit 7705034bf9
3 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -12,7 +12,6 @@ set(EXEC_SRC_LIST src/main.cpp)
#set compilation option #set compilation option
set(IS_LIBRARY True) set(IS_LIBRARY True)
set(USE_IMGUI True) set(USE_IMGUI True)
set(USE_CEREAL True)
set(SFML_MODULES window system) set(SFML_MODULES window system)
set(CMAKE_TEMPLATE_PATH "../CMakeTemplate") set(CMAKE_TEMPLATE_PATH "../CMakeTemplate")

21
src/keybindings.cpp
View File

@ -5,27 +5,6 @@
#include "keybindings.h" #include "keybindings.h"
#include <iostream> #include <iostream>
//#define ACTION_PROPERTY_CODE AbstractProperty::NB_PROPERTY_TYPES + 1000
/* Function used for serialization of Action
*
*/
/*
template <> std::ostream& Property<Action>::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<Action>::saveAscii(std::ostream& os) { return os;}// << m_value; }
template <> std::istream& Property<Action>::loadBinary(std::istream& is) { return is.read((char*)&m_value, sizeof(Action)); }
template <> std::istream& Property<Action>::loadAscii(std::istream& is) { return is;}// >> m_value; }
template <> AbstractProperty::PropertyType Property<Action>::getStaticPropertyType() { return AbstractProperty::REFERENCE; }
*/
//INIT_SERIALIZABLE(Action)
//INIT_SERIALIZABLE(Binding)
/* Implementation of IKeysMap class /* Implementation of IKeysMap class
* @author: Thomas Brandého * @author: Thomas Brandého
* @info: This class register all the association between key and action. * @info: This class register all the association between key and action.

10
src/keybindings.h
View File

@ -7,8 +7,8 @@
#include <SFML/Window.hpp> #include <SFML/Window.hpp>
#include "SparrowSerializer/serializable.h"
#include <cereal/archives/json.hpp> #include <cereal/archives/json.hpp>
#include <cassert>
#include <unordered_map> #include <unordered_map>
@ -68,17 +68,13 @@ struct Action
struct Binding// : public Serializable struct Binding// : public Serializable
{ {
Action action; Action action;
// PROPERTY(Action,action)
int key; int key;
// P_INT(key)
int type; int type;
// P_INT(type)
Binding& operator=(const Binding newBinding); Binding& operator=(const Binding newBinding);
//SERIALIZABLE(Binding,CAST(action),CAST(key),CAST(type))
}; };
class IKeysMap// : public Serializable class IKeysMap
{ {
public: public:
enum {PRESSED, RELEASED, HOLD}; enum {PRESSED, RELEASED, HOLD};
@ -87,8 +83,6 @@ public:
std::vector<Binding>& data(){return keys;} std::vector<Binding>& data(){return keys;}
protected: protected:
std::vector<Binding> keys; std::vector<Binding> keys;
// P_VECTOR_(Binding, keys)
// SERIALIZABLE(IKeysMap,CAST(keys))
}; };
class Context { class Context {