test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-11-30 02:58:26 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

improve agge linear_gradient

Browse Source
This commit is contained in:
xianjimli 2018-12-07 18:00:04 +08:00
parent 1e7d717316
commit e2a2ffd2f5
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
3rd/agge/agge/blender_linear_gradient.h
View File

@ -22,7 +22,7 @@ class blender_linear_gradient {
float _ey;
float _dx;
float _dy;
float _d;
float _dot_product_1;
float _xw;
float _yw;
pixel32_rgba _sc;
@ -32,11 +32,15 @@ class blender_linear_gradient {
template <typename PixelT>
inline blender_linear_gradient<PixelT>::blender_linear_gradient(float sx, float sy, float ex, float ey,
pixel32_rgba sc, pixel32_rgba ec) : _sx(sx), _sy(sy), _ex(ex), _ey(ey), _sc(sc), _ec(ec) {
if(sx == ex && sy == ey) {
assert(!"invalid params");
_ex = _sx + 1;
_ey = _sy + 1;
}
_dx = ex - sx;
_dy = ey - sy;
_xw = _dx / (_dx + _dy);
_yw = _dy / (_dx + _dy);
_d = sqrt(_dx * _dx + _dy * _dy);
_dot_product_1 = 1/(_dx * _dx + _dy * _dy);
}
template <typename PixelT>
@ -65,9 +69,17 @@ inline bool blender_linear_gradient<PixelT>::get_color(int x, int y, pixel32_rgb
} else if(_sy == _ey) {
return this->gradient((x - _sx)/_dx, c);
} else {
/*TODO*/
c = _ec;
return true;
//https://github.com/SFML/SFML/wiki/Source:-Color-Gradient
if(x < _sx || y < _sy) {
c = _sc;
} else if(x > _ex || y > _ey) {
c = _ec;
} else {
float dot_product = (x - _sx) * _dx + (y - _sy) * _dy;
float factor = dot_product * _dot_product_1;
return this->gradient(factor, c);
}
}
return true;

2
docs/changes.md
View File

@ -1,6 +1,6 @@
# 最新动态
* 2018/12/07
* VGCanvas支持渐变色(GL版本OK，AGGE版本还需要完善，AGG版本暂时不支持)。
* VGCanvas支持渐变色(GL版本OK，AGGE版本OK，AGG版本暂时不支持)。
* demoui增加vgcanvas的demo。
* draw\_vline高度允许为负。
* draw\_hline宽度允许为负。