From 4449a44f4b190f9a771b876c0c8b7c6f4c87f2bc Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 24 Apr 2004 16:24:34 +0000
Subject: [PATCH] use default line width to draw bounding boxes and axes
---
Graphics/Axes.cpp | 10 +++++-----
Graphics/Mesh.cpp | 4 ++--
Graphics/Post.cpp | 3 ++-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Graphics/Axes.cpp b/Graphics/Axes.cpp
index f5381ba59d..45739bbb8e 100644
--- a/Graphics/Axes.cpp
+++ b/Graphics/Axes.cpp
@@ -1,4 +1,4 @@
-// $Id: Axes.cpp,v 1.20 2004-02-07 01:40:19 geuzaine Exp $
+// $Id: Axes.cpp,v 1.21 2004-04-24 16:24:34 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -44,8 +44,8 @@ void Draw_Axes(double s)
b = .1 * s;
c = 0.666 * b;
- glLineWidth(1.);
- gl2psLineWidth(1. * CTX.print.eps_line_width_factor);
+ glLineWidth(CTX.line_width);
+ gl2psLineWidth(CTX.line_width * CTX.print.eps_line_width_factor);
glColor4ubv((GLubyte *) & CTX.color.axes);
glBegin(GL_LINES);
@@ -142,8 +142,8 @@ void Draw_SmallAxes(void)
zx = l * CTX.rot[2][0];
zy = l * CTX.rot[2][1];
- glLineWidth(1.);
- gl2psLineWidth(1. * CTX.print.eps_line_width_factor);
+ glLineWidth(CTX.line_width);
+ gl2psLineWidth(CTX.line_width * CTX.print.eps_line_width_factor);
glColor4ubv((GLubyte *) & CTX.color.small_axes);
glBegin(GL_LINES);
diff --git a/Graphics/Mesh.cpp b/Graphics/Mesh.cpp
index 7daf870150..86f95c2712 100644
--- a/Graphics/Mesh.cpp
+++ b/Graphics/Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: Mesh.cpp,v 1.80 2004-04-24 15:05:40 geuzaine Exp $
+// $Id: Mesh.cpp,v 1.81 2004-04-24 16:24:34 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -94,9 +94,9 @@ void Draw_Mesh(Mesh * M)
// draw the bounding box of the mesh if we are in fast redraw mode
// and there is no geometry
- glLineWidth(CTX.line_width);
if(!CTX.mesh.draw && Tree_Nbr(M->Vertices) && !Tree_Nbr(M->Points)) {
glColor4ubv((GLubyte *) & CTX.color.fg);
+ glLineWidth(CTX.line_width);
glBegin(GL_LINE_LOOP);
glVertex3d(CTX.min[0], CTX.min[1], CTX.min[2]);
glVertex3d(CTX.max[0], CTX.min[1], CTX.min[2]);
diff --git a/Graphics/Post.cpp b/Graphics/Post.cpp
index 5f6e4ef0f5..1331f8be31 100644
--- a/Graphics/Post.cpp
+++ b/Graphics/Post.cpp
@@ -1,4 +1,4 @@
-// $Id: Post.cpp,v 1.56 2004-04-24 15:05:40 geuzaine Exp $
+// $Id: Post.cpp,v 1.57 2004-04-24 16:24:34 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -337,6 +337,7 @@ void Draw_Post(void)
v = (Post_View *) List_Pointer(CTX.post.list, iView);
if(v->Visible && v->Type == DRAW_POST_3D) {
glColor4ubv((GLubyte *) & CTX.color.fg);
+ glLineWidth(CTX.line_width);
glBegin(GL_LINE_LOOP);
glVertex3d(v->BBox[0], v->BBox[2], v->BBox[4]);
glVertex3d(v->BBox[1], v->BBox[2], v->BBox[4]);
--
GitLab