git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-13 11:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

gl_engine: correct the stroke alpha calculation

Browse source 
The wrong matrix scale factor value caused the stroke alpha to be zero
when the matrix contains rotation.
This commit is contained in:
RuiwenTang 2024-11-26 10:56:57 +08:00 • committed by Hermet Park
parent 968e438d25
commit 1a766ec00e
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/renderer/gl_engine/tvgGlCommon.h
View file

@ -57,6 +57,11 @@
} while(0) } while(0)
#endif #endif
static inline float getScaleFactor(const Matrix& m)
{
return sqrtf(m.e11 * m.e11 + m.e21 * m.e21);
}
enum class GlStencilMode { enum class GlStencilMode {
None, None,
FillWinding, FillWinding,

2
src/renderer/gl_engine/tvgGlRenderer.cpp
View file

@ -162,7 +162,7 @@ void GlRenderer::drawPrimitive(GlShape& sdata, const RenderColor& c, RenderUpdat
auto a = MULTIPLY(c.a, sdata.opacity); auto a = MULTIPLY(c.a, sdata.opacity);
if (flag & RenderUpdateFlag::Stroke) { if (flag & RenderUpdateFlag::Stroke) {
float strokeWidth = sdata.rshape->strokeWidth() * sdata.geometry->getTransformMatrix().e11; float strokeWidth = sdata.rshape->strokeWidth() * getScaleFactor(sdata.geometry->getTransformMatrix());
if (strokeWidth < MIN_GL_STROKE_WIDTH) { if (strokeWidth < MIN_GL_STROKE_WIDTH) {
float alpha = strokeWidth / MIN_GL_STROKE_WIDTH; float alpha = strokeWidth / MIN_GL_STROKE_WIDTH;
a = MULTIPLY(a, static_cast<uint8_t>(alpha * 255)); a = MULTIPLY(a, static_cast<uint8_t>(alpha * 255));

2
src/renderer/gl_engine/tvgGlTessellator.cpp
View file

@ -1534,7 +1534,7 @@ void Stroker::stroke(const RenderShape *rshape)
mStrokeWidth = rshape->strokeWidth(); mStrokeWidth = rshape->strokeWidth();
if (isinf(mMatrix.e11)) { if (isinf(mMatrix.e11)) {
auto strokeWidth = rshape->strokeWidth() * mMatrix.e11; auto strokeWidth = rshape->strokeWidth() * getScaleFactor(mMatrix);
if (strokeWidth <= MIN_GL_STROKE_WIDTH) strokeWidth = MIN_GL_STROKE_WIDTH; if (strokeWidth <= MIN_GL_STROKE_WIDTH) strokeWidth = MIN_GL_STROKE_WIDTH;
mStrokeWidth = strokeWidth / mMatrix.e11; mStrokeWidth = strokeWidth / mMatrix.e11;
} }