few patches for smyrna

diff --git a/cmd/smyrna/gui/beacon.c b/cmd/smyrna/gui/beacon.c
index b9af2fb4727c69541520b1e5f1026919bfce1797..d0842775012f21479123f07192107088a832f0fb 100644 (file)
--- a/cmd/smyrna/gui/beacon.c
+++ b/cmd/smyrna/gui/beacon.c
@@ -68,8 +68,8 @@ void pick_node_from_coords(float x,float y,float z)
        topview_node* sn;       /*selected node , closest node*/
        topview_edge* e;
        topview_edge* se;/*selected edge , closest one*/
-       GLfloat closest_dif = 1000;
-       GLfloat closest_dif2 = 1000;
+       GLfloat closest_dif = 100000000;
+       GLfloat closest_dif2 = 100000000;
        float a, b,c;
        double d;
        int ind;
@@ -119,7 +119,7 @@ void pick_node_from_coords(float x,float y,float z)
                }
        }
 
-       if (closest_dif < closest_dif2 * 5)
+       if (closest_dif < closest_dif2 * 3)
        {
                if (sn)
                {
@@ -226,6 +226,7 @@ int add_to_pick_list(topview_node * n)
 int draw_node_hint_boxes(void)
 {
     int ind;
+       float del=0.01;
     float fs = GetOGLDistance(12);
     char* lbl;
     topview_node* n;
@@ -249,8 +250,8 @@ int draw_node_hint_boxes(void)
 
                /*blue font color*/
                glColor4f(0, 0, 1, 1);
-               glprintfglut (GLUT_BITMAP_HELVETICA_12, dx,dy,dz,"[");
-               glprintfglut (GLUT_BITMAP_HELVETICA_12, dx,(dy+fs+fs/(GLfloat)5.0),dz,lbl);
+               glprintfglut (GLUT_BITMAP_HELVETICA_12, dx,dy,dz+del,"[");
+               glprintfglut (GLUT_BITMAP_HELVETICA_12, dx,(dy+fs+fs/(GLfloat)5.0),dz+del,lbl);
 //             glprintfglut (GLUT_BITMAP_HELVETICA_12, dx,(dy+fs+fs/(GLfloat)5.0),dz,"aaaaaaaa");
 //             ffs=(dy+fs+fs/(GLfloat)5.0)-GetOGLDistance(14)/view->zoom*-1;
 //             glprintfglut (GLUT_BITMAP_HELVETICA_12, dx,ffs,dz,"bbbbbbbbbb");
@@ -339,8 +340,8 @@ int draw_node_hint_boxes(void)
                glColor4f(0, 0, 1, 1);
 
                /*blue font color*/
-               glprintfglut (GLUT_BITMAP_HELVETICA_12, dx,dy,dz,"|");
-               glprintfglut (GLUT_BITMAP_HELVETICA_12, dx,(dy+fs+fs/(GLfloat)5.0),dz,buf);
+               glprintfglut (GLUT_BITMAP_HELVETICA_12, dx,dy,dz+del,"|");
+               glprintfglut (GLUT_BITMAP_HELVETICA_12, dx,(dy+fs+fs/(GLfloat)5.0),dz+del,buf);
     }
 
 

diff --git a/lib/glcomp/glutils.c b/lib/glcomp/glutils.c
index c7756243f19b6cbafab46529df78cb415722d637..85c0380198f2eef301162d680f072403d9ceb721 100644 (file)
--- a/lib/glcomp/glutils.c
+++ b/lib/glcomp/glutils.c
@@ -156,13 +156,13 @@ float GetOGLDistance(int l)
 
 void to3D(int x, int y, GLfloat *X, GLfloat *Y,GLfloat *Z)
 {
-       int const WIDTH = 10;
+       int const WIDTH = 20;
 
     GLint viewport[4];
     GLdouble modelview[16];
     GLdouble projection[16];
     GLfloat winX, winY;
-       GLfloat winZ[100];
+       GLfloat winZ[400];
     GLdouble posX, posY, posZ;
        int idx;
        static float comp;