From b8d71dd7a5dc8e03469fd189dc8ef0c46b8f4feb Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Thu, 30 Apr 2009 12:13:49 +0000 Subject: [PATCH] occ-visual --- libsrc/geom2d/spline.cpp | 3 --- libsrc/visualization/vscsg.cpp | 6 ------ libsrc/visualization/vsocc.cpp | 4 +++- libsrc/visualization/vssolution.cpp | 8 +++++--- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/libsrc/geom2d/spline.cpp b/libsrc/geom2d/spline.cpp index ccfd6bd9..d177cbd8 100644 --- a/libsrc/geom2d/spline.cpp +++ b/libsrc/geom2d/spline.cpp @@ -336,7 +336,4 @@ namespace netgen return sqrt(cosalpha + 1.)/(min2(l1,l2)*(1.-cosalpha)); } - - - } diff --git a/libsrc/visualization/vscsg.cpp b/libsrc/visualization/vscsg.cpp index af379043..1b36134e 100644 --- a/libsrc/visualization/vscsg.cpp +++ b/libsrc/visualization/vscsg.cpp @@ -74,12 +74,6 @@ void VisualSceneGeometry :: DrawScene () double transp = vispar.transp; - - - - - - glMaterialf (GL_FRONT_AND_BACK, GL_SHININESS, shine); glLogicOp (GL_COPY); diff --git a/libsrc/visualization/vsocc.cpp b/libsrc/visualization/vsocc.cpp index 43688198..98aa69bc 100644 --- a/libsrc/visualization/vsocc.cpp +++ b/libsrc/visualization/vsocc.cpp @@ -71,7 +71,7 @@ namespace netgen glEnable (GL_BLEND); glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - + // glEnable (GL_LIGHTING); double shine = vispar.shininess; @@ -80,6 +80,8 @@ namespace netgen glMaterialf (GL_FRONT_AND_BACK, GL_SHININESS, shine); glLogicOp (GL_COPY); + glEnable (GL_NORMALIZE); + float mat_col[] = { 0.2f, 0.2f, 0.8f, 1.0f}; glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mat_col); diff --git a/libsrc/visualization/vssolution.cpp b/libsrc/visualization/vssolution.cpp index 1e900c09..df5c1fe0 100644 --- a/libsrc/visualization/vssolution.cpp +++ b/libsrc/visualization/vssolution.cpp @@ -2035,9 +2035,11 @@ namespace netgen vsol->soltype==SOL_VIRTUALFUNCTION) */ - // if (autoscale) - // GetMinMax (vecfunction, 0, minval, maxval); - + /* + // was commented out, JS Apr 2009 + if (autoscale && !scalfunction) + GetMinMax (vecfunction, 0, minval, maxval); + */ glColor3d (1.0, 1.0, 1.0); // glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);