move abr import to main menu, add progress bar

This commit is contained in:
2019-02-23 00:45:14 +01:00
parent edc2bacc90
commit e1f82373c6
11 changed files with 163 additions and 98 deletions

View File

@@ -28,12 +28,12 @@ mediump float blend_stroke_color_dodge(mediump float base, mediump float stroke)
mediump float blend_stroke_color_burn(mediump float base, mediump float stroke)
{
if (base == 0.0)
return 0.0;
else if (stroke == 1.0)
if (base == 1.0)
return 1.0;
else if (stroke == 0.0)
return 0.0;
else
return 1.0 - (1.0 - base) / stroke;
return 1.0 - min(1.0, (1.0 - base) / stroke);
}
mediump float blend_stroke_linear_height(mediump float base, mediump float stroke, mediump float depth)