diff --git a/src/guecs/sfml/backend.cpp b/src/guecs/opengl/backend.cpp similarity index 55% rename from src/guecs/sfml/backend.cpp rename to src/guecs/opengl/backend.cpp index f90ee12..d1645b8 100644 --- a/src/guecs/sfml/backend.cpp +++ b/src/guecs/opengl/backend.cpp @@ -1,43 +1,29 @@ -#include "guecs/sfml/backend.hpp" -#include "guecs/sfml/shaders.hpp" -#include "guecs/sfml/sound.hpp" -#include "guecs/sfml/textures.hpp" +#include "guecs/opengl/backend.hpp" namespace sfml { guecs::SpriteTexture Backend::get_sprite(const string& name) { - auto sp = textures::get(name); - return {sp.sprite, sp.texture, sp.frame_size}; + return {}; } guecs::SpriteTexture Backend::get_icon(const string& name) { - return get_sprite(name); + return {}; } Backend::Backend() { - sound::init(); - shaders::init(); - textures::init(); } void Backend::sound_play(const string& name) { - sound::play(name); } void Backend::sound_stop(const string& name) { - sound::stop(name); } - std::shared_ptr Backend::get_shader(const std::string& name) { - return shaders::get(name); + std::shared_ptr Backend::get_shader(const std::string& name) { + return nullptr; } bool Backend::shader_updated() { - if(shaders::updated($shaders_version)) { - $shaders_version = shaders::version(); - return true; - } else { - return false; - } + return false; } guecs::Theme Backend::theme() { diff --git a/src/guecs/sfml/backend.hpp b/src/guecs/opengl/backend.hpp similarity index 100% rename from src/guecs/sfml/backend.hpp rename to src/guecs/opengl/backend.hpp diff --git a/src/guecs/sfml/components.cpp b/src/guecs/opengl/components.cpp similarity index 99% rename from src/guecs/sfml/components.cpp rename to src/guecs/opengl/components.cpp index 1d63c54..3c88540 100644 --- a/src/guecs/sfml/components.cpp +++ b/src/guecs/opengl/components.cpp @@ -1,5 +1,5 @@ #include "guecs/ui.hpp" -#include "guecs/sfml/backend.hpp" +#include "guecs/opengl/backend.hpp" #include #include #include diff --git a/src/guecs/sfml/components.hpp b/src/guecs/opengl/components.hpp similarity index 100% rename from src/guecs/sfml/components.hpp rename to src/guecs/opengl/components.hpp diff --git a/src/guecs/ui.hpp b/src/guecs/ui.hpp index 66be5b4..ae71555 100644 --- a/src/guecs/ui.hpp +++ b/src/guecs/ui.hpp @@ -8,7 +8,7 @@ #include #include #include "guecs/theme.hpp" -#include "guecs/sfml/components.hpp" +#include "guecs/opengl/components.hpp" #include #include diff --git a/src/meson.build b/src/meson.build index ebfd6d6..e5f2e24 100644 --- a/src/meson.build +++ b/src/meson.build @@ -16,5 +16,6 @@ sources = [ 'src/guecs/ui.cpp', 'src/guecs/lel.cpp', 'src/guecs/theme.cpp', - 'src/guecs/sfml/components.cpp', + 'src/guecs/opengl/components.cpp', + 'src/guecs/opengl/backend.cpp', ]