mirror of
https://github.com/Relintai/rcpp_framework.git
synced 2025-02-20 15:14:26 +01:00
Implemented properties into Resource. I used the simplest implementation I could come up with. If they work well I will make them better.
This commit is contained in:
parent
af37189fcf
commit
c372eaa8cf
@ -1,10 +1,84 @@
|
|||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
#if DATABASES_ENABLED
|
#if DATABASES_ENABLED
|
||||||
#include "core/database/database.h"
|
#include "core/database/database.h"
|
||||||
#include "core/database/database_manager.h"
|
#include "core/database/database_manager.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
//For properties
|
||||||
|
|
||||||
|
typedef std::string String;
|
||||||
|
typedef std::vector<int> IntVector;
|
||||||
|
typedef std::vector<float> FloatVector;
|
||||||
|
typedef std::vector<std::string> StringVector;
|
||||||
|
typedef std::vector<bool> BoolVector;
|
||||||
|
typedef std::vector<Ref<Resource> > ResourceVector;
|
||||||
|
|
||||||
|
#define RESOURCE_PROPERTY_GET_IMPL(property_type, type_enum, default_value, func_name) \
|
||||||
|
ResourcePropertyBase *p = _property_map[property]; \
|
||||||
|
\
|
||||||
|
if (!p) { \
|
||||||
|
printf("ERROR Resource:: func_name property can't be found! %s\n", property.c_str()); \
|
||||||
|
\
|
||||||
|
return default_value; \
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
if (p->type != type_enum) { \
|
||||||
|
/*If this happens property binding code in this class is incorrect*/ \
|
||||||
|
printf("ERROR Resource:: func_name property's type is not property_type! %s\n", property.c_str()); \
|
||||||
|
\
|
||||||
|
return default_value; \
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
ResourceProperty<std::function<property_type(Resource *)>, std::function<void(Resource *, property_type)> > *pp = static_cast<ResourceProperty<std::function<property_type(Resource *)>, std::function<void(Resource *, property_type)> > *>(p); \
|
||||||
|
\
|
||||||
|
if (!pp) { \
|
||||||
|
printf("ERROR Resource:: func_name dynamic cast failed! %s\n", property.c_str()); \
|
||||||
|
\
|
||||||
|
return default_value; \
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
return pp->getter(this);
|
||||||
|
|
||||||
|
#define RESOURCE_PROPERTY_SET_IMPL(property_type, type_enum, func_name) \
|
||||||
|
ResourcePropertyBase *p = _property_map[property]; \
|
||||||
|
\
|
||||||
|
if (!p) { \
|
||||||
|
printf("ERROR Resource:: func_name property can't be found! %s\n", property.c_str()); \
|
||||||
|
\
|
||||||
|
return; \
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
if (p->type != type_enum) { \
|
||||||
|
/*If this happens property binding code in this class is incorrect*/ \
|
||||||
|
printf("ERROR Resource:: func_name property's type is not property_type! %s\n", property.c_str()); \
|
||||||
|
\
|
||||||
|
return; \
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
ResourceProperty<std::function<property_type(Resource *)>, std::function<void(Resource *, property_type)> > *pp = static_cast<ResourceProperty<std::function<property_type(Resource *)>, std::function<void(Resource *, property_type)> > *>(p); \
|
||||||
|
\
|
||||||
|
if (!pp) { \
|
||||||
|
printf("ERROR Resource:: func_name dynamic cast failed! %s\n", property.c_str()); \
|
||||||
|
\
|
||||||
|
return; \
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
return pp->setter(this, data);
|
||||||
|
|
||||||
|
#define RESOURCE_PROPERTY_ADD_IMPL(property_type, type_enum) \
|
||||||
|
ResourceProperty<std::function<property_type(Resource *)>, std::function<void(Resource *, property_type)> > *prop = new ResourceProperty<std::function<property_type(Resource *)>, std::function<void(Resource *, property_type)> >(); \
|
||||||
|
\
|
||||||
|
prop->type = type_enum; \
|
||||||
|
prop->getter = getter; \
|
||||||
|
prop->setter = setter; \
|
||||||
|
\
|
||||||
|
_property_map[name] = prop;
|
||||||
|
|
||||||
|
//Properties stuff end
|
||||||
|
|
||||||
int Resource::get_id() {
|
int Resource::get_id() {
|
||||||
return _id;
|
return _id;
|
||||||
}
|
}
|
||||||
@ -106,11 +180,125 @@ std::string Resource::to_json(rapidjson::Document *document) {
|
|||||||
void Resource::from_json(const std::string &data) {
|
void Resource::from_json(const std::string &data) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//properties
|
||||||
|
|
||||||
|
int Resource::get_int(const std::string &property) {
|
||||||
|
RESOURCE_PROPERTY_GET_IMPL(int, TYPE_INT, 0, get_int);
|
||||||
|
}
|
||||||
|
float Resource::get_float(const std::string &property) {
|
||||||
|
RESOURCE_PROPERTY_GET_IMPL(float, TYPE_FLOAT, 0, get_float);
|
||||||
|
}
|
||||||
|
std::string Resource::get_string(const std::string &property) {
|
||||||
|
RESOURCE_PROPERTY_GET_IMPL(String, TYPE_STRING, "", get_string);
|
||||||
|
}
|
||||||
|
bool Resource::get_bool(const std::string &property) {
|
||||||
|
RESOURCE_PROPERTY_GET_IMPL(bool, TYPE_BOOL, 0, get_bool);
|
||||||
|
}
|
||||||
|
Ref<Resource> Resource::get_resource(const std::string &property) {
|
||||||
|
RESOURCE_PROPERTY_GET_IMPL(Ref<Resource>, TYPE_RESOURCE, Ref<Resource>(), get_resource);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<int> Resource::get_int_vector(const std::string &property) {
|
||||||
|
RESOURCE_PROPERTY_GET_IMPL(IntVector, TYPE_VECTOR_INT, IntVector(), get_int_vector);
|
||||||
|
}
|
||||||
|
std::vector<float> Resource::get_float_vector(const std::string &property) {
|
||||||
|
RESOURCE_PROPERTY_GET_IMPL(FloatVector, TYPE_VECTOR_FLOAT, FloatVector(), get_float_vector);
|
||||||
|
}
|
||||||
|
std::vector<std::string> Resource::get_string_vector(const std::string &property) {
|
||||||
|
RESOURCE_PROPERTY_GET_IMPL(StringVector, TYPE_VECTOR_STRING, StringVector(), get_string_vector);
|
||||||
|
}
|
||||||
|
std::vector<bool> Resource::get_bool_vector(const std::string &property) {
|
||||||
|
RESOURCE_PROPERTY_GET_IMPL(BoolVector, TYPE_VECTOR_BOOL, BoolVector(), get_bool_vector);
|
||||||
|
}
|
||||||
|
std::vector<Ref<Resource> > Resource::get_resource_vector(const std::string &property) {
|
||||||
|
RESOURCE_PROPERTY_GET_IMPL(ResourceVector, TYPE_VECTOR_RESOURCE, ResourceVector(), get_resource_vector);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Resource::set_int(const std::string &property, const int data) {
|
||||||
|
RESOURCE_PROPERTY_SET_IMPL(int, TYPE_INT, set_int);
|
||||||
|
}
|
||||||
|
void Resource::set_float(const std::string &property, const float data) {
|
||||||
|
RESOURCE_PROPERTY_SET_IMPL(float, TYPE_FLOAT, get_float);
|
||||||
|
}
|
||||||
|
void Resource::set_string(const std::string &property, const std::string &data) {
|
||||||
|
RESOURCE_PROPERTY_SET_IMPL(String, TYPE_STRING, get_string);
|
||||||
|
}
|
||||||
|
void Resource::set_bool(const std::string &property, const bool data) {
|
||||||
|
RESOURCE_PROPERTY_SET_IMPL(bool, TYPE_BOOL, get_bool);
|
||||||
|
}
|
||||||
|
void Resource::set_resource(const std::string &property, const Ref<Resource> &data) {
|
||||||
|
RESOURCE_PROPERTY_SET_IMPL(Ref<Resource>, TYPE_RESOURCE, get_resource);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Resource::set_int_vector(const std::string &property, const std::vector<int> &data) {
|
||||||
|
RESOURCE_PROPERTY_SET_IMPL(IntVector, TYPE_VECTOR_INT, get_int_vector);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Resource::set_float_vector(const std::string &property, const std::vector<float> &data) {
|
||||||
|
RESOURCE_PROPERTY_SET_IMPL(FloatVector, TYPE_VECTOR_FLOAT, get_float_vector);
|
||||||
|
}
|
||||||
|
void Resource::set_string_vector(const std::string &property, const std::vector<std::string> &data) {
|
||||||
|
RESOURCE_PROPERTY_SET_IMPL(StringVector, TYPE_VECTOR_STRING, get_string_vector);
|
||||||
|
}
|
||||||
|
void Resource::set_bool_vector(const std::string &property, const std::vector<bool> &data) {
|
||||||
|
RESOURCE_PROPERTY_SET_IMPL(BoolVector, TYPE_VECTOR_BOOL, get_bool_vector);
|
||||||
|
}
|
||||||
|
void Resource::set_resource_vector(const std::string &property, const std::vector<Ref<Resource> > &data) {
|
||||||
|
RESOURCE_PROPERTY_SET_IMPL(ResourceVector, TYPE_VECTOR_RESOURCE, get_resource_vector);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Resource::add_property_int(const std::string &name, std::function<int(Resource *)> getter, std::function<void(Resource *, int)> setter, const int property_flags) {
|
||||||
|
RESOURCE_PROPERTY_ADD_IMPL(int, TYPE_INT);
|
||||||
|
}
|
||||||
|
void Resource::add_property_float(const std::string &name, std::function<float(Resource *)> getter, std::function<void(Resource *, float)> setter, const int property_flags) {
|
||||||
|
RESOURCE_PROPERTY_ADD_IMPL(float, TYPE_FLOAT);
|
||||||
|
}
|
||||||
|
void Resource::add_property_string(const std::string &name, std::function<std::string(Resource *)> getter, std::function<void(Resource *, std::string)> setter, const int property_flags) {
|
||||||
|
RESOURCE_PROPERTY_ADD_IMPL(String, TYPE_STRING);
|
||||||
|
}
|
||||||
|
void Resource::add_property_bool(const std::string &name, std::function<bool(Resource *)> getter, std::function<void(Resource *, bool)> setter, const int property_flags) {
|
||||||
|
RESOURCE_PROPERTY_ADD_IMPL(bool, TYPE_BOOL);
|
||||||
|
}
|
||||||
|
void Resource::add_property_resource(const std::string &name, std::function<Ref<Resource>(Resource *)> getter, std::function<void(Resource *, Ref<Resource>)> setter, const int property_flags) {
|
||||||
|
RESOURCE_PROPERTY_ADD_IMPL(Ref<Resource>, TYPE_RESOURCE);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Resource::add_property_int_vector(const std::string &name, std::function<std::vector<int>(Resource *)> getter, std::function<void(Resource *, std::vector<int>)> setter, const int property_flags) {
|
||||||
|
RESOURCE_PROPERTY_ADD_IMPL(IntVector, TYPE_VECTOR_INT);
|
||||||
|
}
|
||||||
|
void Resource::add_property_float_vector(const std::string &name, std::function<std::vector<float>(Resource *)> getter, std::function<void(Resource *, std::vector<float>)> setter, const int property_flags) {
|
||||||
|
RESOURCE_PROPERTY_ADD_IMPL(FloatVector, TYPE_VECTOR_FLOAT);
|
||||||
|
}
|
||||||
|
void Resource::add_property_string_vector(const std::string &name, std::function<std::vector<std::string>(Resource *)> getter, std::function<void(Resource *, std::vector<std::string>)> setter, const int property_flags) {
|
||||||
|
RESOURCE_PROPERTY_ADD_IMPL(StringVector, TYPE_VECTOR_STRING);
|
||||||
|
}
|
||||||
|
void Resource::add_property_bool_vector(const std::string &name, std::function<std::vector<bool>(Resource *)> getter, std::function<void(Resource *, std::vector<bool>)> setter, const int property_flags) {
|
||||||
|
RESOURCE_PROPERTY_ADD_IMPL(BoolVector, TYPE_VECTOR_BOOL);
|
||||||
|
}
|
||||||
|
void Resource::add_property_resource_vector(const std::string &name, std::function<std::vector<Ref<Resource> >(Resource *)> getter, std::function<void(Resource *, std::vector<Ref<Resource> >)> setter, const int property_flags) {
|
||||||
|
RESOURCE_PROPERTY_ADD_IMPL(ResourceVector, TYPE_VECTOR_RESOURCE);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Resource::register_properties() {
|
||||||
|
add_property_int("id", &Resource::get_id, &Resource::set_id);
|
||||||
|
}
|
||||||
|
|
||||||
Resource::Resource() {
|
Resource::Resource() {
|
||||||
_id = 0;
|
_id = 0;
|
||||||
_dirty = false;
|
_dirty = false;
|
||||||
_resource_name = get_class();
|
_resource_name = get_class();
|
||||||
|
|
||||||
|
register_properties();
|
||||||
}
|
}
|
||||||
|
|
||||||
Resource::~Resource() {
|
Resource::~Resource() {
|
||||||
|
std::map<std::string, ResourcePropertyBase *>::iterator it;
|
||||||
|
|
||||||
|
for (it = _property_map.begin(); it != _property_map.end(); it++) {
|
||||||
|
ResourcePropertyBase *p = it->second;
|
||||||
|
|
||||||
|
if (p) {
|
||||||
|
delete p;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -1,6 +1,8 @@
|
|||||||
#ifndef RESOURCE_H
|
#ifndef RESOURCE_H
|
||||||
#define RESOURCE_H
|
#define RESOURCE_H
|
||||||
|
|
||||||
|
#include <functional>
|
||||||
|
#include <map>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "libs/rapidjson/document.h"
|
#include "libs/rapidjson/document.h"
|
||||||
@ -13,6 +15,17 @@ class Database;
|
|||||||
class Resource : public Reference {
|
class Resource : public Reference {
|
||||||
RCPP_OBJECT(Resource, Reference);
|
RCPP_OBJECT(Resource, Reference);
|
||||||
|
|
||||||
|
public:
|
||||||
|
enum ResourcePropertyFlags {
|
||||||
|
PROPERTY_FLAG_NONE = 0,
|
||||||
|
PROPERTY_FLAG_SQL_EXCAPE = 1 << 0,
|
||||||
|
PROPERTY_FLAG_SANITIZE_HTML_SPECIAL_CHARS = 1 << 1,
|
||||||
|
PROPERTY_FLAG_DONT_SERIALIZE = 1 << 2,
|
||||||
|
|
||||||
|
PROPERTY_FLAG_USER_INPUT = PROPERTY_FLAG_SQL_EXCAPE,
|
||||||
|
PROPERTY_FLAG_VISIBLE_INPUT = PROPERTY_FLAG_SQL_EXCAPE | PROPERTY_FLAG_SANITIZE_HTML_SPECIAL_CHARS,
|
||||||
|
};
|
||||||
|
|
||||||
public:
|
public:
|
||||||
int get_id();
|
int get_id();
|
||||||
void set_id(const int value);
|
void set_id(const int value);
|
||||||
@ -51,11 +64,79 @@ public:
|
|||||||
std::string to_json(rapidjson::Document *document = nullptr);
|
std::string to_json(rapidjson::Document *document = nullptr);
|
||||||
void from_json(const std::string &data);
|
void from_json(const std::string &data);
|
||||||
|
|
||||||
//todo properties
|
//todo add a variant like class. (Or variant itself from godot.)
|
||||||
|
int get_int(const std::string &property);
|
||||||
|
float get_float(const std::string &property);
|
||||||
|
std::string get_string(const std::string &property);
|
||||||
|
bool get_bool(const std::string &property);
|
||||||
|
Ref<Resource> get_resource(const std::string &property);
|
||||||
|
|
||||||
|
std::vector<int> get_int_vector(const std::string &property);
|
||||||
|
std::vector<float> get_float_vector(const std::string &property);
|
||||||
|
std::vector<std::string> get_string_vector(const std::string &property);
|
||||||
|
std::vector<bool> get_bool_vector(const std::string &property);
|
||||||
|
std::vector<Ref<Resource> > get_resource_vector(const std::string &property);
|
||||||
|
|
||||||
|
void set_int(const std::string &property, const int data);
|
||||||
|
void set_float(const std::string &property, const float data);
|
||||||
|
void set_string(const std::string &property, const std::string &data);
|
||||||
|
void set_bool(const std::string &property, const bool data);
|
||||||
|
void set_resource(const std::string &property, const Ref<Resource> &data);
|
||||||
|
|
||||||
|
void set_int_vector(const std::string &property, const std::vector<int> &data);
|
||||||
|
void set_float_vector(const std::string &property, const std::vector<float> &data);
|
||||||
|
void set_string_vector(const std::string &property, const std::vector<std::string> &data);
|
||||||
|
void set_bool_vector(const std::string &property, const std::vector<bool> &data);
|
||||||
|
void set_resource_vector(const std::string &property, const std::vector<Ref<Resource> > &data);
|
||||||
|
|
||||||
|
void add_property_int(const std::string &name, std::function<int(Resource *)> getter, std::function<void(Resource *, int)> setter, const int property_flags = 0);
|
||||||
|
void add_property_float(const std::string &name, std::function<float(Resource *)> getter, std::function<void(Resource *, float)> setter, const int property_flags = 0);
|
||||||
|
void add_property_string(const std::string &name, std::function<std::string(Resource *)> getter, std::function<void(Resource *, std::string)> setter, const int property_flags = 0);
|
||||||
|
void add_property_bool(const std::string &name, std::function<bool(Resource *)> getter, std::function<void(Resource *, bool)> setter, const int property_flags = 0);
|
||||||
|
void add_property_resource(const std::string &name, std::function<Ref<Resource>(Resource *)> getter, std::function<void(Resource *, Ref<Resource>)> setter, const int property_flags = 0);
|
||||||
|
|
||||||
|
void add_property_int_vector(const std::string &name, std::function<std::vector<int>(Resource *)> getter, std::function<void(Resource *, std::vector<int>)> setter, const int property_flags = 0);
|
||||||
|
void add_property_float_vector(const std::string &name, std::function<std::vector<float>(Resource *)> getter, std::function<void(Resource *, std::vector<float>)> setter, const int property_flags = 0);
|
||||||
|
void add_property_string_vector(const std::string &name, std::function<std::vector<std::string>(Resource *)> getter, std::function<void(Resource *, std::vector<std::string>)> setter, const int property_flags = 0);
|
||||||
|
void add_property_bool_vector(const std::string &name, std::function<std::vector<bool>(Resource *)> getter, std::function<void(Resource *, std::vector<bool>)> setter, const int property_flags = 0);
|
||||||
|
void add_property_resource_vector(const std::string &name, std::function<std::vector<Ref<Resource> >(Resource *)> getter, std::function<void(Resource *, std::vector<Ref<Resource> >)> setter, const int property_flags = 0);
|
||||||
|
|
||||||
|
virtual void register_properties();
|
||||||
|
|
||||||
Resource();
|
Resource();
|
||||||
~Resource();
|
~Resource();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
enum ResourcePropertyType {
|
||||||
|
TYPE_NULL = 0,
|
||||||
|
TYPE_INT,
|
||||||
|
TYPE_FLOAT,
|
||||||
|
TYPE_STRING,
|
||||||
|
TYPE_BOOL,
|
||||||
|
TYPE_RESOURCE,
|
||||||
|
TYPE_VECTOR_INT,
|
||||||
|
TYPE_VECTOR_FLOAT,
|
||||||
|
TYPE_VECTOR_STRING,
|
||||||
|
TYPE_VECTOR_BOOL,
|
||||||
|
TYPE_VECTOR_RESOURCE,
|
||||||
|
};
|
||||||
|
|
||||||
|
struct ResourcePropertyBase {
|
||||||
|
ResourcePropertyType type;
|
||||||
|
|
||||||
|
ResourcePropertyBase() {
|
||||||
|
type = TYPE_NULL;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
template <class G, class S>
|
||||||
|
struct ResourceProperty : public ResourcePropertyBase {
|
||||||
|
G getter;
|
||||||
|
S setter;
|
||||||
|
};
|
||||||
|
|
||||||
|
std::map<std::string, ResourcePropertyBase *> _property_map;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int _id;
|
int _id;
|
||||||
bool _dirty;
|
bool _dirty;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user