add brush follow-orientation flag to stroke settings and fix stroke preview

This commit is contained in:
2017-08-20 16:01:49 +01:00
parent eee574085b
commit 506923de69
8 changed files with 77 additions and 14 deletions

View File

@@ -16,6 +16,7 @@ public:
float m_tip_flow;
float m_tip_opacity;
float m_tip_angle;
bool m_tip_angle_follow = false;
float m_jitter_scale;
float m_jitter_angle;
float m_jitter_spread;
@@ -25,6 +26,7 @@ public:
struct StrokeSample
{
glm::vec2 pos;
glm::vec2 origin;
float size;
float flow;
float angle;
@@ -64,6 +66,8 @@ public:
float m_step;
Camera m_camera;
ui::Brush m_brush;
cbuffer<float, 3> m_curve_angles;
StrokeSample m_prev_sample;
std::vector<Keypoint> m_keypoints;
std::vector<StrokeSample> m_samples;
int m_last_kp;
@@ -73,7 +77,7 @@ public:
void reset(bool clear_keypoints = false);
bool has_sample();
std::vector<StrokeSample> compute_samples();
StrokeSample randomize_sample(const glm::vec2& pos, float pressure);
StrokeSample randomize_sample(const glm::vec2& pos, float pressure, float curve_angle);
};
NS_END