curl timeout, reorder layers, handle right click osx

This commit is contained in:
2017-04-15 18:55:27 +02:00
parent d230bc7a99
commit 163a435e6e
7 changed files with 65 additions and 5 deletions

View File

@@ -23,8 +23,8 @@ public:
bool m_show_tmp = false;
std::vector<Layer> m_layers;
std::vector<Stroke> m_strokes;
std::vector<int> m_order;
RTT m_tmp;
//RTT m_fb;
Texture2D m_tex;
Texture2D m_tex2;
Sampler m_sampler;
@@ -33,6 +33,7 @@ public:
bool create(int width, int height);
void resize(int width, int height);
void layer_add(std::string name);
void layer_order(int idx, int pos);
void stroke_start(glm::vec2 point, float pressure, const ui::Brush& brush);
void stroke_update(glm::vec2 point, float pressure);
void stroke_draw();