add src/ikarus subdir and make names unique for objects per scope
Signed-off-by: Folling <mail@folling.io>
This commit is contained in:
parent
ced123b628
commit
9f943cc6a2
51 changed files with 590 additions and 735 deletions
|
|
@ -1,13 +1,13 @@
|
|||
#include "ikarus/errors.h"
|
||||
|
||||
#include "cppbase/functional.hpp"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <ranges>
|
||||
|
||||
#include <fmt/format.h>
|
||||
|
||||
#include <cppbase/functional.hpp>
|
||||
|
||||
char const * get_error_info_name(IkarusErrorInfo info) {
|
||||
switch (info) {
|
||||
case IkarusErrorInfo_None: return "None";
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
#include <ikarus/objects/object_type.h>
|
||||
|
||||
constexpr uint64_t IKARUS_ID_OBJECT_TYPE_BITS = 8;
|
||||
constexpr uint64_t IKARUS_ID_OBJECT_RANDOM_BITS = sizeof(IkarusId) * 8 - IKARUS_ID_OBJECT_TYPE_BITS;
|
||||
constexpr uint64_t IKARUS_ID_OBJECT_RANDOM_BITS = sizeof(IkarusId) - IKARUS_ID_OBJECT_TYPE_BITS;
|
||||
|
||||
auto ikarus_id_from_data_and_type(int64_t data, IkarusObjectType type) -> IkarusId {
|
||||
return data | (static_cast<IkarusId>(type) << IKARUS_ID_OBJECT_RANDOM_BITS);
|
||||
|
|
@ -1,24 +1,23 @@
|
|||
#include "ikarus/objects/blueprint.h"
|
||||
|
||||
#include "ikarus/objects/properties/property.h"
|
||||
#include "objects/blueprint.hpp"
|
||||
|
||||
#include <cppbase/logger.hpp>
|
||||
#include <cppbase/result.hpp>
|
||||
#include <cppbase/strings.hpp>
|
||||
|
||||
#include <errors.hpp>
|
||||
#include <objects/entity.hpp>
|
||||
#include <objects/properties/property.hpp>
|
||||
#include <persistence/project.hpp>
|
||||
#include <ikarus/errors.hpp>
|
||||
#include <ikarus/objects/blueprint.hpp>
|
||||
#include <ikarus/objects/entity.hpp>
|
||||
#include <ikarus/objects/properties/property.h>
|
||||
#include <ikarus/objects/properties/property.hpp>
|
||||
#include <ikarus/objects/util.hpp>
|
||||
#include <ikarus/persistence/project.hpp>
|
||||
|
||||
IkarusBlueprint::IkarusBlueprint(IkarusProject * project, IkarusId id):
|
||||
IkarusObject{project, id} {}
|
||||
|
||||
IkarusBlueprint * ikarus_blueprint_create(struct IkarusProject * project, char const * name, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(project, nullptr);
|
||||
IKARUS_FAIL_IF_NULL(name, nullptr);
|
||||
IKARUS_FAIL_IF(cppbase::is_empty_or_blank(name), nullptr, "name must not be empty", IkarusErrorInfo_Client_InvalidInput);
|
||||
IKARUS_FAIL_IF_NAME_INVALID(name, project, nullptr, nullptr);
|
||||
|
||||
IKARUS_VTRYRV_OR_FAIL(
|
||||
IkarusId const id,
|
||||
|
|
@ -50,6 +49,18 @@ void ikarus_blueprint_delete(IkarusBlueprint * blueprint, IkarusErrorData * erro
|
|||
blueprint->project->uncache(blueprint);
|
||||
}
|
||||
|
||||
IkarusProject * ikarus_blueprint_get_project(IkarusBlueprint const * blueprint, IkarusErrorData * error_out) {
|
||||
return ikarus::util::object_get_project(blueprint, error_out);
|
||||
}
|
||||
|
||||
char const * ikarus_blueprint_get_name(IkarusBlueprint const * blueprint, IkarusErrorData * error_out) {
|
||||
return ikarus::util::object_get_name(blueprint, error_out);
|
||||
}
|
||||
|
||||
void ikarus_blueprint_set_name(IkarusBlueprint * blueprint, char const * name, IkarusErrorData * error_out) {
|
||||
ikarus::util::object_set_name(blueprint, name, error_out);
|
||||
}
|
||||
|
||||
void ikarus_blueprint_get_properties(
|
||||
IkarusBlueprint const * blueprint,
|
||||
struct IkarusProperty ** properties_out,
|
||||
|
|
@ -147,17 +158,3 @@ size_t ikarus_blueprint_get_linked_entity_count(IkarusBlueprint const * blueprin
|
|||
|
||||
return ret;
|
||||
}
|
||||
|
||||
// No existence checks here for performance reasons. All methods on IkarusObject perform this check anyway.
|
||||
|
||||
IkarusObject * ikarus_blueprint_to_object(IkarusBlueprint * blueprint, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(blueprint, nullptr);
|
||||
|
||||
return static_cast<IkarusObject *>(blueprint);
|
||||
}
|
||||
|
||||
IkarusObject const * ikarus_blueprint_to_object_const(IkarusBlueprint const * blueprint, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(blueprint, nullptr);
|
||||
|
||||
return static_cast<IkarusObject const *>(blueprint);
|
||||
}
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
#pragma once
|
||||
|
||||
#include <objects/object.hpp>
|
||||
#include <ikarus/objects/object.hpp>
|
||||
|
||||
struct IkarusBlueprint : IkarusObject {
|
||||
public:
|
||||
IkarusBlueprint(struct IkarusProject * project, IkarusId id);
|
||||
|
||||
IkarusBlueprint(IkarusBlueprint const &) = default;
|
||||
|
|
@ -12,4 +13,9 @@ struct IkarusBlueprint : IkarusObject {
|
|||
IkarusBlueprint & operator=(IkarusBlueprint &&) = default;
|
||||
|
||||
~IkarusBlueprint() override = default;
|
||||
|
||||
public:
|
||||
inline std::string_view get_table_name() const noexcept override {
|
||||
return "blueprints";
|
||||
}
|
||||
};
|
||||
|
|
@ -1,19 +1,18 @@
|
|||
#include "entity.hpp"
|
||||
|
||||
#include "values/value.hpp"
|
||||
|
||||
#include <cppbase/strings.hpp>
|
||||
|
||||
#include <errors.hpp>
|
||||
#include <objects/blueprint.hpp>
|
||||
#include <objects/properties/property.hpp>
|
||||
#include <persistence/project.hpp>
|
||||
#include <values/entity_property_value.hpp>
|
||||
#include <ikarus/errors.hpp>
|
||||
#include <ikarus/objects/blueprint.hpp>
|
||||
#include <ikarus/objects/properties/property.hpp>
|
||||
#include <ikarus/objects/util.hpp>
|
||||
#include <ikarus/persistence/project.hpp>
|
||||
#include <ikarus/values/entity_property_value.hpp>
|
||||
#include <ikarus/values/value.hpp>
|
||||
|
||||
IkarusEntity * ikarus_entity_create(struct IkarusProject * project, char const * name, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(project, nullptr);
|
||||
IKARUS_FAIL_IF_NULL(name, nullptr);
|
||||
IKARUS_FAIL_IF(cppbase::is_empty_or_blank(name), nullptr, "name must not be empty", IkarusErrorInfo_Client_InvalidInput);
|
||||
IKARUS_FAIL_IF_NAME_INVALID(name, project, nullptr, nullptr);
|
||||
|
||||
IKARUS_VTRYRV_OR_FAIL(
|
||||
IkarusId const id,
|
||||
|
|
@ -21,9 +20,9 @@ IkarusEntity * ikarus_entity_create(struct IkarusProject * project, char const *
|
|||
"failed to create entity: {}",
|
||||
IkarusErrorInfo_Database_QueryFailed,
|
||||
project->db->transact([name](auto * db) -> cppbase::Result<IkarusId, sqlitecpp::TransactionError> {
|
||||
TRY(db->execute("INSERT INTO `objects`(`type`, `name`, `information`) VALUES(?, ?, ?)", IkarusObjectType_Entity, name, ""));
|
||||
TRY(db->execute("INSERT INTO `objects`(`type`) VALUES(?, ?, ?)", IkarusObjectType_Entity));
|
||||
auto id = ikarus_id_from_data_and_type(db->last_insert_rowid(), IkarusObjectType_Entity);
|
||||
TRY(db->execute("INSERT INTO `entities`(`id`) VALUES(?)", id));
|
||||
TRY(db->execute("INSERT INTO `entities`(`id`, `name`) VALUES(?)", id, name));
|
||||
return cppbase::ok(id);
|
||||
})
|
||||
);
|
||||
|
|
@ -45,6 +44,18 @@ void ikarus_entity_delete(IkarusEntity * entity, IkarusErrorData * error_out) {
|
|||
entity->project->uncache(entity);
|
||||
}
|
||||
|
||||
IkarusProject * ikarus_entity_get_project(IkarusEntity const * entity, IkarusErrorData * error_out) {
|
||||
return ikarus::util::object_get_project(entity, error_out);
|
||||
}
|
||||
|
||||
char const * ikarus_entity_get_name(IkarusEntity const * entity, IkarusErrorData * error_out) {
|
||||
return ikarus::util::object_get_name(entity, error_out);
|
||||
}
|
||||
|
||||
void ikarus_entity_set_name(IkarusEntity * entity, char const * name, IkarusErrorData * error_out) {
|
||||
ikarus::util::object_set_name(entity, name, error_out);
|
||||
}
|
||||
|
||||
bool ikarus_entity_is_linked_to_blueprint(
|
||||
IkarusEntity const * entity,
|
||||
struct IkarusBlueprint const * blueprint,
|
||||
|
|
@ -273,17 +284,3 @@ void ikarus_entity_set_value(
|
|||
)
|
||||
);
|
||||
}
|
||||
|
||||
// No existence checks here for performance reasons. All methods on IkarusObject perform this check anyway.
|
||||
|
||||
struct IkarusObject * ikarus_entity_to_object(IkarusEntity * entity, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(entity, nullptr);
|
||||
|
||||
return static_cast<IkarusObject *>(entity);
|
||||
}
|
||||
|
||||
struct IkarusObject const * ikarus_entity_to_object_const(IkarusEntity const * entity, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(entity, nullptr);
|
||||
|
||||
return static_cast<IkarusObject const *>(entity);
|
||||
}
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
#pragma once
|
||||
|
||||
#include <objects/object.hpp>
|
||||
#include <ikarus/objects/object.hpp>
|
||||
|
||||
struct IkarusEntity : IkarusObject {
|
||||
public:
|
||||
inline IkarusEntity(struct IkarusProject * project, IkarusId id):
|
||||
IkarusObject{project, id} {}
|
||||
|
||||
|
|
@ -13,4 +14,9 @@ struct IkarusEntity : IkarusObject {
|
|||
IkarusEntity & operator=(IkarusEntity &&) = default;
|
||||
|
||||
~IkarusEntity() override = default;
|
||||
|
||||
public:
|
||||
inline std::string_view get_table_name() const noexcept override {
|
||||
return "entities";
|
||||
}
|
||||
};
|
||||
93
src/ikarus/objects/object.cpp
Normal file
93
src/ikarus/objects/object.cpp
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
#include "object.hpp"
|
||||
|
||||
#include <fmt/format.h>
|
||||
|
||||
#include <cppbase/strings.hpp>
|
||||
|
||||
#include <ikarus/errors.h>
|
||||
#include <ikarus/errors.hpp>
|
||||
#include <ikarus/objects/blueprint.hpp>
|
||||
#include <ikarus/objects/entity.hpp>
|
||||
#include <ikarus/objects/object.h>
|
||||
#include <ikarus/objects/properties/property.hpp>
|
||||
#include <ikarus/persistence/project.hpp>
|
||||
|
||||
IkarusObject::IkarusObject(IkarusProject * project, IkarusId id):
|
||||
project{project},
|
||||
id{id} {}
|
||||
|
||||
void ikarus_object_visit(
|
||||
IkarusObject * object,
|
||||
void (*blueprint_visitor)(struct IkarusBlueprint *, IkarusErrorData * error_out, void *),
|
||||
void (*property_visitor)(struct IkarusProperty *, IkarusErrorData * error_out, void *),
|
||||
void (*entity_visitor)(struct IkarusEntity *, IkarusErrorData * error_out, void *),
|
||||
void * data,
|
||||
IkarusErrorData * error_out
|
||||
) {
|
||||
struct Data {
|
||||
void (*blueprint_visitor)(struct IkarusBlueprint *, IkarusErrorData * error_out, void *);
|
||||
void (*property_visitor)(struct IkarusProperty *, IkarusErrorData * error_out, void *);
|
||||
void (*entity_visitor)(struct IkarusEntity *, IkarusErrorData * error_out, void *);
|
||||
void * data;
|
||||
};
|
||||
|
||||
Data passthru_data{blueprint_visitor, property_visitor, entity_visitor, data};
|
||||
|
||||
ikarus_object_visit_const(
|
||||
object,
|
||||
[](IkarusBlueprint const * blueprint, IkarusErrorData * error_out, void * data) {
|
||||
auto const * passthru_data = static_cast<Data *>(data);
|
||||
passthru_data->blueprint_visitor(const_cast<IkarusBlueprint *>(blueprint), error_out, passthru_data->data);
|
||||
},
|
||||
[](IkarusProperty const * property, IkarusErrorData * error_out, void * data) {
|
||||
auto const * passthru_data = static_cast<Data *>(data);
|
||||
passthru_data->property_visitor(const_cast<IkarusProperty *>(property), error_out, passthru_data->data);
|
||||
},
|
||||
[](IkarusEntity const * entity, IkarusErrorData * error_out, void * data) {
|
||||
auto const * passthru_data = static_cast<Data *>(data);
|
||||
passthru_data->entity_visitor(const_cast<IkarusEntity *>(entity), error_out, passthru_data->data);
|
||||
},
|
||||
&passthru_data,
|
||||
error_out
|
||||
);
|
||||
}
|
||||
|
||||
void ikarus_object_visit_const(
|
||||
IkarusObject const * object,
|
||||
void (*blueprint_visitor)(struct IkarusBlueprint const *, IkarusErrorData * error_out, void *),
|
||||
void (*property_visitor)(struct IkarusProperty const *, IkarusErrorData * error_out, void *),
|
||||
void (*entity_visitor)(struct IkarusEntity const *, IkarusErrorData * error_out, void *),
|
||||
void * data,
|
||||
IkarusErrorData * error_out
|
||||
) {
|
||||
IKARUS_FAIL_IF_NULL(object, );
|
||||
IKARUS_FAIL_IF_OBJECT_MISSING(object, );
|
||||
|
||||
switch (ikarus_id_get_object_type(object->id)) {
|
||||
case IkarusObjectType_Entity: {
|
||||
auto const * entity = dynamic_cast<IkarusEntity const *>(object);
|
||||
IKARUS_FAIL_IF(entity == nullptr, , "object with entity id wasn't a entity", IkarusErrorInfo_LibIkarus_InvalidState);
|
||||
entity_visitor(entity, error_out, data);
|
||||
}
|
||||
case IkarusObjectType_Blueprint: {
|
||||
auto const * blueprint = dynamic_cast<IkarusBlueprint const *>(object);
|
||||
IKARUS_FAIL_IF(blueprint == nullptr, , "object with blueprint id wasn't a blueprint", IkarusErrorInfo_LibIkarus_InvalidState);
|
||||
blueprint_visitor(blueprint, error_out, data);
|
||||
}
|
||||
case IkarusObjectType_Property: {
|
||||
auto const * property = dynamic_cast<IkarusProperty const *>(object);
|
||||
IKARUS_FAIL_IF(property == nullptr, , "object with property id wasn't a property", IkarusErrorInfo_LibIkarus_InvalidState);
|
||||
property_visitor(property, error_out, data);
|
||||
}
|
||||
default: {
|
||||
IKARUS_FAIL(
|
||||
,
|
||||
fmt::format("unknown object type: {}", ikarus_object_type_to_string(ikarus_id_get_object_type(object->id))),
|
||||
IkarusErrorInfo_LibIkarus_InvalidState
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// not needed, but a good delineation of our intention if this function gets extended
|
||||
IKARUS_FAIL_IF_ERROR()
|
||||
}
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <string_view>
|
||||
|
||||
#include <ikarus/id.h>
|
||||
|
||||
struct IkarusObject {
|
||||
|
|
@ -14,6 +16,9 @@ public:
|
|||
|
||||
virtual ~IkarusObject() = default;
|
||||
|
||||
public:
|
||||
virtual std::string_view get_table_name() const noexcept = 0;
|
||||
|
||||
public:
|
||||
struct IkarusProject * project;
|
||||
IkarusId id;
|
||||
|
|
@ -1,13 +1,11 @@
|
|||
#include "ikarus/objects/properties/number_property.h"
|
||||
#include "number_property.hpp"
|
||||
|
||||
#include <cppbase/result.hpp>
|
||||
|
||||
#include <ikarus/objects/properties/property.h>
|
||||
|
||||
#include <objects/properties/number_property.hpp>
|
||||
#include <objects/properties/property_source.hpp>
|
||||
#include <objects/properties/util.hpp>
|
||||
#include <values/value.hpp>
|
||||
#include <ikarus/objects/properties/property_scope.hpp>
|
||||
#include <ikarus/objects/properties/util.hpp>
|
||||
#include <ikarus/values/value.hpp>
|
||||
|
||||
IkarusNumberProperty::IkarusNumberProperty(IkarusProject * project, IkarusId id):
|
||||
IkarusProperty{project, id, this} {}
|
||||
|
|
@ -15,11 +13,10 @@ IkarusNumberProperty::IkarusNumberProperty(IkarusProject * project, IkarusId id)
|
|||
IkarusNumberProperty * ikarus_number_property_create(
|
||||
struct IkarusProject * project,
|
||||
char const * name,
|
||||
struct IkarusPropertySource * property_source,
|
||||
struct IkarusNumberValue * default_value,
|
||||
struct IkarusPropertyScope * property_source,
|
||||
IkarusErrorData * error_out
|
||||
) {
|
||||
return ikarus::util::create_property<IkarusNumberProperty>(project, name, property_source, default_value, error_out);
|
||||
return ikarus::util::create_property<IkarusNumberProperty>(project, name, property_source, error_out);
|
||||
}
|
||||
|
||||
IkarusNumberValue * ikarus_number_property_get_default_value(IkarusNumberProperty * property, IkarusErrorData * error_out) {
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
#pragma once
|
||||
|
||||
#include <ikarus/objects/properties/property.hpp>
|
||||
#include <ikarus/objects/properties/property_type.h>
|
||||
|
||||
#include <objects/properties/property.hpp>
|
||||
#include <values/number_value.hpp>
|
||||
#include <ikarus/values/number_value.hpp>
|
||||
|
||||
struct IkarusNumberProperty : IkarusProperty {
|
||||
public:
|
||||
|
|
@ -2,14 +2,13 @@
|
|||
|
||||
#include <cppbase/logger.hpp>
|
||||
|
||||
#include <ikarus/errors.hpp>
|
||||
#include <ikarus/objects/properties/property.h>
|
||||
#include <ikarus/objects/properties/property_scope.hpp>
|
||||
#include <ikarus/objects/properties/property_type.h>
|
||||
|
||||
#include <errors.hpp>
|
||||
#include <objects/properties/property_source.hpp>
|
||||
#include <persistence/project.hpp>
|
||||
#include <sys/stat.h>
|
||||
#include <values/value.hpp>
|
||||
#include <ikarus/objects/util.hpp>
|
||||
#include <ikarus/persistence/project.hpp>
|
||||
#include <ikarus/values/value.hpp>
|
||||
|
||||
IkarusProperty::IkarusProperty(IkarusProject * project, IkarusId id, Data data):
|
||||
IkarusObject{project, id},
|
||||
|
|
@ -29,6 +28,18 @@ IKA_API void ikarus_property_delete(IkarusProperty * property, IkarusErrorData *
|
|||
property->project->uncache(property);
|
||||
}
|
||||
|
||||
IkarusProject * ikarus_property_get_project(IkarusProperty const * property, IkarusErrorData * error_out) {
|
||||
return ikarus::util::object_get_project(property, error_out);
|
||||
}
|
||||
|
||||
char const * ikarus_property_get_name(IkarusProperty const * property, IkarusErrorData * error_out) {
|
||||
return ikarus::util::object_get_name(property, error_out);
|
||||
}
|
||||
|
||||
void ikarus_property_set_name(IkarusProperty * property, char const * name, IkarusErrorData * error_out) {
|
||||
ikarus::util::object_set_name(property, name, error_out);
|
||||
}
|
||||
|
||||
IkarusPropertyType ikarus_property_get_type(IkarusProperty const * property, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(property, IkarusPropertyType_Toggle);
|
||||
IKARUS_FAIL_IF_OBJECT_MISSING(property, IkarusPropertyType_Toggle);
|
||||
|
|
@ -44,7 +55,7 @@ IkarusPropertyType ikarus_property_get_type(IkarusProperty const * property, Ika
|
|||
return static_cast<IkarusPropertyType>(ret);
|
||||
}
|
||||
|
||||
IkarusPropertySource const * ikarus_property_get_source(IkarusProperty const * property, IkarusErrorData * error_out) {
|
||||
IkarusPropertyScope const * ikarus_property_get_scope(IkarusProperty const * property, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(property, nullptr);
|
||||
IKARUS_FAIL_IF_OBJECT_MISSING(property, nullptr);
|
||||
|
||||
|
|
@ -57,8 +68,8 @@ IkarusPropertySource const * ikarus_property_get_source(IkarusProperty const * p
|
|||
);
|
||||
|
||||
switch (ikarus_id_get_object_type(source)) {
|
||||
case IkarusObjectType_Blueprint: return new IkarusPropertySource{property->project->get_blueprint(source)};
|
||||
case IkarusObjectType_Entity: return new IkarusPropertySource{property->project->get_entity(source)};
|
||||
case IkarusObjectType_Blueprint: return new IkarusPropertyScope{property->project->get_blueprint(source)};
|
||||
case IkarusObjectType_Entity: return new IkarusPropertyScope{property->project->get_entity(source)};
|
||||
default:
|
||||
IKARUS_FAIL(
|
||||
nullptr,
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <variant>
|
||||
|
||||
#include <objects/object.hpp>
|
||||
#include <ikarus/objects/object.hpp>
|
||||
|
||||
struct IkarusProperty : IkarusObject {
|
||||
public:
|
||||
|
|
@ -19,6 +19,11 @@ public:
|
|||
|
||||
~IkarusProperty() override = default;
|
||||
|
||||
public:
|
||||
inline std::string_view get_table_name() const noexcept override {
|
||||
return "properties";
|
||||
}
|
||||
|
||||
public:
|
||||
Data data;
|
||||
};
|
||||
|
|
@ -1,17 +1,16 @@
|
|||
#include "property_source.hpp"
|
||||
#include "property_scope.hpp"
|
||||
|
||||
#include <boost/functional/overloaded_function.hpp>
|
||||
|
||||
#include <objects/blueprint.hpp>
|
||||
#include <objects/entity.hpp>
|
||||
#include <cppbase/templates.hpp>
|
||||
|
||||
IkarusPropertySource::IkarusPropertySource(Data data):
|
||||
#include <ikarus/objects/blueprint.hpp>
|
||||
#include <ikarus/objects/entity.hpp>
|
||||
|
||||
IkarusPropertyScope::IkarusPropertyScope(Data data):
|
||||
data{data} {}
|
||||
|
||||
IkarusId IkarusPropertySource::get_id() const {
|
||||
return boost::variant2::visit(
|
||||
cppbase::overloaded {
|
||||
IkarusId IkarusPropertyScope::get_id() const {
|
||||
return std::visit(
|
||||
cppbase::overloaded{
|
||||
[](IkarusBlueprint const * blueprint) { return blueprint->id; },
|
||||
[](IkarusEntity const * entity) { return entity->id; }
|
||||
},
|
||||
|
|
@ -19,37 +18,37 @@ IkarusId IkarusPropertySource::get_id() const {
|
|||
);
|
||||
}
|
||||
|
||||
IkarusPropertySource * ikarus_property_source_create_blueprint(IkarusBlueprint * blueprint) {
|
||||
return new IkarusPropertySource{blueprint};
|
||||
IkarusPropertyScope * ikarus_property_source_create_blueprint(IkarusBlueprint * blueprint) {
|
||||
return new IkarusPropertyScope{blueprint};
|
||||
}
|
||||
|
||||
IkarusPropertySource * ikarus_property_source_create_entity(IkarusEntity * entity) {
|
||||
return new IkarusPropertySource{entity};
|
||||
IkarusPropertyScope * ikarus_property_source_create_entity(IkarusEntity * entity) {
|
||||
return new IkarusPropertyScope{entity};
|
||||
}
|
||||
|
||||
void ikarus_property_source_visit(
|
||||
struct IkarusPropertySource * property_source,
|
||||
struct IkarusPropertyScope * property_source,
|
||||
void (*blueprint_visitor)(struct IkarusBlueprint *, void *),
|
||||
void (*entity_visitor)(struct IkarusEntity *, void *),
|
||||
void * user_data
|
||||
) {
|
||||
boost::variant2::visit(
|
||||
boost::make_overloaded_function(
|
||||
std::visit(
|
||||
cppbase::overloaded{
|
||||
[blueprint_visitor, user_data](IkarusBlueprint * blueprint) { blueprint_visitor(blueprint, user_data); },
|
||||
[entity_visitor, user_data](IkarusEntity * entity) { entity_visitor(entity, user_data); }
|
||||
),
|
||||
},
|
||||
property_source->data
|
||||
);
|
||||
}
|
||||
|
||||
void ikarus_property_source_visit_const(
|
||||
struct IkarusPropertySource const * property_source,
|
||||
struct IkarusPropertyScope const * property_source,
|
||||
void (*blueprint_visitor)(struct IkarusBlueprint const *, void *),
|
||||
void (*entity_visitor)(struct IkarusEntity const *, void *),
|
||||
void * user_data
|
||||
) {
|
||||
boost::variant2::visit(
|
||||
boost::make_overloaded_function(
|
||||
std::visit(
|
||||
cppbase::overloaded(
|
||||
[blueprint_visitor, user_data](IkarusBlueprint const * blueprint) { blueprint_visitor(blueprint, user_data); },
|
||||
[entity_visitor, user_data](IkarusEntity const * entity) { entity_visitor(entity, user_data); }
|
||||
),
|
||||
39
src/ikarus/objects/properties/property_scope.hpp
Normal file
39
src/ikarus/objects/properties/property_scope.hpp
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
#pragma once
|
||||
|
||||
#include <variant>
|
||||
|
||||
#include <ikarus/id.h>
|
||||
#include <ikarus/objects/properties/property_scope.h>
|
||||
|
||||
#define IKARUS_FAIL_IF_PROPERTY_SCOPE_INVALID(scope, ret) \
|
||||
std::visit( \
|
||||
cppbase::overloaded{[error_out](auto const * object) { \
|
||||
IKARUS_FAIL_IF_NULL(object, ); \
|
||||
IKARUS_FAIL_IF_OBJECT_MISSING(object, ); \
|
||||
}}, \
|
||||
scope->data \
|
||||
); \
|
||||
\
|
||||
IKARUS_FAIL_IF_ERROR(nullptr);
|
||||
|
||||
struct IkarusPropertyScope {
|
||||
public:
|
||||
using Data = std::variant<IkarusBlueprint *, IkarusEntity *>;
|
||||
|
||||
public:
|
||||
explicit IkarusPropertyScope(Data data);
|
||||
|
||||
IkarusPropertyScope(IkarusPropertyScope const &) = default;
|
||||
IkarusPropertyScope(IkarusPropertyScope &&) = default;
|
||||
|
||||
IkarusPropertyScope & operator=(IkarusPropertyScope const &) = default;
|
||||
IkarusPropertyScope & operator=(IkarusPropertyScope &&) = default;
|
||||
|
||||
virtual ~IkarusPropertyScope() = default;
|
||||
|
||||
public:
|
||||
[[nodiscard]] IkarusId get_id() const;
|
||||
|
||||
public:
|
||||
Data data;
|
||||
};
|
||||
|
|
@ -3,10 +3,9 @@
|
|||
#include <cppbase/result.hpp>
|
||||
|
||||
#include <ikarus/objects/properties/property.h>
|
||||
|
||||
#include <objects/properties/property_source.hpp>
|
||||
#include <objects/properties/util.hpp>
|
||||
#include <values/value.hpp>
|
||||
#include <ikarus/objects/properties/property_scope.hpp>
|
||||
#include <ikarus/objects/properties/util.hpp>
|
||||
#include <ikarus/values/value.hpp>
|
||||
|
||||
IkarusTextProperty::IkarusTextProperty(IkarusProject * project, IkarusId id):
|
||||
IkarusProperty{project, id, this} {}
|
||||
|
|
@ -14,11 +13,10 @@ IkarusTextProperty::IkarusTextProperty(IkarusProject * project, IkarusId id):
|
|||
IkarusTextProperty * ikarus_text_property_create(
|
||||
struct IkarusProject * project,
|
||||
char const * name,
|
||||
struct IkarusPropertySource * property_source,
|
||||
struct IkarusTextValue * default_value,
|
||||
struct IkarusPropertyScope * property_source,
|
||||
IkarusErrorData * error_out
|
||||
) {
|
||||
return ikarus::util::create_property<IkarusTextProperty>(project, name, property_source, default_value, error_out);
|
||||
return ikarus::util::create_property<IkarusTextProperty>(project, name, property_source, error_out);
|
||||
}
|
||||
|
||||
IkarusTextValue * ikarus_text_property_get_default_value(IkarusTextProperty * property, IkarusErrorData * error_out) {
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
#pragma once
|
||||
|
||||
#include <ikarus/objects/properties/property.hpp>
|
||||
#include <ikarus/objects/properties/property_type.h>
|
||||
|
||||
#include <objects/properties/property.hpp>
|
||||
#include <values/text_value.hpp>
|
||||
#include <ikarus/values/text_value.hpp>
|
||||
|
||||
struct IkarusTextProperty : IkarusProperty {
|
||||
public:
|
||||
|
|
@ -3,10 +3,9 @@
|
|||
#include <cppbase/result.hpp>
|
||||
|
||||
#include <ikarus/objects/properties/property.h>
|
||||
|
||||
#include <objects/properties/property_source.hpp>
|
||||
#include <objects/properties/util.hpp>
|
||||
#include <values/value.hpp>
|
||||
#include <ikarus/objects/properties/property_scope.hpp>
|
||||
#include <ikarus/objects/properties/util.hpp>
|
||||
#include <ikarus/values/value.hpp>
|
||||
|
||||
IkarusToggleProperty::IkarusToggleProperty(IkarusProject * project, IkarusId id):
|
||||
IkarusProperty{project, id, this} {}
|
||||
|
|
@ -14,11 +13,10 @@ IkarusToggleProperty::IkarusToggleProperty(IkarusProject * project, IkarusId id)
|
|||
IkarusToggleProperty * ikarus_toggle_property_create(
|
||||
struct IkarusProject * project,
|
||||
char const * name,
|
||||
struct IkarusPropertySource * property_source,
|
||||
struct IkarusToggleValue * default_value,
|
||||
struct IkarusPropertyScope * property_source,
|
||||
IkarusErrorData * error_out
|
||||
) {
|
||||
return ikarus::util::create_property<IkarusToggleProperty>(project, name, property_source, default_value, error_out);
|
||||
return ikarus::util::create_property<IkarusToggleProperty>(project, name, property_source, error_out);
|
||||
}
|
||||
|
||||
IkarusToggleValue * ikarus_toggle_property_get_default_value(struct IkarusToggleProperty * property, IkarusErrorData * error_out) {
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
#pragma once
|
||||
|
||||
#include <ikarus/objects/properties/property.hpp>
|
||||
#include <ikarus/objects/properties/property_type.h>
|
||||
|
||||
#include <objects/properties/property.hpp>
|
||||
#include <values/toggle_value.hpp>
|
||||
#include <ikarus/values/toggle_value.hpp>
|
||||
|
||||
struct IkarusToggleProperty : IkarusProperty {
|
||||
public:
|
||||
|
|
@ -4,48 +4,40 @@
|
|||
|
||||
#include <cppbase/strings.hpp>
|
||||
|
||||
#include <ikarus/errors.hpp>
|
||||
#include <ikarus/objects/properties/property.h>
|
||||
|
||||
#include <errors.hpp>
|
||||
#include <objects/properties/property.hpp>
|
||||
#include <objects/properties/property_source.hpp>
|
||||
#include <persistence/project.hpp>
|
||||
#include <values/value.hpp>
|
||||
#include <ikarus/objects/properties/property.hpp>
|
||||
#include <ikarus/objects/properties/property_scope.hpp>
|
||||
#include <ikarus/objects/util.hpp>
|
||||
#include <ikarus/persistence/project.hpp>
|
||||
#include <ikarus/values/value.hpp>
|
||||
|
||||
namespace ikarus::util {
|
||||
template<typename T>
|
||||
T * create_property(
|
||||
struct IkarusProject * project,
|
||||
char const * name,
|
||||
struct IkarusPropertySource * property_source,
|
||||
typename T::value_type * default_value,
|
||||
struct IkarusPropertyScope * property_scope,
|
||||
IkarusErrorData * error_out
|
||||
) {
|
||||
IKARUS_FAIL_IF_NULL(project, nullptr);
|
||||
IKARUS_FAIL_IF_NULL(name, nullptr);
|
||||
IKARUS_FAIL_IF_NULL(property_source, nullptr);
|
||||
IKARUS_FAIL_IF(
|
||||
cppbase::is_empty_or_blank(name),
|
||||
nullptr,
|
||||
fmt::format("{} name cannot be empty or blank", boost::typeindex::type_id<T>().pretty_name()),
|
||||
IkarusErrorInfo_Client_InvalidInput
|
||||
)
|
||||
IKARUS_FAIL_IF_NULL(default_value, nullptr);
|
||||
IKARUS_FAIL_IF_NULL(property_scope, nullptr);
|
||||
IKARUS_FAIL_IF_PROPERTY_SCOPE_INVALID(property_scope, nullptr);
|
||||
IKARUS_FAIL_IF_NAME_INVALID(name, project, property_scope, nullptr);
|
||||
|
||||
IKARUS_VTRYRV_OR_FAIL(
|
||||
IkarusId const id,
|
||||
nullptr,
|
||||
"failed to create property: {}",
|
||||
IkarusErrorInfo_Database_QueryFailed,
|
||||
project->db->transact([name, property_source, default_value](auto * db) -> cppbase::Result<IkarusId, sqlitecpp::TransactionError> {
|
||||
project->db->transact([name, property_scope](auto * db) -> cppbase::Result<IkarusId, sqlitecpp::TransactionError> {
|
||||
TRY(db->execute("INSERT INTO `objects`(`type`, `name`, `information`) VALUES(?, ?, ?)", IkarusObjectType_Property, name, ""));
|
||||
auto id = ikarus_id_from_data_and_type(db->last_insert_rowid(), IkarusObjectType_Property);
|
||||
TRY(db->execute(
|
||||
"INSERT INTO `properties`(`id`, `type`, `source`, `default_value`) VALUES(?, ?, ?, ?)",
|
||||
"INSERT INTO `properties`(`id`, `type`, `source`) VALUES(?, ?, ?)",
|
||||
id,
|
||||
T::PropertyType,
|
||||
property_source->get_id(),
|
||||
boost::json::serialize(default_value->to_json())
|
||||
property_scope->get_id()
|
||||
));
|
||||
return cppbase::ok(id);
|
||||
})
|
||||
125
src/ikarus/objects/util.hpp
Normal file
125
src/ikarus/objects/util.hpp
Normal file
|
|
@ -0,0 +1,125 @@
|
|||
#pragma once
|
||||
|
||||
#include <string_view>
|
||||
|
||||
#include <cppbase/strings.hpp>
|
||||
|
||||
#include <ikarus/errors.h>
|
||||
#include <ikarus/errors.hpp>
|
||||
#include <ikarus/objects/blueprint.hpp>
|
||||
#include <ikarus/objects/entity.hpp>
|
||||
#include <ikarus/objects/object.hpp>
|
||||
#include <ikarus/objects/properties/property.h>
|
||||
#include <ikarus/objects/properties/property.hpp>
|
||||
#include <ikarus/objects/properties/property_scope.hpp>
|
||||
#include <ikarus/persistence/project.hpp>
|
||||
|
||||
namespace ikarus::util {
|
||||
|
||||
template<typename O>
|
||||
[[nodiscard]] IkarusProject * object_get_project(O const * object, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(object, nullptr);
|
||||
IKARUS_FAIL_IF_OBJECT_MISSING(object, nullptr);
|
||||
|
||||
return object->project;
|
||||
}
|
||||
|
||||
template<typename O>
|
||||
[[nodiscard]] char const * object_get_name(O const * object, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(object, nullptr);
|
||||
IKARUS_FAIL_IF_OBJECT_MISSING(object, nullptr);
|
||||
|
||||
IKARUS_VTRYRV_OR_FAIL(
|
||||
auto const ret,
|
||||
nullptr,
|
||||
fmt::runtime(fmt::format("unable to fetch {} name: {{}}", ikarus_object_type_to_string(ikarus_id_get_object_type(object->id)))),
|
||||
IkarusErrorInfo_Database_QueryFailed,
|
||||
object->project->db
|
||||
->template query_one<std::string>(fmt::format("SELECT `name` FROM `{}` WHERE `id` = ?", object->get_table_name()), object->id)
|
||||
);
|
||||
|
||||
return strdup(ret.data());
|
||||
}
|
||||
|
||||
[[nodiscard]] inline bool name_is_unique(
|
||||
IkarusProject const * project,
|
||||
std::string_view name,
|
||||
[[maybe_unused]] IkarusBlueprint const * blueprint,
|
||||
IkarusErrorData * error_out
|
||||
) {
|
||||
IKARUS_VTRYRV_OR_FAIL(
|
||||
bool const exists,
|
||||
false,
|
||||
"unable to check if blueprint name is unique",
|
||||
IkarusErrorInfo_Database_QueryFailed,
|
||||
project->db->query_one<bool>("SELECT EXISTS(SELECT 1 FROM `blueprints` WHERE `name` = ?)", name)
|
||||
);
|
||||
|
||||
return exists;
|
||||
}
|
||||
|
||||
[[nodiscard]] inline bool name_is_unique(
|
||||
IkarusProject const * project,
|
||||
std::string_view name,
|
||||
[[maybe_unused]] IkarusEntity const * entity,
|
||||
IkarusErrorData * error_out
|
||||
) {
|
||||
IKARUS_VTRYRV_OR_FAIL(
|
||||
bool const exists,
|
||||
false,
|
||||
"unable to check if entity name is unique",
|
||||
IkarusErrorInfo_Database_QueryFailed,
|
||||
project->db->query_one<bool>("SELECT EXISTS(SELECT 1 FROM `entities` WHERE `name` = ?)", name)
|
||||
);
|
||||
|
||||
return exists;
|
||||
}
|
||||
|
||||
[[nodiscard]] inline bool
|
||||
name_is_unique(IkarusProject const * project, std::string_view name, IkarusPropertyScope const * scope, IkarusErrorData * error_out) {
|
||||
IKARUS_VTRYRV_OR_FAIL(
|
||||
bool const exists,
|
||||
false,
|
||||
"unable to check if property name is unique",
|
||||
IkarusErrorInfo_Database_QueryFailed,
|
||||
project->db->query_one<bool>("SELECT EXISTS(SELECT 1 FROM `properties` WHERE `name` = ? AND `scope` = ?)", name, scope->get_id())
|
||||
);
|
||||
|
||||
return exists;
|
||||
}
|
||||
|
||||
[[nodiscard]] inline bool
|
||||
name_is_unique(IkarusProject * project, std::string_view name, IkarusProperty const * property, IkarusErrorData * error_out) {
|
||||
std::unique_ptr<IkarusPropertyScope const> scope{ikarus_property_get_scope(property, error_out)};
|
||||
IKARUS_FAIL_IF_ERROR(false);
|
||||
|
||||
return name_is_unique(project, name, scope.get(), error_out);
|
||||
}
|
||||
|
||||
#define IKARUS_FAIL_IF_NAME_INVALID(name, project, object, ret, ...) \
|
||||
IKARUS_FAIL_IF_NULL(name, ret); \
|
||||
IKARUS_FAIL_IF(cppbase::is_empty_or_blank(name), ret, "name must not be empty", IkarusErrorInfo_Client_InvalidInput); \
|
||||
IKARUS_FAIL_IF( \
|
||||
!ikarus::util::name_is_unique(project, name, object, error_out), \
|
||||
ret, \
|
||||
"name must be unique", \
|
||||
IkarusErrorInfo_Client_InvalidInput \
|
||||
); \
|
||||
IKARUS_FAIL_IF_ERROR(ret);
|
||||
|
||||
template<typename O>
|
||||
void object_set_name(O * object, char const * name, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(object, );
|
||||
IKARUS_FAIL_IF_OBJECT_MISSING(object, );
|
||||
IKARUS_FAIL_IF_NULL(name, );
|
||||
IKARUS_FAIL_IF_NAME_INVALID(name, object->project, object, );
|
||||
|
||||
IKARUS_TRYRV_OR_FAIL(
|
||||
,
|
||||
fmt::runtime(fmt::format("unable to set {} name: {{}}", ikarus_object_type_to_string(ikarus_id_get_object_type(object->id)))),
|
||||
IkarusErrorInfo_Database_QueryFailed,
|
||||
object->project->db->execute(fmt::format("UPDATE `{}` SET `name` = ? WHERE `id` = ?", object->get_table_name()), name, object->id)
|
||||
);
|
||||
}
|
||||
|
||||
} // namespace ikarus::util
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
#include <sqlitecpp/connection.hpp>
|
||||
|
||||
namespace ikarus {
|
||||
CPPBASE_ASSET(m0_initial_layout, "persistence/migrations/m0_initial_layout.sql");
|
||||
CPPBASE_ASSET(m0_initial_layout, "ikarus/persistence/migrations/m0_initial_layout.sql");
|
||||
|
||||
class Migration : public sqlitecpp::Migration {
|
||||
public:
|
||||
|
|
@ -2,36 +2,29 @@ CREATE TABLE `objects`
|
|||
(
|
||||
`do_not_access_rowid_alias` INTEGER PRIMARY KEY,
|
||||
`type` INT NOT NULL,
|
||||
`id` INT GENERATED ALWAYS AS (`do_not_access_rowid_alias` | (`type` << 56)) VIRTUAL,
|
||||
`name` TEXT NOT NULL,
|
||||
`information` TEXT NOT NULL
|
||||
`id` INT GENERATED ALWAYS AS (`do_not_access_rowid_alias` | (`type` << 56)) VIRTUAL UNIQUE
|
||||
) STRICT;
|
||||
|
||||
CREATE UNIQUE INDEX `object_id` ON `objects` (`id`);
|
||||
CREATE INDEX `object_type` ON `objects` (`type`);
|
||||
|
||||
CREATE VIRTUAL TABLE `objects_fts` USING fts5
|
||||
(
|
||||
`name`,
|
||||
`information`,
|
||||
content='objects',
|
||||
content_rowid='id',
|
||||
tokenize="unicode61 remove_diacritics 2 tokenchars '-_'"
|
||||
);
|
||||
|
||||
CREATE TABLE `entities`
|
||||
(
|
||||
`id` INT,
|
||||
`id` INT,
|
||||
`name` TEXT NOT NULL,
|
||||
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE (`name`),
|
||||
FOREIGN KEY (`id`) REFERENCES `objects` (`id`) ON DELETE CASCADE
|
||||
) WITHOUT ROWID, STRICT;
|
||||
|
||||
CREATE TABLE `blueprints`
|
||||
(
|
||||
`id` INT,
|
||||
`id` INT,
|
||||
`name` TEXT NOT NULL,
|
||||
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE (`name`),
|
||||
FOREIGN KEY (`id`) REFERENCES `objects` (`id`) ON DELETE CASCADE
|
||||
) WITHOUT ROWID, STRICT;
|
||||
|
||||
|
|
@ -40,23 +33,22 @@ CREATE TABLE `entity_blueprint_links`
|
|||
`entity` INT NOT NULL,
|
||||
`blueprint` INT NOT NULL,
|
||||
|
||||
PRIMARY KEY (`entity`),
|
||||
UNIQUE (`entity`, `blueprint`),
|
||||
PRIMARY KEY (`entity`, `blueprint`),
|
||||
FOREIGN KEY (`entity`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
|
||||
FOREIGN KEY (`blueprint`) REFERENCES `blueprints` (`id`) ON DELETE CASCADE
|
||||
) WITHOUT ROWID, STRICT;
|
||||
|
||||
CREATE INDEX `entity_blueprints_blueprint` ON `entity_blueprint_links` (`blueprint`);
|
||||
|
||||
CREATE TABLE `properties`
|
||||
(
|
||||
`id` INT,
|
||||
`name` TEXT NOT NULL,
|
||||
`type` INT NOT NULL,
|
||||
`default_value` TEXT NOT NULL,
|
||||
`settings` TEXT NOT NULL,
|
||||
`source` INT NOT NULL,
|
||||
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE(`source`, `name`),
|
||||
FOREIGN KEY (`id`) REFERENCES `objects` (`id`) ON DELETE CASCADE,
|
||||
FOREIGN KEY (`source`) REFERENCES `objects` (`id`) ON DELETE CASCADE
|
||||
) WITHOUT ROWID, STRICT;
|
||||
|
|
@ -64,24 +56,6 @@ CREATE TABLE `properties`
|
|||
CREATE INDEX `properties_type` ON `properties` (`type`);
|
||||
CREATE INDEX `properties_source` ON `properties` (`source`);
|
||||
|
||||
CREATE
|
||||
VIRTUAL TABLE `property_default_value_fts` USING fts5
|
||||
(
|
||||
`default_value`,
|
||||
content='properties',
|
||||
content_rowid='object_id',
|
||||
tokenize="unicode61 remove_diacritics 2 tokenchars '-_'"
|
||||
);
|
||||
|
||||
CREATE
|
||||
VIRTUAL TABLE `property_settings_fts` USING fts5
|
||||
(
|
||||
`settings`,
|
||||
content='properties',
|
||||
content_rowid='object_id',
|
||||
tokenize="unicode61 remove_diacritics 2 tokenchars '-_'"
|
||||
);
|
||||
|
||||
CREATE TABLE `values`
|
||||
(
|
||||
`entity` INT NOT NULL,
|
||||
|
|
@ -92,11 +66,3 @@ CREATE TABLE `values`
|
|||
FOREIGN KEY (`entity`) REFERENCES `entities` (`id`) ON DELETE CASCADE,
|
||||
FOREIGN KEY (`property`) REFERENCES `properties` (`id`) ON DELETE CASCADE
|
||||
) WITHOUT ROWID, STRICT;
|
||||
|
||||
CREATE
|
||||
VIRTUAL TABLE `values_fts` USING fts5
|
||||
(
|
||||
`value`,
|
||||
content='values',
|
||||
tokenize="unicode61 remove_diacritics 2 tokenchars '-_'"
|
||||
);
|
||||
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
#include <cppbase/strings.hpp>
|
||||
|
||||
#include <objects/blueprint.hpp>
|
||||
#include <objects/entity.hpp>
|
||||
#include <objects/properties/number_property.hpp>
|
||||
#include <objects/properties/property.hpp>
|
||||
#include <objects/properties/text_property.hpp>
|
||||
#include <objects/properties/toggle_property.hpp>
|
||||
#include <persistence/migrations.hpp>
|
||||
#include <persistence/project.hpp>
|
||||
#include <ikarus/objects/blueprint.hpp>
|
||||
#include <ikarus/objects/entity.hpp>
|
||||
#include <ikarus/objects/properties/number_property.hpp>
|
||||
#include <ikarus/objects/properties/property.hpp>
|
||||
#include <ikarus/objects/properties/text_property.hpp>
|
||||
#include <ikarus/objects/properties/toggle_property.hpp>
|
||||
#include <ikarus/persistence/migrations.hpp>
|
||||
#include <ikarus/persistence/project.hpp>
|
||||
|
||||
IkarusProject::IkarusProject(std::string_view name, std::string_view path, std::unique_ptr<sqlitecpp::Connection> && db):
|
||||
name{name},
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#include "values/entity_property_value.hpp"
|
||||
#include "entity_property_value.hpp"
|
||||
|
||||
#include <errors.hpp>
|
||||
#include <ikarus/errors.hpp>
|
||||
|
||||
IkarusEntity const * ikarus_entity_property_value_get_entity(IkarusEntityPropertyValue const * value, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(value, nullptr);
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
#include <boost/functional/overloaded_function.hpp>
|
||||
|
||||
#include <values/number_value.hpp>
|
||||
#include <values/value_base.hpp>
|
||||
#include <ikarus/values/number_value.hpp>
|
||||
#include <ikarus/values/value_base.hpp>
|
||||
|
||||
IkarusNumberValue::IkarusNumberValue():
|
||||
IkarusValue{this} {}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
#include <boost/container/small_vector.hpp>
|
||||
#include <boost/variant2.hpp>
|
||||
|
||||
#include <values/value.hpp>
|
||||
#include <ikarus/values/value.hpp>
|
||||
|
||||
struct IkarusNumberValue : IkarusValue {
|
||||
public:
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
#include <boost/bind/bind.hpp>
|
||||
#include <boost/functional/overloaded_function.hpp>
|
||||
|
||||
#include <values/text_value.hpp>
|
||||
#include <values/value_base.hpp>
|
||||
#include <ikarus/values/text_value.hpp>
|
||||
#include <ikarus/values/value_base.hpp>
|
||||
|
||||
IkarusTextValue::IkarusTextValue():
|
||||
IkarusValue{this} {}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <boost/container/small_vector.hpp>
|
||||
|
||||
#include <values/value.hpp>
|
||||
#include <ikarus/values/value.hpp>
|
||||
|
||||
struct IkarusTextValue : IkarusValue {
|
||||
public:
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
#include <boost/functional/overloaded_function.hpp>
|
||||
#include <boost/range/adaptors.hpp>
|
||||
|
||||
#include <values/toggle_value.hpp>
|
||||
#include <values/value_base.hpp>
|
||||
#include <ikarus/values/toggle_value.hpp>
|
||||
#include <ikarus/values/value_base.hpp>
|
||||
|
||||
IkarusToggleValue::IkarusToggleValue():
|
||||
IkarusValue{this} {}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <boost/container/small_vector.hpp>
|
||||
|
||||
#include <values/value.hpp>
|
||||
#include <ikarus/values/value.hpp>
|
||||
|
||||
struct IkarusToggleValue : IkarusValue {
|
||||
public:
|
||||
|
|
@ -10,11 +10,10 @@
|
|||
#include <boost/json/src.hpp>
|
||||
|
||||
#include <ikarus/objects/properties/property_type.h>
|
||||
|
||||
#include <values/number_value.hpp>
|
||||
#include <values/text_value.hpp>
|
||||
#include <values/toggle_value.hpp>
|
||||
#include <values/value.hpp>
|
||||
#include <ikarus/values/number_value.hpp>
|
||||
#include <ikarus/values/text_value.hpp>
|
||||
#include <ikarus/values/toggle_value.hpp>
|
||||
#include <ikarus/values/value.hpp>
|
||||
|
||||
IkarusValue::IkarusValue(Data data):
|
||||
data(data) {}
|
||||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
#include <cppbase/result.hpp>
|
||||
|
||||
#include <errors.hpp>
|
||||
#include <persistence/project.hpp>
|
||||
#include <ikarus/errors.hpp>
|
||||
#include <ikarus/persistence/project.hpp>
|
||||
|
||||
struct IkarusValue {
|
||||
public:
|
||||
|
|
@ -41,7 +41,7 @@ struct fmt::formatter<IkarusValue::FromJsonError> {
|
|||
return ctx.end();
|
||||
}
|
||||
|
||||
constexpr static auto format([[maybe_unused]]IkarusValue::FromJsonError const & error, fmt::format_context & ctx) {
|
||||
constexpr static auto format([[maybe_unused]] IkarusValue::FromJsonError const & error, fmt::format_context & ctx) {
|
||||
return fmt::format_to(ctx.out(), "unable to parse ikarus value JSON");
|
||||
}
|
||||
};
|
||||
|
|
@ -1,170 +0,0 @@
|
|||
#include "object.hpp"
|
||||
|
||||
#include <fmt/format.h>
|
||||
|
||||
#include <cppbase/strings.hpp>
|
||||
|
||||
#include <ikarus/errors.h>
|
||||
#include <ikarus/objects/object.h>
|
||||
|
||||
#include <errors.hpp>
|
||||
#include <objects/blueprint.hpp>
|
||||
#include <objects/entity.hpp>
|
||||
#include <objects/properties/property.hpp>
|
||||
#include <persistence/project.hpp>
|
||||
|
||||
IkarusObject::IkarusObject(IkarusProject * project, IkarusId id):
|
||||
project{project},
|
||||
id{id} {}
|
||||
|
||||
IkarusProject * ikarus_object_get_project(IkarusObject const * object, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(object, nullptr);
|
||||
IKARUS_FAIL_IF_OBJECT_MISSING(object, nullptr);
|
||||
|
||||
return object->project;
|
||||
}
|
||||
|
||||
char const * ikarus_object_get_name(IkarusObject const * object, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(object, nullptr);
|
||||
IKARUS_FAIL_IF_OBJECT_MISSING(object, nullptr);
|
||||
|
||||
IKARUS_VTRYRV_OR_FAIL(
|
||||
std::string ret,
|
||||
nullptr,
|
||||
"unable to get object name: {}",
|
||||
IkarusErrorInfo_Database_QueryFailed,
|
||||
object->project->db->template query_one<std::string>("SELECT `name` FROM `objects` WHERE `id` = ?", object->id)
|
||||
);
|
||||
|
||||
return strdup(ret.data());
|
||||
}
|
||||
|
||||
void ikarus_object_set_name(IkarusObject * object, char const * name, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(object, );
|
||||
IKARUS_FAIL_IF_OBJECT_MISSING(object, );
|
||||
IKARUS_FAIL_IF_NULL(name, );
|
||||
IKARUS_FAIL_IF(cppbase::is_empty_or_blank(name), , "name must not be empty", IkarusErrorInfo_Client_InvalidInput);
|
||||
|
||||
IKARUS_TRYRV_OR_FAIL(
|
||||
,
|
||||
"unable to set object name: {}",
|
||||
IkarusErrorInfo_Database_QueryFailed,
|
||||
object->project->db->template execute("UPDATE `objects` SET `name` = ? WHERE `id` = ?", name, object->id)
|
||||
);
|
||||
}
|
||||
|
||||
char const * ikarus_object_get_information(IkarusObject const * object, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(object, nullptr);
|
||||
IKARUS_FAIL_IF_OBJECT_MISSING(object, nullptr);
|
||||
|
||||
IKARUS_VTRYRV_OR_FAIL(
|
||||
std::string ret,
|
||||
nullptr,
|
||||
"unable to get object information: {}",
|
||||
IkarusErrorInfo_Database_QueryFailed,
|
||||
object->project->db->template query_one<std::string>("SELECT `information` FROM `objects` WHERE `id` = ?", object->id)
|
||||
);
|
||||
|
||||
return strdup(ret.data());
|
||||
}
|
||||
|
||||
void ikarus_object_set_information(IkarusObject * object, char const * information, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(object, );
|
||||
IKARUS_FAIL_IF_OBJECT_MISSING(object, );
|
||||
IKARUS_FAIL_IF_NULL(information, );
|
||||
IKARUS_FAIL_IF(cppbase::is_empty_or_blank(information), , "information must not be empty", IkarusErrorInfo_Client_InvalidInput);
|
||||
|
||||
IKARUS_TRYRV_OR_FAIL(
|
||||
,
|
||||
"unable to set object information: {}",
|
||||
IkarusErrorInfo_Database_QueryFailed,
|
||||
object->project->db->template execute("UPDATE `objects` SET `information` = ? WHERE `id` = ?", information, object->id)
|
||||
);
|
||||
}
|
||||
|
||||
bool ikarus_object_is_equal(IkarusObject const * lhs, IkarusObject const * rhs, IkarusErrorData * error_out) {
|
||||
IKARUS_FAIL_IF_NULL(lhs, false);
|
||||
IKARUS_FAIL_IF_OBJECT_MISSING(lhs, false);
|
||||
IKARUS_FAIL_IF_NULL(rhs, false);
|
||||
IKARUS_FAIL_IF_OBJECT_MISSING(rhs, false);
|
||||
|
||||
return lhs->id == rhs->id;
|
||||
}
|
||||
|
||||
void ikarus_object_visit(
|
||||
IkarusObject * object,
|
||||
void (*blueprint_visitor)(struct IkarusBlueprint *, void *),
|
||||
void (*property_visitor)(struct IkarusProperty *, void *),
|
||||
void (*entity_visitor)(struct IkarusEntity *, void *),
|
||||
void * data,
|
||||
IkarusErrorData * error_out
|
||||
) {
|
||||
struct Data {
|
||||
void (*blueprint_visitor)(struct IkarusBlueprint *, void *);
|
||||
void (*property_visitor)(struct IkarusProperty *, void *);
|
||||
void (*entity_visitor)(struct IkarusEntity *, void *);
|
||||
void * data;
|
||||
};
|
||||
|
||||
Data passthru_data{
|
||||
blueprint_visitor,
|
||||
property_visitor,
|
||||
entity_visitor,
|
||||
data,
|
||||
};
|
||||
|
||||
ikarus_object_visit_const(
|
||||
object,
|
||||
[](IkarusBlueprint const * blueprint, void * data) {
|
||||
auto const * passthru_data = static_cast<Data *>(data);
|
||||
passthru_data->blueprint_visitor(const_cast<IkarusBlueprint *>(blueprint), passthru_data->data);
|
||||
},
|
||||
[](IkarusProperty const * property, void * data) {
|
||||
auto const * passthru_data = static_cast<Data *>(data);
|
||||
passthru_data->property_visitor(const_cast<IkarusProperty *>(property), passthru_data->data);
|
||||
},
|
||||
[](IkarusEntity const * entity, void * data) {
|
||||
auto const * passthru_data = static_cast<Data *>(data);
|
||||
passthru_data->entity_visitor(const_cast<IkarusEntity *>(entity), passthru_data->data);
|
||||
},
|
||||
&passthru_data,
|
||||
error_out
|
||||
);
|
||||
}
|
||||
|
||||
void ikarus_object_visit_const(
|
||||
IkarusObject const * object,
|
||||
void (*blueprint_visitor)(struct IkarusBlueprint const *, void *),
|
||||
void (*property_visitor)(struct IkarusProperty const *, void *),
|
||||
void (*entity_visitor)(struct IkarusEntity const *, void *),
|
||||
void * data,
|
||||
IkarusErrorData * error_out
|
||||
) {
|
||||
IKARUS_FAIL_IF_NULL(object, );
|
||||
IKARUS_FAIL_IF_OBJECT_MISSING(object, );
|
||||
|
||||
switch (ikarus_id_get_object_type(object->id)) {
|
||||
case IkarusObjectType_Entity: {
|
||||
auto const * entity = dynamic_cast<IkarusEntity const *>(object);
|
||||
IKARUS_FAIL_IF(entity == nullptr, , "object with entity id wasn't a entity", IkarusErrorInfo_LibIkarus_InvalidState);
|
||||
entity_visitor(entity, data);
|
||||
}
|
||||
case IkarusObjectType_Blueprint: {
|
||||
auto const * blueprint = dynamic_cast<IkarusBlueprint const *>(object);
|
||||
IKARUS_FAIL_IF(blueprint == nullptr, , "object with blueprint id wasn't a blueprint", IkarusErrorInfo_LibIkarus_InvalidState);
|
||||
blueprint_visitor(blueprint, data);
|
||||
}
|
||||
case IkarusObjectType_Property: {
|
||||
auto const * property = dynamic_cast<IkarusProperty const *>(object);
|
||||
IKARUS_FAIL_IF(property == nullptr, , "object with property id wasn't a property", IkarusErrorInfo_LibIkarus_InvalidState);
|
||||
property_visitor(property, data);
|
||||
}
|
||||
default: {
|
||||
IKARUS_FAIL(
|
||||
,
|
||||
fmt::format("unknown object type: {}", ikarus_object_type_to_string(ikarus_id_get_object_type(object->id))),
|
||||
IkarusErrorInfo_LibIkarus_InvalidState
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include <boost/variant2.hpp>
|
||||
#include <ikarus/id.h>
|
||||
#include <ikarus/objects/properties/property_source.h>
|
||||
|
||||
struct IkarusPropertySource {
|
||||
public:
|
||||
using Data = boost::variant2::variant<IkarusBlueprint *, IkarusEntity *>;
|
||||
|
||||
public:
|
||||
explicit IkarusPropertySource(Data data);
|
||||
|
||||
IkarusPropertySource(IkarusPropertySource const &) = default;
|
||||
IkarusPropertySource(IkarusPropertySource &&) = default;
|
||||
|
||||
IkarusPropertySource & operator=(IkarusPropertySource const &) = default;
|
||||
IkarusPropertySource & operator=(IkarusPropertySource &&) = default;
|
||||
|
||||
virtual ~IkarusPropertySource() = default;
|
||||
|
||||
public:
|
||||
[[nodiscard]] IkarusId get_id() const;
|
||||
|
||||
public:
|
||||
Data data;
|
||||
};
|
||||
Loading…
Add table
Add a link
Reference in a new issue