Code cleaning, update roadmap and manifest

This commit is contained in:
Corentin 2022-10-06 22:29:56 +09:00
commit 73934d0e34
20 changed files with 56 additions and 76 deletions

View file

@ -3,7 +3,7 @@
#include <memory>
#include <string>
#include "uui/config.hpp"
#include "uui/types.hpp"
namespace uui
{
@ -11,6 +11,11 @@ class Window;
class Application
{
public:
#ifdef DEBUG
constexpr static bool debug_mode = true;
#else
constexpr static bool debug_mode = false;
#endif
enum Implementaion
{
OPENGL

View file

@ -3,7 +3,7 @@
#include <array>
#include <memory>
#include "uui/config.hpp"
#include "uui/types.hpp"
#include "uui/window.hpp"
namespace uui
@ -15,12 +15,6 @@ public:
virtual void set_background_color(float r, float g, float b, float a = 1.0f) = 0;
protected:
#ifdef DEBUG
constexpr static bool debug_mode = true;
#else
constexpr static bool debug_mode = false;
#endif
std::shared_ptr<Window> window;
std::size_t window_index;
std::shared_ptr<Container> parent;

View file

@ -6,7 +6,7 @@
#include <memory>
#include <vector>
#include "uui/config.hpp"
#include "uui/types.hpp"
namespace uui
{
@ -15,6 +15,7 @@ class GlComponent;
class Container
{
friend class GlComponent;
public:
enum Type
{
@ -26,11 +27,6 @@ public:
Type type;
protected:
#ifdef DEBUG
constexpr static bool debug_mode = true;
#else
constexpr static bool debug_mode = false;
#endif
virtual std::size_t push_child(std::shared_ptr<Component> child) = 0;
virtual std::shared_ptr<Component> get_child(std::size_t index) const = 0;
virtual void remove_child(std::size_t index) = 0;

View file

@ -6,7 +6,7 @@
#include "graphic_context.hpp"
#include "uui/application.hpp"
#include "uui/config.hpp"
#include "uui/types.hpp"
namespace uui
{
@ -16,11 +16,6 @@ class GlApplication final: virtual public Application
friend class GlWindow;
public:
#ifdef DEBUG
constexpr static bool debug_mode = true;
#else
constexpr static bool debug_mode = false;
#endif
std::vector<std::shared_ptr<GlWindow>> windows;
GlApplication();

View file

@ -4,10 +4,10 @@
#include <memory>
#include "graphic_context.hpp"
#include "uui/opengl/component.hpp"
#include "uui/container.hpp"
#include "uui/config.hpp"
#include "uui/opengl/component.hpp"
#include "uui/opengl/window.hpp"
#include "uui/types.hpp"
namespace uui
{
@ -39,7 +39,8 @@ protected:
GlComponent(
std::shared_ptr<GlWindow> window, std::size_t window_index, const position_t x, const position_t y,
const position_t width, const position_t height):
GlComponent(window, window_index, std::static_pointer_cast<GlContainer>(window), window_index, x, y, width, height)
GlComponent(
window, window_index, std::static_pointer_cast<GlContainer>(window), window_index, x, y, width, height)
{}
GlComponent(const GlComponent&) = delete;
GlComponent(GlComponent&&) = default;

View file

@ -6,14 +6,13 @@
#include <memory>
#include <vector>
#include "uui/container.hpp"
#include "uui/component.hpp"
#include "uui/container.hpp"
namespace uui
{
class GlContainer: virtual public Container
{
protected:
GlContainer() = default;
GlContainer(const GlContainer&) = default;

View file

@ -1,9 +1,9 @@
#pragma once
#include "uui/config.hpp"
#include "uui/opengl/application.hpp"
#include "uui/opengl/container.hpp"
#include "uui/opengl/font_manager.hpp"
#include "uui/types.hpp"
#include "uui/window.hpp"
namespace uui

View file

@ -4,7 +4,7 @@
#include <optional>
#include <tuple>
#include "config.hpp"
#include "types.hpp"
namespace uui
{

View file

@ -1,9 +1,9 @@
#pragma once
#include "uui/application.hpp"
#include "uui/config.hpp"
#include "uui/component.hpp"
#include "uui/flex.hpp"
#include "uui/label.hpp"
#include "uui/stack.hpp"
#include "uui/types.hpp"
#include "uui/window.hpp"

View file

@ -5,9 +5,9 @@
#include <vector>
#include "uui/application.hpp"
#include "uui/config.hpp"
#include "uui/container.hpp"
#include "uui/font_manager.hpp"
#include "uui/types.hpp"
namespace uui
{
@ -39,12 +39,6 @@ public:
int height() { return _height; };
protected:
#ifdef DEBUG
constexpr static bool debug_mode = true;
#else
constexpr static bool debug_mode = false;
#endif
std::shared_ptr<Application> _app;
bool _initialized;