#include "../gfxdevice.h"
#include "../gfxtools.h"
#include "../mem.h"
-#define PNG_INLINE_EXPORTS
#include "../types.h"
-#include "../png.c"
+#include "../png.h"
+#include "../log.h"
#include "render.h"
typedef gfxcolor_t RGBA;
typedef struct _internal_result {
gfximage_t img;
struct _internal_result*next;
+ char palette;
} internal_result_t;
typedef struct _clipbuffer {
int ymin, ymax;
int fillwhite;
+ char palette;
+
RGBA* img;
clipbuffer_t*clipbuf;
internal_result_t*result_next;
} internal_t;
-typedef enum {filltype_solid,filltype_clip,filltype_bitmap} filltype_t;
+typedef enum {filltype_solid,filltype_clip,filltype_bitmap,filltype_gradient} filltype_t;
typedef struct _fillinfo {
- filltype_t type; //0=solid,1=clip
+ filltype_t type;
gfxcolor_t*color;
gfximage_t*image;
gfxmatrix_t*matrix;
gfxcxform_t*cxform;
- char clip;
+ RGBA*gradient;
+ char linear_or_radial;
} fillinfo_t;
if(col.a!=255) {
int ainv = 255-col.a;
- col.r = (col.r*col.a)>>8;
- col.g = (col.g*col.a)>>8;
- col.b = (col.b*col.a)>>8;
+ col.r = (col.r*col.a)/255;
+ col.g = (col.g*col.a)/255;
+ col.b = (col.b*col.a)/255;
do {
if(z[bitpos]&bit) {
- line[x].r = ((line[x].r*ainv)>>8)+col.r;
- line[x].g = ((line[x].g*ainv)>>8)+col.g;
- line[x].b = ((line[x].b*ainv)>>8)+col.b;
+ line[x].r = ((line[x].r*ainv)/255)+col.r;
+ line[x].g = ((line[x].g*ainv)/255)+col.g;
+ line[x].b = ((line[x].b*ainv)/255)+col.b;
//line[x].a = 255;
- line[x].a = ((line[x].a*ainv)>>8)+col.a;
+ line[x].a = ((line[x].a*ainv)/255)+col.a;
}
bit <<= 1;
if(!bit) {
gfxmatrix_t*m = info->matrix;
gfximage_t*b = info->image;
- if(!b->width || !b->height) {
+ if(!b || !b->width || !b->height) {
gfxcolor_t red = {255,255,0,0};
fill_line_solid(line, z, y, x1, x2, red);
return;
int yy = (int)(yy1 - x * yinc1);
int ainv;
- if(info->clip) {
+ if(info->linear_or_radial) {
if(xx<0) xx=0;
if(xx>=b->width) xx = b->width-1;
if(yy<0) yy=0;
ainv = 255-col.a;
/* needs bitmap with premultiplied alpha */
- line[x].r = ((line[x].r*ainv)>>8)+col.r;
- line[x].g = ((line[x].g*ainv)>>8)+col.g;
- line[x].b = ((line[x].b*ainv)>>8)+col.b;
+ line[x].r = ((line[x].r*ainv)/255)+col.r;
+ line[x].g = ((line[x].g*ainv)/255)+col.g;
+ line[x].b = ((line[x].b*ainv)/255)+col.b;
+ line[x].a = 255;
+ }
+ bit <<= 1;
+ if(!bit) {
+ bit = 1;bitpos++;
+ }
+ } while(++x<x2);
+}
+
+static void fill_line_gradient(RGBA*line, U32*z, int y, int x1, int x2, fillinfo_t*info)
+{
+ int x = x1;
+
+ gfxmatrix_t*m = info->matrix;
+ RGBA*g= info->gradient;
+
+ double det = m->m00*m->m11 - m->m01*m->m10;
+ if(fabs(det) < 0.0005) {
+ /* x direction equals y direction */
+ return;
+ }
+
+ det = 1.0/det;
+ double xx1 = ( (-m->tx) * m->m11 - (y - m->ty) * m->m10) * det;
+ double yy1 = (- (-m->tx) * m->m01 + (y - m->ty) * m->m00) * det;
+ double xinc1 = m->m11 * det;
+ double yinc1 = m->m01 * det;
+
+ U32 bit = 1<<(x1&31);
+ int bitpos = (x1/32);
+
+ do {
+ if(z[bitpos]&bit) {
+ RGBA col;
+ int ainv;
+
+ int pos = 0;
+ if(info->linear_or_radial) {
+ double xx = xx1 + x * xinc1;
+ double yy = yy1 + y * yinc1;
+ double r = sqrt(xx*xx + yy*yy);
+ if(r>1) r = 1;
+ pos = (int)(r*255.999);
+ } else {
+ double r = xx1 + x * xinc1;
+ if(r>1) r = 1;
+ if(r<-1) r = -1;
+ pos = (int)((r+1)*127.999);
+ }
+ col = g[pos];
+ ainv = 255-col.a;
+
+ /* needs bitmap with premultiplied alpha */
+ line[x].r = ((line[x].r*ainv)/255)+col.r;
+ line[x].g = ((line[x].g*ainv)/255)+col.g;
+ line[x].b = ((line[x].b*ainv)/255)+col.b;
line[x].a = 255;
}
bit <<= 1;
fill_line_clip(line, zline, y, startx, endx);
else if(fill->type == filltype_bitmap)
fill_line_bitmap(line, zline, y, startx, endx, fill);
- // etc.
+ else if(fill->type == filltype_gradient)
+ fill_line_gradient(line, zline, y, startx, endx, fill);
}
void fill(gfxdevice_t*dev, fillinfo_t*fill)
void fill_solid(gfxdevice_t*dev, gfxcolor_t* color)
{
fillinfo_t info;
+ memset(&info, 0, sizeof(info));
info.type = filltype_solid;
info.color = color;
fill(dev, &info);
} else if(!strcmp(key, "fillwhite")) {
i->fillwhite = atoi(value);
return 1;
+ } else if(!strcmp(key, "palette")) {
+ i->palette = atoi(value);
+ return 1;
}
return 0;
}
memset(c->data, 0, sizeof(U32)*i->bitwidth*i->height2);
}
-void endclip(struct _gfxdevice*dev)
+void endclip(struct _gfxdevice*dev, char removelast)
{
internal_t*i = (internal_t*)dev->internal;
-
- if(!i->clipbuf) {
- fprintf(stderr, "endclip without any active clip buffers");
+
+ /* test for at least one cliplevel (the one we created ourselves) */
+ if(!i->clipbuf || (!i->clipbuf->next && !removelast)) {
+ fprintf(stderr, "endclip without any active clip buffers\n");
return;
}
} else if(line->type == gfx_lineTo) {
double x1=x*i->zoom,y1=y*i->zoom;
double x3=line->x*i->zoom,y3=line->y*i->zoom;
- add_solidline(dev, x1, y1, x3, y3, width * i->multiply);
+ add_solidline(dev, x1, y1, x3, y3, width * i->zoom);
fill_solid(dev, color);
} else if(line->type == gfx_splineTo) {
int t,parts;
double nx = (double)(t*t*x3 + 2*t*(parts-t)*x2 + (parts-t)*(parts-t)*x1)/(double)(parts*parts);
double ny = (double)(t*t*y3 + 2*t*(parts-t)*y2 + (parts-t)*(parts-t)*y1)/(double)(parts*parts);
- add_solidline(dev, xx, yy, nx, ny, width * i->multiply);
+ add_solidline(dev, xx, yy, nx, ny, width * i->zoom);
fill_solid(dev, color);
xx = nx;
yy = ny;
xx=x1;
yy=y1;
- parts = (int)(sqrt(c)/3);
+ parts = (int)(sqrt(c));
if(!parts) parts = 1;
for(t=1;t<=parts;t++) {
{
internal_t*i = (internal_t*)dev->internal;
fillinfo_t info;
+ memset(&info, 0, sizeof(info));
newclip(dev);
info.type = filltype_clip;
draw_line(dev, line);
void render_endclip(struct _gfxdevice*dev)
{
internal_t*i = (internal_t*)dev->internal;
- endclip(dev);
+ endclip(dev, 0);
}
void render_fill(struct _gfxdevice*dev, gfxline_t*line, gfxcolor_t*color)
{
internal_t*i = (internal_t*)dev->internal;
- gfxcolor_t black = {255,0,0,0};
-
gfxmatrix_t m2 = *matrix;
draw_line(dev, line);
fillinfo_t info;
+ memset(&info, 0, sizeof(info));
info.type = filltype_bitmap;
info.image = img;
info.matrix = &m2;
{
internal_t*i = (internal_t*)dev->internal;
- gfxcolor_t black = {255,0,0,0};
+ gfxmatrix_t m2 = *matrix;
draw_line(dev, line);
- fill_solid(dev, &black);
+
+ RGBA g[256];
+ fillinfo_t info;
+ memset(&info, 0, sizeof(info));
+ info.type = filltype_gradient;
+ info.gradient = g;
+ info.matrix = &m2;
+
+ m2.m00 *= i->zoom; m2.m01 *= i->zoom; m2.tx *= i->zoom;
+ m2.m10 *= i->zoom; m2.m11 *= i->zoom; m2.ty *= i->zoom;
+
+ info.linear_or_radial = type == gfxgradient_radial;
+
+ int pos = 0;
+ gfxcolor_t color = {0,0,0,0};
+ pos=0;
+ while(gradient) {
+ int nextpos = gradient->pos*256;
+ int t;
+ if(nextpos>256) {
+ msg("<error> Invalid gradient- contains values > 1.0");
+ return;
+ }
+
+ gfxcolor_t nextcolor = gradient->color;
+ if(nextpos!=pos) {
+ double p0 = 1.0;
+ double p1 = 0.0;
+ double step = 1.0/(nextpos-pos);
+ int t;
+ for(t=pos;t<nextpos;t++) {
+ g[t].r = color.r*p0 + nextcolor.r*p1;
+ g[t].g = color.g*p0 + nextcolor.g*p1;
+ g[t].b = color.b*p0 + nextcolor.b*p1;
+ g[t].a = color.a*p0 + nextcolor.a*p1;
+ p0 -= step;
+ p1 += step;
+ }
+ }
+ color=nextcolor;
+
+ pos = nextpos;
+ gradient = gradient->next;
+ }
+ if(pos!=256) {
+ msg("<error> Invalid gradient- doesn't end with 1.0");
+ }
+
+ fill(dev, &info);
}
void render_addfont(struct _gfxdevice*dev, gfxfont_t*font)
}
while(i->next) {
sprintf(filenamebuf, "%s.%d.png", origname, nr);
- writePNG(filename, (unsigned char*)i->img.data, i->img.width, i->img.height);
+ if(!i->palette) {
+ writePNG(filename, (unsigned char*)i->img.data, i->img.width, i->img.height);
+ } else {
+ writePalettePNG(filename, (unsigned char*)i->img.data, i->img.width, i->img.height);
+ }
nr++;
}
free(origname);
} else {
- writePNG(filename, (unsigned char*)i->img.data, i->img.width, i->img.height);
+ if(!i->palette) {
+ writePNG(filename, (unsigned char*)i->img.data, i->img.width, i->img.height);
+ } else {
+ writePalettePNG(filename, (unsigned char*)i->img.data, i->img.width, i->img.height);
+ }
}
return 1;
}
int d= 256/depth;
char*str = (char*)malloc(img->width*img->height*4 + 500 + 16*depth*depth*depth);
char*p = str;
- p+= sprintf(p, "static char *noname[] = {\n\"%d %d 262144 3\",\n");
+ p+= sprintf(p, "static char *noname[] = {\n\"%d %d 262144 3\",\n", img->width, img->height);
int r,g,b;
for(r=0;r<depth;r++)
for(g=0;g<depth;g++)
exit(1);
}
- endclip(dev);
+ endclip(dev, 1);
+ int unclosed = 0;
while(i->clipbuf) {
- fprintf(stderr, "Warning: unclosed clip while processing endpage()\n");
- endclip(dev);
+ endclip(dev, 1);
+ unclosed++;
+ }
+
+ if(unclosed) {
+ fprintf(stderr, "Warning: %d unclosed clip(s) while processing endpage()\n", unclosed);
}
internal_result_t*ir= (internal_result_t*)rfx_calloc(sizeof(internal_result_t));
+ ir->palette = i->palette;
int y,x;
dev->finish = render_finish;
}
+
+gfxdevice_t* gfxdevice_render_new()
+{
+ gfxdevice_t* d = (gfxdevice_t*)malloc(sizeof(gfxdevice_t));
+ gfxdevice_render_init(d);
+ return d;
+}
git.asbjorn.biz / swftools.git / blobdiff