omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move abr import to main menu, add progress bar

Browse Source
This commit is contained in:
omigamedev
2019-02-23 00:45:14 +01:00
parent edc2bacc90
commit e1f82373c6
11 changed files with 163 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/layout.xml
View File

@@ -136,7 +136,7 @@
<layout id="tpl-panel-stroke">
<node width="250" margin="0 0 10 0" rtl="ltr">
<border height="30" color=".5" align="center" justify="center">
<text text="Stroke" color="1 1 1 1"/>
<text text="Brush Settings" color="1 1 1 1"/>
</border>
<border color=".3" pad="5" dir="col" width="100%">
@@ -503,7 +503,7 @@
<border color=".2" height="20" dir="row" justify="center" align="center" margin="5 0 5 0">
<node align="center" width="1" grow="1">
<text text="Color Variations"/>
<text text="Pressure Variations"/>
</node>
<button id="button-unfold-colorvar" width="30" height="18" text="+"/>
</border>

8
data/shaders/include/blend-stroke.glsl
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)