Pcornat/BillySheet
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Generic object is good for now

Browse Source
This commit is contained in:
Pcornat 2024-10-30 10:55:52 +01:00
parent 71e5faf139
commit 8429e7ff8f
Signed by: Pcornat
GPG Key ID: E0326CC678A00BDD
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/generic_object.hpp
View File

@ -47,11 +47,8 @@ namespace character {
class Tools; class Tools;
using billyObjects = std::variant<Weapons, Equipments, Tools>;
using billyEnums = std::variant<weapons, equipments, tools>; using billyEnums = std::variant<weapons, equipments, tools>;
static billyObjects new_object(const billyEnums &inputObject);
class GenericObject { class GenericObject {
public: public:
virtual ~GenericObject() = default; virtual ~GenericObject() = default;
@ -65,13 +62,19 @@ namespace character {
[[nodiscard]] virtual std::uint32_t add_materiel(const characteristic::characType inType) const noexcept = 0; [[nodiscard]] virtual std::uint32_t add_materiel(const characteristic::characType inType) const noexcept = 0;
[[nodiscard]] virtual std::string_view to_string() const noexcept = 0; [[nodiscard]] virtual std::string_view to_string() const noexcept = 0;
[[nodiscard]] virtual billyEnums get_type() const noexcept = 0;
}; };
using billyObjects = std::unique_ptr<GenericObject>;
static billyObjects new_object(const billyEnums &inputObject) noexcept;
class Weapons final : virtual public GenericObject { class Weapons final : virtual public GenericObject {
public: public:
const weapons type{ weapons::Sword }; const weapons type{ weapons::Sword };
friend billyObjects new_object(const billyEnums &inputObject); friend billyObjects new_object(const billyEnums &inputObject) noexcept;
Weapons() = delete; Weapons() = delete;
@ -85,7 +88,9 @@ namespace character {
[[nodiscard]] std::uint32_t add_materiel(const characteristic::characType inType) const noexcept final; [[nodiscard]] std::uint32_t add_materiel(const characteristic::characType inType) const noexcept final;
[[nodiscard]] std::string_view to_string() const noexcept override; [[nodiscard]] std::string_view to_string() const noexcept final;
[[nodiscard]] billyEnums get_type() const noexcept final { return type; }
private: private:
explicit Weapons(const weapons type) : type(type) {} explicit Weapons(const weapons type) : type(type) {}
@ -95,7 +100,7 @@ namespace character {
public: public:
const equipments type{ equipments::Chainmail }; const equipments type{ equipments::Chainmail };
friend billyObjects new_object(const billyEnums &inputObject); friend billyObjects new_object(const billyEnums &inputObject) noexcept;
Equipments() = delete; Equipments() = delete;
@ -109,7 +114,9 @@ namespace character {
[[nodiscard]] std::uint32_t add_materiel(const characteristic::characType inType) const noexcept final; [[nodiscard]] std::uint32_t add_materiel(const characteristic::characType inType) const noexcept final;
[[nodiscard]] std::string_view to_string() const noexcept override; [[nodiscard]] std::string_view to_string() const noexcept final;
[[nodiscard]] billyEnums get_type() const noexcept final { return type; }
private: private:
explicit Equipments(const equipments type) : type(type) {} explicit Equipments(const equipments type) : type(type) {}
@ -119,7 +126,7 @@ namespace character {
public: public:
const tools type{ tools::Fourche }; const tools type{ tools::Fourche };
friend billyObjects new_object(const billyEnums &inputObject); friend billyObjects new_object(const billyEnums &inputObject) noexcept;
Tools() = delete; Tools() = delete;
@ -133,7 +140,9 @@ namespace character {
[[nodiscard]] std::uint32_t add_materiel(const characteristic::characType inType) const noexcept final; [[nodiscard]] std::uint32_t add_materiel(const characteristic::characType inType) const noexcept final;
[[nodiscard]] std::string_view to_string() const noexcept override; [[nodiscard]] std::string_view to_string() const noexcept final;
[[nodiscard]] billyEnums get_type() const noexcept final { return type; }
private: private:
explicit Tools(const tools type) : type(type) {} explicit Tools(const tools type) : type(type) {}

8
src/generic_object.cpp
View File

@ -160,11 +160,11 @@ namespace character {
} }
} }
billyObjects new_object(const billyEnums &inputObject) { billyObjects new_object(const billyEnums &inputObject) noexcept {
return std::visit(overloaded{ return std::visit(overloaded{
[](const weapons input) { return billyObjects{ Weapons{ input }}; }, [](const weapons input) { return billyObjects{ new Weapons{ input }}; },
[](const equipments input) { return billyObjects{ Equipments{ input }}; }, [](const equipments input) { return billyObjects{ new Equipments{ input }}; },
[](const tools input) { return billyObjects{ Tools{ input }}; } [](const tools input) { return billyObjects{ new Tools{ input }}; }
}, inputObject); }, inputObject);
} }
} }