From 8cc5973f71d3f455e15144ca9b54657b7bbf668b Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Fri, 15 Aug 2025 22:45:12 -0400 Subject: [PATCH] Rework the code into separate files for further dev. --- constants.hpp | 10 ++ control.cpp | 46 ++++++++++ control.hpp | 14 +++ main.cpp | 248 +------------------------------------------------- meson.build | 3 + parser.cpp | 59 ++++++++++++ parser.hpp | 6 ++ slides.cpp | 132 +++++++++++++++++++++++++++ slides.hpp | 37 ++++++++ 9 files changed, 311 insertions(+), 244 deletions(-) create mode 100644 constants.hpp create mode 100644 control.cpp create mode 100644 control.hpp create mode 100644 parser.cpp create mode 100644 parser.hpp create mode 100644 slides.cpp create mode 100644 slides.hpp diff --git a/constants.hpp b/constants.hpp new file mode 100644 index 0000000..7e5a7f1 --- /dev/null +++ b/constants.hpp @@ -0,0 +1,10 @@ +#pragma once + +constexpr const int WINDOW_WIDTH=1920; +constexpr const int WINDOW_HEIGHT=1080; +constexpr const int FRAME_LIMIT=60; +constexpr const bool VSYNC=true; +constexpr const int TITLE_SIZE=124; +constexpr const int CONTENT_SIZE=94; +constexpr const int CONTROL_WIDTH=400; +constexpr const int CONTROL_HEIGHT=400; diff --git a/control.cpp b/control.cpp new file mode 100644 index 0000000..477e1ec --- /dev/null +++ b/control.cpp @@ -0,0 +1,46 @@ +#include "guecs/sfml/components.hpp" +#include "guecs/ui.hpp" +#include +#include +#include +#include +#include "dbc.hpp" +#include +#include +#include +#include +#include "constants.hpp" +#include "control.hpp" + +ControlUI::ControlUI(sf::RenderWindow& presenter) : + $presenter(presenter) +{ + $gui.position(0, 0, CONTROL_WIDTH, CONTROL_HEIGHT); + $gui.layout( + "[status]" + "[docs]" + ); +} + +void ControlUI::init() { + auto status_id = $gui.entity("status"); + $gui.set(status_id, {L""}); + + auto docs_id = $gui.entity("docs"); + $gui.set(docs_id, {L"A: win left\nD: win right\nQ: quit"}); + + $status = $gui.get_if(status_id); + + $gui.init(); +} + +void ControlUI::render(sf::RenderWindow& window) { + auto pos = $presenter.getPosition(); + auto size = $presenter.getSize(); + + $status->update(fmt::format(L"pos={},{}\nsize={},{}", + pos.x, pos.y, size.x, size.y)); + + window.clear(); + $gui.render(window); +} diff --git a/control.hpp b/control.hpp new file mode 100644 index 0000000..88cece4 --- /dev/null +++ b/control.hpp @@ -0,0 +1,14 @@ +#pragma once + +#include "guecs/sfml/components.hpp" +#include "guecs/ui.hpp" + +struct ControlUI { + guecs::UI $gui; + guecs::Text* $status; + sf::RenderWindow& $presenter; + + ControlUI(sf::RenderWindow& presenter); + void init(); + void render(sf::RenderWindow& window); +}; diff --git a/main.cpp b/main.cpp index 49097c3..0c1d902 100644 --- a/main.cpp +++ b/main.cpp @@ -1,251 +1,11 @@ #include "guecs/sfml/backend.hpp" -#include "guecs/sfml/components.hpp" #include "guecs/ui.hpp" #include -#include -#include -#include #include "dbc.hpp" -#include -#include -#include -#include - -constexpr const int WINDOW_WIDTH=1920; -constexpr const int WINDOW_HEIGHT=1080; -constexpr const int FRAME_LIMIT=60; -constexpr const bool VSYNC=true; -constexpr const int TITLE_SIZE=124; -constexpr const int CONTENT_SIZE=94; - -using std::string, std::wstring, std::shared_ptr, std::make_shared; -using nlohmann::json; -namespace fs = std::filesystem; - -struct Slide { - guecs::UI $gui; - wstring $title; - wstring $content; - json $config; - bool $initialized = false; - - Slide(const string& title, const string& content, json& config) : - $title(guecs::to_wstring(title)), - $content(guecs::to_wstring(content)), - $config(config) - { - } - - void init(lel::Cell& cell) { - if(!$initialized) { - $initialized = true; - - $gui.position(cell.x, cell.y, cell.w, cell.h); - $gui.layout( - "[=*%(300,200)title|_|_]" - "[_|_|_]" - "[=*%(300,300)content|_|_]" - "[_|_|_]" - "[_|_|_]"); - - auto title = $gui.entity("title"); - $gui.set(title, {$title, TITLE_SIZE}); - - auto content = $gui.entity("content"); - $gui.set(content, { - $content, - CONTENT_SIZE, - guecs::THEME.TEXT_COLOR, 20}); - - $gui.init(); - } - } - - void render(sf::RenderWindow& window) { - $gui.render(window); - // $gui.debug_layout(window); - } -}; - -using SlideDeck = std::vector; - - -struct SlidesUI { - guecs::UI $gui; - shared_ptr $slides = nullptr; - size_t $current = 0; - - SlidesUI(shared_ptr slides) { - dbc::check(slides != nullptr, "slides is null"); - dbc::check(slides->size() > 0, "slide deck is empy"); - $slides = slides; - $current = 0; - - $gui.position(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT); - $gui.layout( - "[t_left|t_center|t_right]" - "[m_left|*%(300,400)slide|_|_|m_right]" - "[_|_|_|_|_]" - "[_|_|_|_|_]" - "[_|_|_|_|_]" - "[_|_|_|_|_]" - "[b_left|b_center|b_right]" - ); - } - - void init() { - guecs::Background bg{$gui.$parser, }; - bg.set_color(guecs::THEME.BG_COLOR_DARK); - $gui.set($gui.MAIN, bg); - - show_slide(); - - $gui.init(); - } - - Slide& current() { - return $slides->at($current); - } - - void next_slide() { - if($current < $slides->size() - 1) { - $current++; - show_slide(); - } - } - - void prev_slide() { - if($current > 0) { - $current--; - show_slide(); - } - } - - void show_slide() { - auto& slide = current(); - auto& bg = $gui.get($gui.MAIN); - sf::Color color = guecs::THEME.FILL_COLOR; - - if(slide.$config.contains("bg_color")) { - auto color_conf = slide.$config["bg_color"]; - color = {color_conf[0], color_conf[1], color_conf[2], color_conf[3]}; - } - - bg.set_color(color); - bg.init(); - - auto& cell = $gui.cell_for("slide"); - slide.init(cell); - } - - void render(sf::RenderWindow& window) { - $gui.render(window); - - auto& slide = current(); - slide.render(window); - - // $gui.debug_layout(window); - } - - void mouse(float x, float y, guecs::Modifiers mods) { - $gui.mouse(x, y, mods); - - if(mods.test(guecs::ModBit::left)) { - next_slide(); - } else if(mods.test(guecs::ModBit::right)) { - prev_slide(); - } - } -}; - -struct ControlUI { - guecs::UI $gui; - guecs::Text* $status; - sf::RenderWindow& $presenter; - - ControlUI(sf::RenderWindow& presenter) : - $presenter(presenter) - { - $gui.position(0, 0, 400, 400); - $gui.layout( - "[status]" - "[docs]" - ); - } - - void init() { - auto status_id = $gui.entity("status"); - $gui.set(status_id, {L""}); - - auto docs_id = $gui.entity("docs"); - $gui.set(docs_id, {L"A: win left\nD: win right\nQ: quit"}); - - $status = $gui.get_if(status_id); - - $gui.init(); - } - - void render(sf::RenderWindow& window) { - auto pos = $presenter.getPosition(); - auto size = $presenter.getSize(); - - $status->update(fmt::format(L"pos={},{}\nsize={},{}", - pos.x, pos.y, size.x, size.y)); - - window.clear(); - $gui.render(window); - } -}; - - -shared_ptr parse_slides(const string& md_file) { - shared_ptr slides = make_shared(); - - dbc::check(fs::exists(md_file), "md file missing"); - - auto size = fs::file_size(md_file); - string line(size, '\0'); - bool started = false; - json config; - - if(std::ifstream in_file{md_file, std::ios::binary}) { - while(std::getline(in_file, line)) { - if(line == "{") { - string json_data; - - do { - json_data += line; - } while (std::getline(in_file, line) && line != "}"); - - json_data += "}"; - - config = json::parse(json_data); - std::cout << "JSON: " << config << '\n'; - } else if(line == "===") { - fmt::println("START"); - started = true; - } else if(line == "---") { - fmt::println("START SLIDE"); - } else { - if(started) { - string title = line; - string content; - - while(std::getline(in_file, line) && line != "---") { - content += line + "\n"; - } - - slides->emplace_back(title, content, config); - config = json::parse("{}"); - } else { - fmt::println("JUNK: {}", line); - } - } - } - } - - return slides; -} +#include "constants.hpp" +#include "slides.hpp" +#include "control.hpp" +#include "parser.hpp" int main(int argc, char *argv[]) { dbc::check(argc >= 2, "USAGE: besos my_fucking_slides.md"); diff --git a/meson.build b/meson.build index e49ab6b..4aa6720 100644 --- a/meson.build +++ b/meson.build @@ -83,6 +83,9 @@ sources = [ 'dbc.cpp', 'backend.cpp', 'main.cpp', + 'control.cpp', + 'slides.cpp', + 'parser.cpp' ] tests = [ diff --git a/parser.cpp b/parser.cpp new file mode 100644 index 0000000..088fb86 --- /dev/null +++ b/parser.cpp @@ -0,0 +1,59 @@ +#include "parser.hpp" +#include "dbc.hpp" +#include +#include +#include +#include +#include + +using std::shared_ptr, std::string, nlohmann::json; +namespace fs = std::filesystem; + +shared_ptr parse_slides(const string& md_file) { + shared_ptr slides = std::make_shared(); + + dbc::check(fs::exists(md_file), "md file missing"); + + auto size = fs::file_size(md_file); + string line(size, '\0'); + bool started = false; + json config; + + if(std::ifstream in_file{md_file, std::ios::binary}) { + while(std::getline(in_file, line)) { + if(line == "{") { + string json_data; + + do { + json_data += line; + } while (std::getline(in_file, line) && line != "}"); + + json_data += "}"; + + config = json::parse(json_data); + std::cout << "JSON: " << config << '\n'; + } else if(line == "===") { + fmt::println("START"); + started = true; + } else if(line == "---") { + fmt::println("START SLIDE"); + } else { + if(started) { + string title = line; + string content; + + while(std::getline(in_file, line) && line != "---") { + content += line + "\n"; + } + + slides->emplace_back(title, content, config); + config = json::parse("{}"); + } else { + fmt::println("JUNK: {}", line); + } + } + } + } + + return slides; +} diff --git a/parser.hpp b/parser.hpp new file mode 100644 index 0000000..4517b29 --- /dev/null +++ b/parser.hpp @@ -0,0 +1,6 @@ +#pragma once +#include +#include +#include "slides.hpp" + +std::shared_ptr parse_slides(const std::string& md_file); diff --git a/slides.cpp b/slides.cpp new file mode 100644 index 0000000..bbad3bd --- /dev/null +++ b/slides.cpp @@ -0,0 +1,132 @@ +#include "guecs/sfml/components.hpp" +#include "guecs/ui.hpp" +#include +#include +#include +#include +#include "dbc.hpp" +#include +#include "constants.hpp" +#include "slides.hpp" + +using std::string, std::wstring, std::shared_ptr, std::make_shared; +using nlohmann::json; + +Slide::Slide(const string& title, const string& content, json& config) : + $title(guecs::to_wstring(title)), + $content(guecs::to_wstring(content)), + $config(config) +{ +} + +void Slide::init(lel::Cell& cell) { + if(!$initialized) { + $initialized = true; + + $gui.position(cell.x, cell.y, cell.w, cell.h); + $gui.layout( + "[=*%(300,200)title|_|_]" + "[_|_|_]" + "[=*%(300,300)content|_|_]" + "[_|_|_]" + "[_|_|_]"); + + auto title = $gui.entity("title"); + $gui.set(title, {$title, TITLE_SIZE}); + + auto content = $gui.entity("content"); + $gui.set(content, { + $content, + CONTENT_SIZE, + guecs::THEME.TEXT_COLOR, 20}); + + $gui.init(); + } +} + +void Slide::render(sf::RenderWindow& window) { + $gui.render(window); + // $gui.debug_layout(window); +} + +SlidesUI::SlidesUI(shared_ptr slides) { + dbc::check(slides != nullptr, "slides is null"); + dbc::check(slides->size() > 0, "slide deck is empy"); + $slides = slides; + $current = 0; + + $gui.position(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT); + $gui.layout( + "[t_left|t_center|t_right]" + "[m_left|*%(300,400)slide|_|_|m_right]" + "[_|_|_|_|_]" + "[_|_|_|_|_]" + "[_|_|_|_|_]" + "[_|_|_|_|_]" + "[b_left|b_center|b_right]" + ); +} + +void SlidesUI::init() { + guecs::Background bg{$gui.$parser, }; + bg.set_color(guecs::THEME.BG_COLOR_DARK); + $gui.set($gui.MAIN, bg); + + show_slide(); + + $gui.init(); +} + +Slide& SlidesUI::current() { + return $slides->at($current); +} + +void SlidesUI::next_slide() { + if($current < $slides->size() - 1) { + $current++; + show_slide(); + } +} + +void SlidesUI::prev_slide() { + if($current > 0) { + $current--; + show_slide(); + } +} + +void SlidesUI::show_slide() { + auto& slide = current(); + auto& bg = $gui.get($gui.MAIN); + sf::Color color = guecs::THEME.FILL_COLOR; + + if(slide.$config.contains("bg_color")) { + auto color_conf = slide.$config["bg_color"]; + color = {color_conf[0], color_conf[1], color_conf[2], color_conf[3]}; + } + + bg.set_color(color); + bg.init(); + + auto& cell = $gui.cell_for("slide"); + slide.init(cell); +} + +void SlidesUI::render(sf::RenderWindow& window) { + $gui.render(window); + + auto& slide = current(); + slide.render(window); + + // $gui.debug_layout(window); +} + +void SlidesUI::mouse(float x, float y, guecs::Modifiers mods) { + $gui.mouse(x, y, mods); + + if(mods.test(guecs::ModBit::left)) { + next_slide(); + } else if(mods.test(guecs::ModBit::right)) { + prev_slide(); + } +} diff --git a/slides.hpp b/slides.hpp new file mode 100644 index 0000000..60c1345 --- /dev/null +++ b/slides.hpp @@ -0,0 +1,37 @@ +#pragma once + +#include "guecs/sfml/backend.hpp" +#include "guecs/sfml/components.hpp" +#include "guecs/ui.hpp" +#include +#include + +struct Slide { + guecs::UI $gui; + std::wstring $title; + std::wstring $content; + nlohmann::json $config; + bool $initialized = false; + + Slide(const std::string& title, const std::string& content, nlohmann::json& config); + void init(lel::Cell& cell); + void render(sf::RenderWindow& window); +}; + +using SlideDeck = std::vector; + +struct SlidesUI { + guecs::UI $gui; + std::shared_ptr $slides = nullptr; + size_t $current = 0; + + SlidesUI(std::shared_ptr slides); + void init(); + Slide& current(); + + void next_slide(); + void prev_slide(); + void show_slide(); + void render(sf::RenderWindow& window); + void mouse(float x, float y, guecs::Modifiers mods); +};