X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fopengl.c;h=fd1b745681eac6872bf10836f1b110649a15d7c1;hb=3116692a2512f2bfae346a1074d1fdfa00ea9d2c;hp=366f24934bddcf153ea686b6821e4e28973bd33a;hpb=d3fb559b6b8ca9c122b310cae1a3e8b0805f97ad;p=swftools.git diff --git a/lib/devices/opengl.c b/lib/devices/opengl.c index 366f249..fd1b745 100644 --- a/lib/devices/opengl.c +++ b/lib/devices/opengl.c @@ -16,7 +16,8 @@ #include //#define ZSTEP (1/65536.0) -#define ZSTEP (1/4.0) +#define ZSTEP (1/32.0) +//#define ZSTEP (1/4.0) typedef struct _fontlist { gfxfont_t*font; @@ -46,7 +47,7 @@ static void dbg(char*format, ...) if(!verbose) return; va_start(arglist, format); - vsprintf(buf, format, arglist); + vsnprintf(buf, sizeof(buf)-1, format, arglist); va_end(arglist); l = strlen(buf); while(l && buf[l-1]=='\n') { @@ -67,16 +68,16 @@ void CALLBACK errorCallback(GLenum errorCode) { const GLubyte *estring; estring = gluErrorString(errorCode); - dbg("Tessellation Error: %s\n", estring); + printf("Tessellation Error: %s\n", estring); exit(0); } void CALLBACK beginCallback(GLenum which) { - glBegin(which); + glBegin(which); } void CALLBACK endCallback(void) { - glEnd(); + glEnd(); } void CALLBACK vertexCallback(GLvoid *vertex) { @@ -100,14 +101,18 @@ void CALLBACK vertexCallbackTex(GLvoid *vertex) } void CALLBACK combineCallbackTex(GLdouble coords[3], GLdouble *data[4], GLfloat w[4], GLdouble **out) { - GLdouble *vertex, *texCoord; + GLdouble *vertex; vertex = (GLdouble *) malloc(5 * sizeof(GLdouble)); vertex[0] = coords[0]; vertex[1] = coords[1]; vertex[2] = coords[2]; - texCoord = &vertex[3]; - vertex[3] = w[0]*data[0][3] + w[1]*data[1][3] + w[2]*data[2][3] + w[3]*data[3][3]; - vertex[4] = w[0]*data[0][4] + w[1]*data[1][4] + w[2]*data[2][4] + w[3]*data[3][4]; + if(data[2] && data[3]) { + vertex[3] = w[0]*data[0][3] + w[1]*data[1][3] + w[2]*data[2][3] + w[3]*data[3][3]; + vertex[4] = w[0]*data[0][4] + w[1]*data[1][4] + w[2]*data[2][4] + w[3]*data[3][4]; + } else { + vertex[3] = w[0]*data[0][3] + w[1]*data[1][3]; + vertex[4] = w[0]*data[0][4] + w[1]*data[1][4]; + } *out = vertex; } @@ -261,9 +266,10 @@ void tesselatePolygon(GLUtesselator*tesselator, double z, gfxline_t*line) void opengl_fill(struct _gfxdevice*dev, gfxline_t*line, gfxcolor_t*color) { double z; - dbg("fill"); + dbg("fill %02x%02x%02x%02x", color->a, color->r, color->g, color->b); internal_t*i = (internal_t*)dev->internal; - + + glDisable(GL_TEXTURE_2D); glColor4f(color->r/255.0, color->g/255.0, color->b/255.0, color->a/255.0); i->currentz ++; @@ -288,12 +294,13 @@ typedef struct _imgopengl gfxhash_t hash; GLuint texID; int width, height; + unsigned char*data; struct _imgopengl*next; } imgopengl_t; -imgopengl_t*img2texid = 0; +static imgopengl_t*img2texid = 0; -gfxhash_t gfximage_hash(gfximage_t*img) +static gfxhash_t gfximage_hash(gfximage_t*img) { int t; int size = img->width*img->height*4; @@ -303,7 +310,22 @@ gfxhash_t gfximage_hash(gfximage_t*img) return hash; } -imgopengl_t*addTexture(gfximage_t*img) +static void delTextures() +{ + imgopengl_t*i = img2texid; + while(i) { + imgopengl_t*next = i->next; + if(i->data) { + glDeleteTextures(1, &i->texID); + free(i->data); + } + memset(i, 0, sizeof(imgopengl_t)); + free(i); + i = next; + } +} + +static imgopengl_t*addTexture(gfximage_t*img) { gfxhash_t hash = gfximage_hash(img); imgopengl_t*i = img2texid; @@ -337,6 +359,7 @@ imgopengl_t*addTexture(gfximage_t*img) i->height = newheight; unsigned char*data = malloc(newwidth*newheight*4); + i->data = data; int x,y; for(y=0;yheight;y++) { for(x=0;xwidth;x++) { @@ -378,7 +401,7 @@ void opengl_fillbitmap(struct _gfxdevice*dev, gfxline_t*line, gfximage_t*img, gf int len = 0; double*xyz=0; gfxline_t*l=0; - glColor4f(1.0,0,0,1.0); + glColor4f(1.0,0,0.7,1.0); i->currentz ++; @@ -492,8 +515,10 @@ void opengl_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyphnr, gfxcolor_t*co l = l->next; } if(i->font == 0) { - fprintf(stderr, "Unknown font id: %s", font->id); - return; + opengl_addfont(dev, font); + i->font = font; + //fprintf(stderr, "Unknown font id: %s", font->id); + //return; } } @@ -511,7 +536,7 @@ void opengl_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyphnr, gfxcolor_t*co -void opengl_drawlink(struct _gfxdevice*dev, gfxline_t*line, char*action) +void opengl_drawlink(struct _gfxdevice*dev, gfxline_t*line, const char*action) { dbg("link"); } @@ -521,12 +546,12 @@ void opengl_endpage(struct _gfxdevice*dev) dbg("endpage"); } -int opengl_result_save(struct _gfxresult*gfx, char*filename) +int opengl_result_save(struct _gfxresult*gfx, const char*filename) { dbg("result:save"); return 0; } -void* opengl_result_get(struct _gfxresult*gfx, char*name) +void* opengl_result_get(struct _gfxresult*gfx, const char*name) { dbg("result:get"); return 0; @@ -535,6 +560,7 @@ void opengl_result_destroy(struct _gfxresult*gfx) { dbg("result:destroy"); free(gfx); + delTextures(); } gfxresult_t*opengl_finish(struct _gfxdevice*dev) @@ -580,7 +606,7 @@ void gfxdevice_opengl_init(gfxdevice_t*dev) gluTessCallback(i->tesselator, GLU_TESS_VERTEX, (callbackfunction_t)vertexCallback); gluTessCallback(i->tesselator, GLU_TESS_BEGIN, (callbackfunction_t)beginCallback); gluTessCallback(i->tesselator, GLU_TESS_END, (callbackfunction_t)endCallback); - //gluTessCallback(i->tesselator, GLU_TESS_COMBINE, (callbackfunction_t)combineCallback); + gluTessCallback(i->tesselator, GLU_TESS_COMBINE, (callbackfunction_t)combineCallback); i->tesselator_line = gluNewTess(); gluTessCallback(i->tesselator_line, GLU_TESS_ERROR, (callbackfunction_t)errorCallback);