diff --git a/src/abr.cpp b/src/abr.cpp index c268c73..3e7737f 100644 --- a/src/abr.cpp +++ b/src/abr.cpp @@ -153,6 +153,42 @@ std::vector> ABR::compute_brushes(const std::string& path } } + if (p->value("useTipDynamics")) + { + // other properties 'brushProjection', 'minimumRoundness', 'roundnessDynamics', 'tiltScale' + + auto jitter_size = p->get("szVr"); + if (jitter_size) + { + b->m_jitter_scale = jitter_size->value("jitter") * 0.01f; + // TODO: p->value("minimumDiameter") * 0.001f; // minimum size + } + + auto jitter_angle = p->get("angleDynamics"); + if (jitter_angle) + { + auto mode = jitter_angle->value("bVTy"); + if (mode == 0) + { + b->m_jitter_angle = jitter_angle->value("jitter") * 0.01f; + } + else if (mode == 5) + { + b->m_jitter_angle = jitter_angle->value("jitter") * 0.01f; + b->m_tip_angle_follow = true; + } + else if (mode == 6) + { + b->m_jitter_angle = jitter_angle->value("jitter") * 0.01f; + b->m_tip_angle_follow = true; // temporary use full direction + // TODO: implement initial direction only + } + } + + b->m_tip_randflipx = p->value("flipX"); + b->m_tip_randflipy = p->value("flipY"); + } + std::vector modes = { "normal", // normal (not in Photoshop) "Mltp", // multiply diff --git a/src/app.cpp b/src/app.cpp index 5f6ab5b..fc1764c 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -403,16 +403,16 @@ void App::init() LOG("GL vendor: %s", glGetString(GL_VENDOR)); LOG("GL renderer: %s", glGetString(GL_RENDERER)); - GLint n_exts; - glGetIntegerv(GL_NUM_EXTENSIONS, &n_exts); - for (int i = 0; i < n_exts; i++) - { - std::string ext = (const char*)glGetStringi(GL_EXTENSIONS, i); - //if (ext.find("debug") != std::string::npos) - { - LOG("%s", glGetStringi(GL_EXTENSIONS, i)); - } - } + //GLint n_exts; + //glGetIntegerv(GL_NUM_EXTENSIONS, &n_exts); + //for (int i = 0; i < n_exts; i++) + //{ + // std::string ext = (const char*)glGetStringi(GL_EXTENSIONS, i); + // //if (ext.find("debug") != std::string::npos) + // { + // LOG("%s", glGetStringi(GL_EXTENSIONS, i)); + // } + //} LOG("Screen Resolution: %dx%d", (int)width, (int)height);