From: Matthew Fernandez Date: Sat, 6 Mar 2021 22:50:12 +0000 (-0800) Subject: remove some commented out code X-Git-Tag: 2.47.1~53^2~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=adb98f277da3b71343961c3559ac296a5e02c278;p=graphviz remove some commented out code --- diff --git a/lib/glcomp/glcompfont.c b/lib/glcomp/glcompfont.c index 77ac0d68d..78a512c3f 100644 --- a/lib/glcomp/glcompfont.c +++ b/lib/glcomp/glcompfont.c @@ -27,59 +27,6 @@ static void print_bitmap_string(void *font, char *s) } } -#if 0 -void init_gl_vars(glCompFont * f) -{ - -/* glGetIntegerv(GL_POLYGON_MODE, f->glcache.poly); - - if (f->glcache.poly[0] != GL_FILL) - glPolygonMode(GL_FRONT, GL_FILL); - if (f->glcache.poly[1] != GL_FILL) - glPolygonMode(GL_BACK, GL_FILL); - - f->glcache.istextureon = glIsEnabled(GL_TEXTURE_2D); - if (!f->glcache.istextureon) - glEnable(GL_TEXTURE_2D); - f->glcache.isdepthon = glIsEnabled(GL_DEPTH_TEST); - if (f->glcache.isdepthon) - glDisable(GL_DEPTH_TEST); - f->glcache.islightingon = glIsEnabled(GL_LIGHTING); - if (f->glcache.islightingon) - glDisable(GL_LIGHTING); - glGetIntegerv(GL_MATRIX_MODE, &f->glcache.matrix); - - f->glcache.isblendon = glIsEnabled(GL_BLEND); - glGetIntegerv(GL_BLEND_SRC, &f->glcache.blendfrom); - glGetIntegerv(GL_BLEND_DST, &f->glcache.blendto); - if (&f->glcache.isblendon) - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);*/ -} - -void restore_gl_vars(glCompFont * f) -{ -/* if (f->glcache.poly[0] != GL_FILL) - glPolygonMode(GL_FRONT, f->glcache.poly[0]); - if (f->glcache.poly[1] != GL_FILL) - glPolygonMode(GL_BACK, f->glcache.poly[1]); - - if (f->glcache.islightingon) - glEnable(GL_LIGHTING); - - if (!f->glcache.isblendon) { - glDisable(GL_BLEND); - glBlendFunc(f->glcache.blendfrom, f->glcache.blendto); - } else - glBlendFunc(f->glcache.blendfrom, f->glcache.blendto); - - if (f->glcache.isdepthon) - glEnable(GL_DEPTH_TEST); - if (!f->glcache.istextureon) - glDisable(GL_TEXTURE_2D); - glMatrixMode(f->glcache.matrix);*/ -} -#endif void glprintfglut(void *font, GLfloat xpos, GLfloat ypos, GLfloat zpos, char *bf) { @@ -89,96 +36,6 @@ void glprintfglut(void *font, GLfloat xpos, GLfloat ypos, GLfloat zpos, } -#if 0 -static void -glPrintf(glCompFont * font, GLfloat xpos, GLfloat ypos, GLfloat zpos, - GLfloat width, char *bf, int usez) -{ - -// GLfloat size = font->size; -// GLfloat x = xpos; -// GLfloat y = ypos; - - //set the color - glColor4f(font->color.R, font->color.G, font->color.B, font->color.A); - if (!font) - return; - if (font->type == gluttext) { - glprintfglut(font->glutfont, xpos, ypos, zpos, bf); - return; - } - -} - -void -glprintf(glCompFont * font, GLfloat xpos, GLfloat ypos, GLfloat zpos, - GLfloat width, char *bf) -{ - glPrintf(font, xpos, ypos, zpos, width, bf, 0); -} - -void -glprintfz(glCompFont * font, GLfloat xpos, GLfloat ypos, GLfloat zpos, - GLfloat width, char *bf) -{ - glPrintf(font, xpos, ypos, zpos, width, bf, 0); -} - -static int fontId(fontset_t * fontset, char *fontdesc) -{ - int ind = 0; - for (ind = 0; ind < fontset->count; ind++) { - if (strcmp(fontset->fonts[ind]->fontdesc, fontdesc) == 0) - return ind; - } - return -1; -} - -static int glutfontId(fontset_t * fontset, void *glutfont) -{ - int ind = 0; - for (ind = 0; ind < fontset->count; ind++) { - if (fontset->fonts[ind]->glutfont == glutfont) - return ind; - } - return -1; -} - - -static glCompFont *glut_font_init(void) -{ - glCompFont *font = NEW(glCompFont); - font->color.R = 1.00; - font->color.G = 1.00; - font->color.B = 1.00; - font->color.A = 1.00; - - -/* font->fontheight=12; - font->tIncX=0.0; - font->tIncY=0.0; - font->texId=-1; - font->fontdesc=(char*)0; - - - - - font->tIncX = (float)pow (C_DPI, -1); - font->tIncY = (float)pow (R_DPI, -1); - - - for (y = 1 - font->tIncY; y >= 0; y -= font->tIncY) - { - for (x = 0; x <= 1 - font->tIncX; x += font->tIncX, idx ++) - { - font->bmp[idx][0]=x; - font->bmp[idx][1]=y; - } - }*/ - return font; -} - -#endif void glDeleteFont(glCompFont * f) { free(f->fontdesc); @@ -263,115 +120,6 @@ glCompFont *glNewFontFromParent(glCompObj * o, char *text) return font; } -#if 0 - -#ifndef _WIN32 -#define TMPTEMP "/tmp/_sfXXXX" -#endif - -fontset_t *fontset_init() -{ - fontset_t *fs = NEW(fontset_t); - fs->activefont = -1; - fs->count = 0; -#ifdef _WIN32 - fs->font_directory = "c:/fontfiles"; //FIX ME -#else - fs->font_directory = strdup(TMPTEMP); - mkdtemp(fs->font_directory); -#endif - fs->fonts = 0; - return fs; -} - -static char *fontpath = NULL; -static size_t fontpathsz = 0; - -glCompFont *add_glut_font(fontset_t * fontset, void *glutfont) -{ - int id; - id = glutfontId(fontset, glutfont); - if (id == -1) { - fontset->fonts = - ALLOC(fontset->count + 1, fontset->fonts, glCompFont *); - fontset->fonts[fontset->count] = glut_font_init(); - fontset->fonts[fontset->count]->type = gluttext; - fontset->fonts[fontset->count]->glutfont = glutfont; - fontset->count++; - return fontset->fonts[fontset->count - 1]; - } else - return fontset->fonts[id]; -} - - -glCompFont *add_font(fontset_t * fontset, char *fontdesc, int fs) -{ - int id; - size_t sz; - - id = fontId(fontset, fontdesc); - if (id == -1) { - sz = strlen(fontset->font_directory) + strlen(fontdesc) + 6; - if (sz > fontpathsz) { - fontpathsz = 2 * sz; - fontpath = ALLOC(fontpathsz, fontpath, char); - } -/* sprintf(fontpath, "%s/%s.png", fontset->font_directory, fontdesc); - if (glCompCreateFontFile(fontdesc,fs, fontpath, (float) 32, (float) 32) == - 0) { - fontset->fonts = - ALLOC(fontset->count + 1, fontset->fonts, glCompFont *); - fontset->fonts[fontset->count] = tf = font_init(); - tf->fontdesc = strdup(fontdesc); - fontset->fonts[fontset->count]->type = pangotext; - glGenTextures(1, &(tf->texId)); //get opengl texture name - if ((tf->texId >= 0) && glCompLoadFontPNG(fontpath, tf->texId)) { - fontset->activefont = fontset->count; - fontset->count++; - return fontset->fonts[fontset->count - 1]; - } else - return NULL; - } else - return NULL; - } else - return fontset->fonts[id];*/ - } - - return NULL; -} - -void free_font_set(fontset_t * fontset) -{ - int ind; - for (ind = 0; ind < fontset->count; ind++) { -#ifndef _WIN32 - sprintf(fontpath, "%s/%s.png", fontset->font_directory, - fontset->fonts[ind]->fontdesc); - unlink(fontpath); -#endif - free(fontset->fonts[ind]->fontdesc); - free(fontset->fonts[ind]); - } - free(fontset->fonts); -#ifndef _WIN32 - if (fontset->font_directory) - rmdir(fontset->font_directory); -#endif - if (fontset->font_directory) - free(fontset->font_directory); - free(fontset); -} - -void fontColor(glCompFont * font, float r, float g, float b, float a) -{ - - font->color.R = r; - font->color.G = g; - font->color.B = b; - font->color.A = a; -} -#endif - /*texture base 3d text rendering*/ void glCompDrawText3D(glCompFont * f,GLfloat x,GLfloat y,GLfloat z,GLfloat w,GLfloat h) { @@ -391,24 +139,6 @@ void glCompDrawText3D(glCompFont * f,GLfloat x,GLfloat y,GLfloat z,GLfloat w,GLf glEnable(GL_BLEND); } -#if 0 -/*bitmap base 2D text rendering */ -static void change_fontC(unsigned char* d,int w,int h,glCompColor* c) -{ - int size=w*h*4; - int ind=0; - for (;ind <=size; ind=ind+4) - { - if(d[ind+3] != 0) - { - d[ind]=c->R*255; - d[ind+1]=c->G*255; - d[ind+2]=c->B*255; - d[ind+3]=c->A*255; - } - } -} -#endif void glCompDrawText(glCompFont * f,GLfloat x,GLfloat y) { @@ -457,63 +187,3 @@ void glCompRenderText(glCompFont * f, glCompObj * parentObj) glCompDrawText(f,x,y); } - -#if 0 -#define imageWidth 256 -#define imageHeight 256 -static GLubyte imageData[imageWidth][imageHeight][4]; -#endif - -#if 0 -int glCompLoadFontPNG(char *name, int id) -{ - GLubyte *imageData = NULL; - int imageWidth, imageHeight, idx2, c; - -// imageData = fontGetData (s, size, imageBits); - imageData = glCompLoadPng (name, &imageWidth, &imageHeight); - - c = 0; - idx2 = 0; -/* for (idx=0;idx < imageWidth*imageHeight+30000;idx=idx+1) - { - if (c!=imageData[idx]) - { - c=imageData[idx]; - printf ("%i) %i \n ",idx2,imageData[idx]); - } - - idx2++; - c=((((idx&0x8)==0)^((idx2&0x8))==0))*255; - imageData[idx][idx2][0] = c; - imageData[idx][idx2][1] = c; - imageData[idx][idx2][2] = c; - imageData[idx][idx2][3] = 255; - - }*/ - - - /* no image data */ - if (imageData == NULL) - return -1; - - glBindTexture(GL_TEXTURE_2D, id); - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - /* glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); */ - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - /* glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); */ - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); -// glTexEnvf(GL_TEXTURE_ENV,GL_TEXTURE_ENV_MODE , GL_DECAL); - - glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, imageWidth, imageHeight, 0, - GL_ALPHA, GL_UNSIGNED_BYTE, imageData); -// glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, imageData); - - /* release data, its been uploaded */ - - return 1; -} -#endif