mixer brush wip
This commit is contained in:
@@ -54,11 +54,13 @@ public:
|
||||
bool m_dirty_stroke = false;
|
||||
|
||||
static Canvas* I;
|
||||
NodeCanvas* m_node = nullptr;
|
||||
bool m_alpha_lock = false;
|
||||
bool m_touch_lock = true;
|
||||
glm::mat4 m_mv{ 1 };
|
||||
glm::mat4 m_proj{ 1 };
|
||||
glm::vec4 m_box{ 0 };
|
||||
glm::vec4 m_vp{ 0 };
|
||||
glm::vec2 m_pan{ 0 };
|
||||
int m_width = 0;
|
||||
int m_height = 0;
|
||||
@@ -73,6 +75,7 @@ public:
|
||||
Layer m_smask; // selection mask
|
||||
bool m_smask_active = false;
|
||||
RTT m_tmp[6];
|
||||
RTT m_mixer;
|
||||
Texture2D m_brush_mix;
|
||||
Texture2D m_tex[6];
|
||||
Texture2D m_tex2[6];
|
||||
@@ -88,6 +91,7 @@ public:
|
||||
Sampler m_sampler_bg;
|
||||
Sampler m_sampler_mask;
|
||||
Sampler m_sampler_stencil;
|
||||
Sampler m_sampler_mix;
|
||||
glm::vec2 m_cam_rot{ 0 };
|
||||
glm::vec3 m_cam_pos{ 0 };
|
||||
float m_cam_fov = 85;
|
||||
@@ -124,6 +128,7 @@ public:
|
||||
void layer_merge(int source_idx, int dest_idx);
|
||||
void stroke_start(glm::vec2 point, float pressure, const ui::Brush& brush);
|
||||
void stroke_update(glm::vec2 point, float pressure);
|
||||
void stroke_draw_mix();
|
||||
void stroke_draw();
|
||||
void stroke_end();
|
||||
void stroke_cancel();
|
||||
@@ -152,7 +157,6 @@ public:
|
||||
void inject_xmp(std::string jpg_path);
|
||||
ui::Image thumbnail_generate(int w, int h);
|
||||
ui::Image thumbnail_read(std::string data_path);
|
||||
void preview_generate();
|
||||
void draw_objects(std::function<void(const glm::mat4& camera, const glm::mat4& proj, int i)>);
|
||||
void draw_objects(std::function<void(const glm::mat4& camera, const glm::mat4& proj, int i)>, Layer& layer);
|
||||
bool ray_intersect(glm::vec3 ray_origin, glm::vec3 ray_dir, glm::vec3 plane_origin,
|
||||
|
||||
Reference in New Issue
Block a user