diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h index c0e8ae34c960ab96aa9e49f20ca36f0432d874f3..3b1e8a08065a7dc4d116d92e70cd0dad64a1da91 100644 --- a/Common/DefaultOptions.h +++ b/Common/DefaultOptions.h @@ -1394,7 +1394,7 @@ StringXColor GeneralOptions_Color[] = { {0, 0, 125, 255}, {0, 0, 125, 255}, {125, 125, 125, 255}, "Background gradient color" }, { F|O, "Foreground" , opt_general_color_foreground , - {255, 255, 255, 255}, {0, 0, 0, 255}, {0, 0, 0, 255}, + {170, 170, 170, 255}, {85, 85, 85, 255}, {128, 128, 128, 255}, "Foreground color" }, { F|O, "Text" , opt_general_color_text , {255, 255, 255, 255}, {0, 0, 0, 255}, {0, 0, 0, 255}, diff --git a/Graphics/Entity.cpp b/Graphics/Entity.cpp index d8e3c968460407e786315cd8120b535e9e561fe0..9fc27e1ec2f05ad9a438733976dc64f13da565ca 100644 --- a/Graphics/Entity.cpp +++ b/Graphics/Entity.cpp @@ -1,4 +1,4 @@ -// $Id: Entity.cpp,v 1.69 2006-08-15 21:22:12 geuzaine Exp $ +// $Id: Entity.cpp,v 1.70 2006-08-28 02:56:27 geuzaine Exp $ // // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // @@ -632,7 +632,7 @@ int Draw_Tics(int comp, int n, char *format, char *label, double t[3] = { p2[0]-p1[0], p2[1]-p1[1], p2[2]-p1[2] }; double l = norme(t); double w = 10 * CTX.pixel_equiv_x / CTX.s[0]; // big tics 10 pixels - double w2 = 4 * CTX.pixel_equiv_x / CTX.s[0]; // small tics 4 pixels + double w2 = 5 * CTX.pixel_equiv_x / CTX.s[0]; // small tics 5 pixels glRasterPos3d(p2[0]+t[0]*w*1.4, p2[1]+t[1]*w*1.4, p2[2]+t[2]*w*1.4); Draw_String(label); diff --git a/Graphics/Geom.cpp b/Graphics/Geom.cpp index 132bc03122e8d538120289810d539aeec8110832..3c2a33b1f2869a6535b54c001f10bd1058af0781 100644 --- a/Graphics/Geom.cpp +++ b/Graphics/Geom.cpp @@ -1,4 +1,4 @@ -// $Id: Geom.cpp,v 1.118 2006-08-27 23:10:36 geuzaine Exp $ +// $Id: Geom.cpp,v 1.119 2006-08-28 02:56:27 geuzaine Exp $ // // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // @@ -459,9 +459,9 @@ void Draw_Geom() if(CTX.draw_rotation_center){ glColor4ubv((GLubyte *) & CTX.color.fg); if(CTX.rotation_center_cg) - Draw_Sphere(5, CTX.cg[0], CTX.cg[1], CTX.cg[2], CTX.geom.light); + Draw_Sphere(CTX.point_size, CTX.cg[0], CTX.cg[1], CTX.cg[2], CTX.geom.light); else - Draw_Sphere(5, CTX.rotation_center[0], CTX.rotation_center[1], + Draw_Sphere(CTX.point_size, CTX.rotation_center[0], CTX.rotation_center[1], CTX.rotation_center[2], CTX.geom.light); }