complete refactoring and cleanup old layout loading code

This commit is contained in:
2017-01-27 13:20:39 +00:00
parent 81494cca6e
commit a4be7c0e4d
8 changed files with 398 additions and 730 deletions

View File

@@ -3,6 +3,7 @@
#include "shader.hpp"
#include "shape.hpp"
#include "texture.hpp"
#include "layout.h"
class App
{
@@ -11,13 +12,8 @@ class App
Shader shader_color;
Shader shader_uv;
Plane plane;
std::vector<std::unique_ptr<Shape>> shapes_list;
Circle circle, circle2, circle3, circle4;
Rounded rounded;
Slice9 slice;
Texture2D tex;
YGNodeRef y_root { nullptr };
struct stat g_file_info { 0 };
Node layout;
public:
static App I;
float width;
@@ -29,6 +25,4 @@ public:
void mouse_down(int button, float x, float y);
void mouse_move(float x, float y);
void mouse_up(int button, float x, float y);
void update_layout();
void load_layout();
};