From 86fdf75c49deaf40d2724ac227b422ba3669b9c9 Mon Sep 17 00:00:00 2001 From: arif Date: Thu, 2 Apr 2009 20:55:30 +0000 Subject: [PATCH] better font rendering performence woth glut fonts --- cmd/smyrna/smyrna.vcproj | 4 +- cmd/smyrna/topfisheyeview.c | 10 ++--- cmd/smyrna/topview.c | 42 ++++++++++------- graphviz.sln | 89 ++++++++++++++++++++----------------- lib/glcomp/glcompbutton.c | 1 - lib/glcomp/glcomptext.h | 1 + 6 files changed, 81 insertions(+), 66 deletions(-) diff --git a/cmd/smyrna/smyrna.vcproj b/cmd/smyrna/smyrna.vcproj index ab93467cb..55512a789 100644 --- a/cmd/smyrna/smyrna.vcproj +++ b/cmd/smyrna/smyrna.vcproj @@ -40,7 +40,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE"" Optimization="0" - AdditionalIncludeDirectories=""C:\graphviz-ms\graphviz2\lib\windirent";"$(SolutionDir)/lib/gvc";"C:\gtk\include\libglade-2.0";"$(SolutionDir)/lib/neatogen";"$(SolutionDir)/lib/sparse";"$(SolutionDir)/lib/topfish";"C:\gtk\lib\gtkglext-1.0\include";"C:\gtk\include\gtkglext-1.0\";C:\gtk\include\cairo;"C:\gtk\include\atk-1.0";"C:\gtk\lib\gtk-2.0\include\cairo";"C:\gtk\lib\gtk-2.0\include";"C:\gtk\include\gtk-2.0\";"$(SolutionDir)/cmd/smyrna/gui";"$(SolutionDir)/cmd/smyrna";"$(SolutionDir)";"$(SolutionDir)/lib/glcomp";"C:\gtk\lib\glib-2.0\include";"C:\gtk\include\glib-2.0";"C:\gtk\include\pango-1.0\";C:\gtk\include;"$(SolutionDir)/lib/common";"$(SolutionDir)/lib/cdt";"$(SolutionDir)/lib/cgraph";"$(SolutionDir)/windows\lib\ingraphs";"$(SolutionDir)/lib/xdot";"$(SolutionDir)/lib/otk_lib"" + AdditionalIncludeDirectories=""C:\graphviz-ms\graphviz2\lib\windirent";"$(SolutionDir)/lib/gvc";"C:\gtk\include\libglade-2.0";"$(SolutionDir)/lib/neatogen";"$(SolutionDir)/lib/sparse";"$(SolutionDir)/lib/topfish";"C:\gtk\lib\gtkglext-1.0\include";"C:\gtk\include\gtkglext-1.0\";C:\gtk\include\cairo;"C:\gtk\include\atk-1.0";"C:\gtk\lib\gtk-2.0\include\cairo";"C:\gtk\lib\gtk-2.0\include";"C:\gtk\include\gtk-2.0\";"$(SolutionDir)/cmd/smyrna/gui";"$(SolutionDir)/cmd/smyrna";"$(SolutionDir)";"$(SolutionDir)/lib/glcomp";"C:\gtk\lib\glib-2.0\include";"C:\gtk\include\glib-2.0";"C:\gtk\include\pango-1.0\";C:\gtk\include;"$(SolutionDir)/lib/common";"$(SolutionDir)/lib/cdt";"$(SolutionDir)/lib/cgraph";"$(SolutionDir)/windows\lib\ingraphs";"$(SolutionDir)/lib/xdot";"$(SolutionDir)/lib/glut/glut-3.7.6-bin"" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_CONFIG_H;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -118,7 +118,7 @@ /> fs->foci_nodes[0]) &&(focusnodes)) { - fs=view->FontSizeConst*(float)1.4; - fontColor(view->fontset->fonts[view->fontset->activefont],(float)0, (float)0, (float)1, (float)1); + glColor4f((float)0, (float)0, (float)1, (float)1); view->fontset->fonts[view->fontset->activefont]->fontheight=fs; - glprintf(view->fontset->fonts[view->fontset->activefont],gg[v].physical_x_coord,gg[v].physical_y_coord, (fs*strlen(buf)*(GLfloat)0.4),buf); + glprintfglut(GLUT_BITMAP_HELVETICA_18,gg[v].physical_x_coord,gg[v].physical_y_coord,buf); } else if (finenodes) { - fs=view->FontSizeConst*1.2; - fontColor(view->fontset->fonts[view->fontset->activefont],0, 0, 0, 1); + glColor4f(0, 0, 0, 1); view->fontset->fonts[view->fontset->activefont]->fontheight=fs; - glprintf(view->fontset->fonts[view->fontset->activefont],gg[v].physical_x_coord,gg[v].physical_y_coord, (fs*strlen(buf)*(GLfloat)0.4),buf); + glprintfglut(GLUT_BITMAP_HELVETICA_10,gg[v].physical_x_coord,gg[v].physical_y_coord,buf); } } diff --git a/cmd/smyrna/topview.c b/cmd/smyrna/topview.c index eb699d9b5..0c1846320 100755 --- a/cmd/smyrna/topview.c +++ b/cmd/smyrna/topview.c @@ -19,6 +19,7 @@ #include "glcomppanel.h" #include "glcomplabel.h" #include "gltemplate.h" +#include "glutils.h" #include "topview.h" #include "math.h" #include "memory.h" @@ -637,8 +638,9 @@ static int draw_node_hint_boxes(void) { int ind; char buf[512]; - float fs = view->FontSizeConst; - strcpy(buf,"line 1:12334444 \n line 2:falan filan"); + GLfloat fontwidth; + float fs = GetOGLDistance(12); + for (ind = 0; ind < view->Topview->picked_node_count; ind++) { // int draw_node_hintbox(GLfloat x,GLfloat y,GLfloat z,GLfloat fs,char* text) draw_node_hintbox(view->Topview->picked_nodes[ind]->distorted_x, @@ -648,17 +650,15 @@ static int draw_node_hint_boxes(void) ) ; view->fontset->fonts[view->fontset->activefont]->fontheight=fs; - fontColor(view->fontset->fonts[view->fontset->activefont],0, 0, 1, 1); - + /*blue font color*/ +// fontwidth=GetOGLDistance(glutBitmapLength(GLUT_BITMAP_HELVETICA_12,agnameof(view->Topview->picked_nodes[ind]->Node))); + glColor4f(0, 0, 1, 1); + glprintfglut (GLUT_BITMAP_HELVETICA_12, view->Topview->picked_nodes[ind]->distorted_x, + (view->Topview->picked_nodes[ind]->distorted_y+fs+fs/(GLfloat)5.0) , + agnameof(view->Topview->picked_nodes[ind]->Node)); - glRasterPos3f(GLUT_BITMAP_HELVETICA_12, (view->Topview->picked_nodes[ind]->distorted_x), - (view->Topview->picked_nodes[ind]-> - distorted_y+fs+fs/(GLfloat)5.0 ), - fs * - (float)strlen(agnameof(view->Topview->picked_nodes[ind]->Node)) / (GLfloat)2.0) - glprintfglut (GLUT_BITMAP_HELVETICA_12, fontx,fonty, p->caption); - agnameof(view->Topview->picked_nodes[ind]->Node)); + } return 1; } @@ -880,15 +880,24 @@ static int draw_topview_label(topview_node * v, float zdepth) ddx = dx; ddy = dy; } - if ((fs / view->zoom*-1) < 25) + if ((fs / view->zoom*-1) < 15) return 0; // fs= 10; fs= fs * (float)0.182; +/*#define GLUT_BITMAP_9_BY_15 ((void*)2) +#define GLUT_BITMAP_8_BY_13 ((void*)3) +#define GLUT_BITMAP_TIMES_ROMAN_10 ((void*)4) +#define GLUT_BITMAP_TIMES_ROMAN_24 ((void*)5) +#if (GLUT_API_VERSION >= 3) +#define GLUT_BITMAP_HELVETICA_10 ((void*)6) +#define GLUT_BITMAP_HELVETICA_12 ((void*)7) +#define GLUT_BITMAP_HELVETICA_18 ((void*)8)*/ - view->fontset->fonts[view->fontset->activefont]->fontheight=fs; + +/* view->fontset->fonts[view->fontset->activefont]->fontheight=fs; if ((log((float) v->degree) * -0.6 * view->zoom) > 0) fontColor(view->fontset->fonts[view->fontset->activefont],(float) log((double) v->degree + (double) 1), view->penColor.G, view->penColor.B, @@ -899,9 +908,10 @@ static int draw_topview_label(topview_node * v, float zdepth) view->penColor.G, view->penColor.B, (float)0.7); fontColor(view->fontset->fonts[view->fontset->activefont],0,0,0,view->penColor.A / (float) log((double) v->degree) * - (float) -0.4 * (float) view->zoom); - glprintf(view->fontset->fonts[view->fontset->activefont],(v->distorted_x - ddx), - (v->distorted_y - ddy), (fs * strlen(v->Label)*(float)0.6),v->Label ); + (float) -0.4 * (float) view->zoom);*/ + glColor4f(0,0.5,0.1,0.7); + glprintfglut(GLUT_BITMAP_HELVETICA_10,(v->distorted_x - ddx), + (v->distorted_y - ddy),v->Label ); return 1; } else diff --git a/graphviz.sln b/graphviz.sln index fc653bf6e..c9531475f 100644 --- a/graphviz.sln +++ b/graphviz.sln @@ -11,10 +11,11 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvc", "lib\gvc.vcproj", "{15229511-9F6C-48A5-9194-660CA6492563}" ProjectSection(ProjectDependencies) = postProject {A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9} - {BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D} - {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} - {6BD77BDE-151D-4824-A8BC-9F067662F7AB} = {6BD77BDE-151D-4824-A8BC-9F067662F7AB} + {1DE8628B-271E-49B3-A9B7-A53519E1CA65} = {1DE8628B-271E-49B3-A9B7-A53519E1CA65} {4B6103EF-590B-4916-92CB-D06934459928} = {4B6103EF-590B-4916-92CB-D06934459928} + {6BD77BDE-151D-4824-A8BC-9F067662F7AB} = {6BD77BDE-151D-4824-A8BC-9F067662F7AB} + {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} + {BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph", "lib\graph\graph.vcproj", "{A8018B47-1FB9-4966-A02C-1F64D65C33C9}" @@ -26,54 +27,54 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgraph", "lib\cgraph\cgraph EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_core", "plugin\core\gvplugin_core.vcproj", "{AE706502-3203-4815-BF50-4D73BF96BA58}" ProjectSection(ProjectDependencies) = postProject - {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} = {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} - {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} - {A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9} - {BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D} - {3A011065-B75E-49C8-B480-1A7C8EBD6699} = {3A011065-B75E-49C8-B480-1A7C8EBD6699} - {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} = {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} - {24E8C882-CD11-475A-A383-FF52AC05DFE3} = {24E8C882-CD11-475A-A383-FF52AC05DFE3} - {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} = {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} - {B76BCE8C-63CC-4A99-88B5-D621D563E699} = {B76BCE8C-63CC-4A99-88B5-D621D563E699} - {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} - {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} = {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} + {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} + {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} + {B76BCE8C-63CC-4A99-88B5-D621D563E699} = {B76BCE8C-63CC-4A99-88B5-D621D563E699} + {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} = {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} + {24E8C882-CD11-475A-A383-FF52AC05DFE3} = {24E8C882-CD11-475A-A383-FF52AC05DFE3} + {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} = {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} + {3A011065-B75E-49C8-B480-1A7C8EBD6699} = {3A011065-B75E-49C8-B480-1A7C8EBD6699} + {BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D} + {A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9} + {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} + {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} = {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_dot_layout", "plugin\dot_layout\gvplugin_dot_layout.vcproj", "{189E64E3-8A67-4477-8B18-3B174C03F6B9}" ProjectSection(ProjectDependencies) = postProject - {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58} {4B6103EF-590B-4916-92CB-D06934459928} = {4B6103EF-590B-4916-92CB-D06934459928} + {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dot", "cmd\dot\dot.vcproj", "{A334BA89-79FC-40E4-8D42-4852ECD2505B}" ProjectSection(ProjectDependencies) = postProject - {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58} - {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} - {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} = {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} - {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} - {A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9} - {BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D} - {3A011065-B75E-49C8-B480-1A7C8EBD6699} = {3A011065-B75E-49C8-B480-1A7C8EBD6699} - {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} = {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} - {24E8C882-CD11-475A-A383-FF52AC05DFE3} = {24E8C882-CD11-475A-A383-FF52AC05DFE3} - {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} = {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} - {B76BCE8C-63CC-4A99-88B5-D621D563E699} = {B76BCE8C-63CC-4A99-88B5-D621D563E699} - {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} - {92EA9398-9244-4DAA-8E7D-2F6BEC338CAB} = {92EA9398-9244-4DAA-8E7D-2F6BEC338CAB} - {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} - {2FDDC7C5-66E5-4520-B735-FD1A065AA9BA} = {2FDDC7C5-66E5-4520-B735-FD1A065AA9BA} - {6BD77BDE-151D-4824-A8BC-9F067662F7AB} = {6BD77BDE-151D-4824-A8BC-9F067662F7AB} - {189E64E3-8A67-4477-8B18-3B174C03F6B9} = {189E64E3-8A67-4477-8B18-3B174C03F6B9} - {4B6103EF-590B-4916-92CB-D06934459928} = {4B6103EF-590B-4916-92CB-D06934459928} {42C526F9-36E5-4B20-92CA-265C90058651} = {42C526F9-36E5-4B20-92CA-265C90058651} + {4B6103EF-590B-4916-92CB-D06934459928} = {4B6103EF-590B-4916-92CB-D06934459928} + {189E64E3-8A67-4477-8B18-3B174C03F6B9} = {189E64E3-8A67-4477-8B18-3B174C03F6B9} + {6BD77BDE-151D-4824-A8BC-9F067662F7AB} = {6BD77BDE-151D-4824-A8BC-9F067662F7AB} + {2FDDC7C5-66E5-4520-B735-FD1A065AA9BA} = {2FDDC7C5-66E5-4520-B735-FD1A065AA9BA} + {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} + {92EA9398-9244-4DAA-8E7D-2F6BEC338CAB} = {92EA9398-9244-4DAA-8E7D-2F6BEC338CAB} + {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} + {B76BCE8C-63CC-4A99-88B5-D621D563E699} = {B76BCE8C-63CC-4A99-88B5-D621D563E699} + {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} = {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} + {24E8C882-CD11-475A-A383-FF52AC05DFE3} = {24E8C882-CD11-475A-A383-FF52AC05DFE3} + {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} = {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} + {3A011065-B75E-49C8-B480-1A7C8EBD6699} = {3A011065-B75E-49C8-B480-1A7C8EBD6699} + {BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D} + {A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9} + {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} + {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} = {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} + {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_neato_layout", "plugin\neato_layout\gvplugin_neato_layout.vcproj", "{92EA9398-9244-4DAA-8E7D-2F6BEC338CAB}" ProjectSection(ProjectDependencies) = postProject - {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58} - {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} + {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} + {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "patchwork", "lib\patchwork\gvpatchwork.vcproj", "{6BD77BDE-151D-4824-A8BC-9F067662F7AB}" @@ -95,8 +96,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_pango", "plugin\pa EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_gd", "plugin\gd\gvplugin_gd.vcproj", "{2FDDC7C5-66E5-4520-B735-FD1A065AA9BA}" ProjectSection(ProjectDependencies) = postProject - {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58} {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} = {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} + {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gd", "lib\gd\gd.vcproj", "{05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}" @@ -113,10 +114,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vpsc", "lib\vpsc\vpsc.vcpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvpr", "cmd\gvpr\gvpr.vcproj", "{397C6B2C-B305-4CB2-B8CE-2366B508AB7C}" ProjectSection(ProjectDependencies) = postProject - {7DC8987A-C87D-465A-94CF-1F6DF59B38FB} = {7DC8987A-C87D-465A-94CF-1F6DF59B38FB} - {5A6981A7-A652-4187-B636-3E5120C7CE52} = {5A6981A7-A652-4187-B636-3E5120C7CE52} - {1A6CABA9-DA28-4BC1-9DF4-F809231221BC} = {1A6CABA9-DA28-4BC1-9DF4-F809231221BC} {7D3723C5-06C8-4730-BDA1-1B61D6CCBEB8} = {7D3723C5-06C8-4730-BDA1-1B61D6CCBEB8} + {1A6CABA9-DA28-4BC1-9DF4-F809231221BC} = {1A6CABA9-DA28-4BC1-9DF4-F809231221BC} + {5A6981A7-A652-4187-B636-3E5120C7CE52} = {5A6981A7-A652-4187-B636-3E5120C7CE52} + {7DC8987A-C87D-465A-94CF-1F6DF59B38FB} = {7DC8987A-C87D-465A-94CF-1F6DF59B38FB} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ingraphs", "lib\ingraphs\ingraphs.vcproj", "{D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04}" @@ -173,9 +174,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xdot", "lib\xdot\xdot.vcpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "smyrna", "cmd\smyrna\smyrna.vcproj", "{13145C00-3694-4342-AFBE-4FAA7E1086BC}" ProjectSection(ProjectDependencies) = postProject - {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} - {86DDD3C7-E71D-49FC-9137-E2514607721E} = {86DDD3C7-E71D-49FC-9137-E2514607721E} {CCEF85C9-BC40-4C26-8755-581276C8B7DA} = {CCEF85C9-BC40-4C26-8755-581276C8B7DA} + {86DDD3C7-E71D-49FC-9137-E2514607721E} = {86DDD3C7-E71D-49FC-9137-E2514607721E} + {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "topfish", "lib\topfish\topfish.vcproj", "{3CD86498-8B4C-4018-A9BF-F9E008F376DD}" @@ -186,6 +187,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_gdiplus", "plugin\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "otk", "lib\otk_lib\otk.vcproj", "{343EB043-1F93-4F40-989D-FA309E4668AF}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex_win32", "lib\regex_win32\regex_win32.vcproj", "{1DE8628B-271E-49B3-A9B7-A53519E1CA65}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -400,6 +403,10 @@ Global {343EB043-1F93-4F40-989D-FA309E4668AF}.Debug|Win32.Build.0 = Debug|Win32 {343EB043-1F93-4F40-989D-FA309E4668AF}.Release|Win32.ActiveCfg = Release|Win32 {343EB043-1F93-4F40-989D-FA309E4668AF}.Release|Win32.Build.0 = Release|Win32 + {1DE8628B-271E-49B3-A9B7-A53519E1CA65}.Debug|Win32.ActiveCfg = Debug|Win32 + {1DE8628B-271E-49B3-A9B7-A53519E1CA65}.Debug|Win32.Build.0 = Debug|Win32 + {1DE8628B-271E-49B3-A9B7-A53519E1CA65}.Release|Win32.ActiveCfg = Release|Win32 + {1DE8628B-271E-49B3-A9B7-A53519E1CA65}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/lib/glcomp/glcompbutton.c b/lib/glcomp/glcompbutton.c index 811da84e3..95bf0e088 100644 --- a/lib/glcomp/glcompbutton.c +++ b/lib/glcomp/glcompbutton.c @@ -211,7 +211,6 @@ int glCompDrawButton(glCompButton * p) glRasterPos3f(fontx,fonty,p->bevel + GLCOMPSET_BEVEL_DIFF * 3); - glprintfglut (GLUT_BITMAP_HELVETICA_12, fontx,fonty, p->caption); // print_bitmap_string(GLUT_BITMAP_HELVETICA_12,p->caption); } diff --git a/lib/glcomp/glcomptext.h b/lib/glcomp/glcomptext.h index 1c94b8b5a..cac9ecb95 100644 --- a/lib/glcomp/glcomptext.h +++ b/lib/glcomp/glcomptext.h @@ -23,6 +23,7 @@ typedef float GLfloat; #include #endif #include "glcompdefs.h" +#include "glut.h" #ifdef __cplusplus extern "C" { -- 2.40.0