summaryrefslogtreecommitdiffstatsci
path: root/src/vkvg_pattern.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/vkvg_pattern.c')
-rw-r--r--src/vkvg_pattern.c31
1 files changed, 11 insertions, 20 deletions
diff --git a/src/vkvg_pattern.c b/src/vkvg_pattern.c
index 8c9eda1..5fdf28c 100644
--- a/src/vkvg_pattern.c
+++ b/src/vkvg_pattern.c
@@ -3,43 +3,37 @@
#include "vkvg_device_internal.h"
#include "vkvg_pattern.h"
-VkvgPattern _init_pattern (VkvgDevice dev){
+VkvgPattern vkvg_pattern_create(){
VkvgPattern pat = (vkvg_pattern_t*)calloc(1, sizeof(vkvg_pattern_t));
- pat->dev = dev;
- return pat;
-}
-
-VkvgPattern vkvg_pattern_create(VkvgDevice dev){
- VkvgPattern pat = _init_pattern (dev);
pat->type = VKVG_PATTERN_TYPE_SOLID;
pat->data = (vkvg_color_t*)calloc(1,sizeof(vkvg_color_t));
return pat;
}
VkvgPattern vkvg_pattern_create_for_surface (VkvgSurface surf){
- VkvgPattern pat = _init_pattern (surf->dev);
+ VkvgPattern pat = (vkvg_pattern_t*)calloc(1, sizeof(vkvg_pattern_t));
pat->data = surf;
return pat;
}
-VkvgPattern vkvg_pattern_create_linear (VkvgDevice dev, float x0, float y0, float x1, float y1){
- VkvgPattern pat = _init_pattern (dev);
-
+VkvgPattern vkvg_pattern_create_linear (float x0, float y0, float x1, float y1){
+ VkvgPattern pat = (vkvg_pattern_t*)calloc(1, sizeof(vkvg_pattern_t));
+ pat->type = VKVG_PATTERN_TYPE_LINEAR;
vkvg_gradient_t* grad = (vkvg_gradient_t*)calloc(1,sizeof(vkvg_gradient_t));
- vec2 cp0 = {x0, y0}, cp1 = {x1, y1};
+ vec4 cp0 = {x0, y0}, cp1 = {x1, y1};
grad->cp[0] = cp0;
grad->cp[1] = cp1;
pat->data = grad;
return pat;
}
-VkvgPattern vkvg_pattern_create_radial (VkvgDevice dev, float cx0, float cy0, float radius0,
+VkvgPattern vkvg_pattern_create_radial (float cx0, float cy0, float radius0,
float cx1, float cy1, float radius1){
- VkvgPattern pat = _init_pattern (dev);
+ VkvgPattern pat = (vkvg_pattern_t*)calloc(1, sizeof(vkvg_pattern_t));
vkvg_gradient_t* grad = (vkvg_gradient_t*)calloc(1,sizeof(vkvg_gradient_t));
- vec2 cp0 = {cx0, cy0}, cp1 = {cx1, cy1}, rads = {radius0, radius1};
+ vec4 cp0 = {cx0, cy0}, cp1 = {cx1, cy1}, rads = {radius0, radius1};
grad->cp[0] = cp0;
grad->cp[1] = cp1;
grad->cp[2] = rads;
@@ -56,16 +50,13 @@ void vkvg_patter_add_color_stop (VkvgPattern pat, float offset, float r, float g
vkvg_gradient_t* grad = (vkvg_gradient_t*)pat->data;
vkvg_color_t c = {r,g,b,a};
grad->colors[grad->count] = c;
- grad->stops[grad->count] = offset;
+ grad->stops[grad->count].r = offset;
+ grad->count++;
}
void vkvg_pattern_set_extend (VkvgPattern pat, vkvg_extend_t extend){
pat->extend = extend;
}
-void vkvg_set_source (VkvgContext ctx, VkvgPattern pat){
-
-}
-
void vkvg_pattern_destroy(VkvgPattern pat)
{
if (pat->type != VKVG_PATTERN_TYPE_SURFACE)