X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fopengl.c;h=c8efc053b12c71fe2a28c3a70efe4024c4a3ad8f;hb=b93de056e0b79f57c8f8fe22985b166c7d2c3dc3;hp=36ffcc76af79b3948de9622dddc6dcad3eb8d4ef;hpb=31a4d882fdb72976fd66562b7bd410eda1638ac0;p=swftools.git

diff --git a/lib/devices/opengl.c b/lib/devices/opengl.c
index 36ffcc7..c8efc05 100644
--- a/lib/devices/opengl.c
+++ b/lib/devices/opengl.c
@@ -16,7 +16,8 @@
 #include <stdarg.h>
 
 //#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;
@@ -67,12 +68,12 @@ 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)
 {
@@ -263,7 +264,8 @@ void opengl_fill(struct _gfxdevice*dev, gfxline_t*line, gfxcolor_t*color)
     double z;
     dbg("fill");
     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 ++;
@@ -476,6 +478,8 @@ void opengl_addfont(gfxdevice_t*dev, gfxfont_t*font)
 void opengl_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyphnr, gfxcolor_t*color, gfxmatrix_t*matrix)
 {
     internal_t*i = (internal_t*)dev->internal;
+    if(!font)
+	return;
 
     if(i->font && i->font->id && !strcmp(font->id, i->font->id)) {
 	// current font is correct
@@ -490,8 +494,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;
 	}
     }
 
@@ -578,7 +584,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);