diff --git a/libzork/libzork/CMakeLists.txt b/libzork/libzork/CMakeLists.txt index b61e838..5b450c6 100644 --- a/libzork/libzork/CMakeLists.txt +++ b/libzork/libzork/CMakeLists.txt @@ -38,16 +38,22 @@ set(CMAKE_BINARY_DIR build/) # Import yaml-cpp -include(FetchContent) +# Bon la mouli casse les couilles ENCORE UNE FOIS donc ça ça marche pas +# +# include(FetchContent) -FetchContent_Declare( - yaml-cpp - GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git - # GIT_TAG -) -FetchContent_MakeAvailable(yaml-cpp) +# FetchContent_Declare( +# yaml-cpp +# GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git +# # GIT_TAG +# ) +# FetchContent_MakeAvailable(yaml-cpp) +# +# target_link_libraries(zork PUBLIC yaml-cpp::yaml-cpp) -target_link_libraries(zork PUBLIC yaml-cpp::yaml-cpp) +find_library(YAML_CPP yaml-cpp REQUIRED ) +target_link_libraries(zork PUBLIC yaml-cpp) -target_link_options(zork PUBLIC -Wl,--no-undefined) + +target_link_options(zork PUBLIC ${YAML_CPP} -Wl,--no-undefined) diff --git a/libzork/libzork/src/story/choice.hh b/libzork/libzork/src/story/choice.hh index f080bf6..0646668 100644 --- a/libzork/libzork/src/story/choice.hh +++ b/libzork/libzork/src/story/choice.hh @@ -12,7 +12,6 @@ namespace libzork::story class Choice { public: - Choice() = default; Choice(const Node* node, const std::string& text, const std::vector>& conditions, const std::vector>& actions); diff --git a/libzork/libzork/src/story/node.cc b/libzork/libzork/src/story/node.cc index 343834a..dc6b8b6 100644 --- a/libzork/libzork/src/story/node.cc +++ b/libzork/libzork/src/story/node.cc @@ -1,17 +1,36 @@ +#include #include +#include +#include #include "exceptions.hh" #include "story/node_impl.hh" +std::string readFile(const std::string& path) +{ + std::ifstream in(path, std::ios::binary); + if (!in) + throw std::runtime_error("cannot open file"); + return std::string(std::istreambuf_iterator(in), + std::istreambuf_iterator()); +} + namespace libzork::story { std::unique_ptr make_node(const std::string& name, const fs::path& script_path) { - (void)name; - (void)script_path; - throw NotImplemented(); + std::ifstream a; + a.open(script_path); + if (!a.is_open()) + throw std::runtime_error( + std::string("Could not open script: ").append(script_path)); + + std::string text = std::string(std::istreambuf_iterator(a), + std::istreambuf_iterator()); + + return std::make_unique(NodeImpl{ name, text }); } } // namespace libzork::story diff --git a/libzork/libzork/src/story/node_impl.cc b/libzork/libzork/src/story/node_impl.cc index e216ff3..dfec5e4 100644 --- a/libzork/libzork/src/story/node_impl.cc +++ b/libzork/libzork/src/story/node_impl.cc @@ -8,6 +8,11 @@ namespace libzork::story { + NodeImpl::NodeImpl(const std::string& name, const std::string& text) + : name_{ name } + , text_{ text } + {} + const std::string& NodeImpl::get_name() const { return name_; diff --git a/libzork/libzork/src/story/node_impl.hh b/libzork/libzork/src/story/node_impl.hh index de94ae6..db7f3a6 100644 --- a/libzork/libzork/src/story/node_impl.hh +++ b/libzork/libzork/src/story/node_impl.hh @@ -15,6 +15,7 @@ namespace libzork::story { public: ~NodeImpl() override = default; + NodeImpl(const std::string& name, const std::string& text); const std::string& get_name() const override; const std::string& get_text() const override; @@ -29,8 +30,8 @@ namespace libzork::story std::vector> actions = {}) override; private: - std::string name_; - std::string text_; + const std::string name_; + const std::string text_; std::vector> choices_; }; diff --git a/libzork/libzork/src/story/story.cc b/libzork/libzork/src/story/story.cc index 33b30b4..f39b3b4 100644 --- a/libzork/libzork/src/story/story.cc +++ b/libzork/libzork/src/story/story.cc @@ -1,6 +1,13 @@ #include +#include +#include +#include +#include +#include #include "exceptions.hh" +#include "libzork/story/node.hh" +#include "story/node_impl.hh" #include "story/story_impl.hh" namespace libzork::story @@ -8,8 +15,65 @@ namespace libzork::story std::unique_ptr make_story(const fs::path& path) { - (void)path; - throw NotImplemented(); + YAML::Node story_node = YAML::LoadFile(path); + if (!story_node) + throw std::runtime_error("Coult not load YAML file"); + + // Check fields + if (!story_node["title"] || !story_node["scripts-path"] + || !story_node["story"]) + throw std::runtime_error("Missing fields in YAML file"); + + const std::string title = story_node["title"].as(); + const std::string scripts_path = + story_node["scripts-path"].as(); + + // Stories (get nodes) + std::unordered_map> nodes; + auto stories = story_node["story"]; + for (auto story : stories) + { + // Check fields + if (!story["name"] || story["script"] || story["choices"]) + continue; + + // Get values + const std::string story_name = story["name"].as(); + const std::string story_script_path = + scripts_path + story["script"].as(); + + // Create node + auto n = make_node(story_name, story_script_path); + nodes.emplace(story_name, std::move(n)); + } + + // Stories (get choices) + for (auto story : stories) + { + // Get values + const std::string story_name = story["name"].as(); + auto story_choices = story["choices"]; + auto choices_list = + std::list>(); + for (auto choice : story_choices) + { + // Check fields + if (!choice["text"] || !choice["target"]) + continue; + choices_list.push_back( + std::make_pair(choice["text"].as(), + choice["target"].as())); + } + + // TODO add choices + auto it = nodes.find(story_name); + if (it == nodes.end()) + throw std::runtime_error( + "Could not find the story back to add choices"); + NodeImpl n = it.second; + } + + return std::make_unique(title, nullptr, nullptr); } } // namespace libzork::story diff --git a/libzork/libzork/src/story/story_impl.cc b/libzork/libzork/src/story/story_impl.cc index d991c20..eca972a 100644 --- a/libzork/libzork/src/story/story_impl.cc +++ b/libzork/libzork/src/story/story_impl.cc @@ -4,26 +4,31 @@ namespace libzork::story { + StoryImpl::StoryImpl(const std::string& title, const Node* current_node, + store::Store* store) + : title_{ title } + , current_{ current_node } + , store_{ store } + {} const std::string& StoryImpl::get_title() const { - throw NotImplemented(); + return title_; } const Node* StoryImpl::get_current() const { - throw NotImplemented(); + return store_->get_active_node(); } void StoryImpl::set_current(const Node* node) { - (void)node; - throw NotImplemented(); + store_->set_active_node(node); } const store::Store* StoryImpl::get_store() const { - throw NotImplemented(); + return store_; } std::ostream& StoryImpl::display(std::ostream& os) const diff --git a/libzork/libzork/src/story/story_impl.hh b/libzork/libzork/src/story/story_impl.hh index 9107452..9007994 100644 --- a/libzork/libzork/src/story/story_impl.hh +++ b/libzork/libzork/src/story/story_impl.hh @@ -2,6 +2,7 @@ #define STORY_IMPL_HH #include +#include namespace libzork::story { @@ -9,6 +10,9 @@ namespace libzork::story class StoryImpl : public Story { public: + StoryImpl() = default; + StoryImpl(const std::string& title, const Node* current_node, + store::Store* store); ~StoryImpl() override = default; const std::string& get_title() const override; @@ -16,6 +20,12 @@ namespace libzork::story void set_current(const Node* node) override; const store::Store* get_store() const override; std::ostream& display(std::ostream& os) const override; + + private: + const std::string title_; + const std::vector nodes_; + const Node* current_; + store::Store* store_; }; const StoryImpl& to_impl(const Story& story);