From e86b711ccfd64c5fe591a5b90f6e18d97754e840 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 14 May 2004 16:47:30 +0000
Subject: [PATCH] removed glEnable(GL_ALPHA): this is not even in the GL doc
:-)
---
Graphics/Draw.cpp | 18 +++---------------
TODO | 7 ++++++-
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/Graphics/Draw.cpp b/Graphics/Draw.cpp
index 3ae91dd554..0433b46c94 100644
--- a/Graphics/Draw.cpp
+++ b/Graphics/Draw.cpp
@@ -1,4 +1,4 @@
-// $Id: Draw.cpp,v 1.50 2004-05-12 03:22:13 geuzaine Exp $
+// $Id: Draw.cpp,v 1.51 2004-05-14 16:47:30 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -38,11 +38,6 @@ void Draw3d(void)
if(CTX.alpha) {
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND);
-#if !defined(WIN32)
- // This seems to perturb the font rendering on Windows... And
- // everything seems to work fine without, so...
- glEnable(GL_ALPHA);
-#endif
}
glPolygonOffset(1.0, 1.0);
glDepthFunc(GL_LESS);
@@ -157,10 +152,7 @@ void Orthogonalize(int x, int y)
void InitRenderModel(void)
{
- int i;
- float specular[4];
-
- for(i = 0; i < 6; i++) {
+ for(int i = 0; i < 6; i++) {
if(CTX.light[i]) {
GLfloat tmp[4];
for(int j = 0; j < 4; j++)
@@ -173,11 +165,7 @@ void InitRenderModel(void)
glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 40.);
glLightModelf(GL_LIGHT_MODEL_TWO_SIDE, GL_TRUE);
glShadeModel(GL_SMOOTH);
- // let's add some shininess to all these automatically created materials
- specular[0] = CTX.shine;
- specular[1] = CTX.shine;
- specular[2] = CTX.shine;
- specular[3] = 1.0;
+ float specular[4] = {CTX.shine, CTX.shine, CTX.shine, 1.0};
glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, specular);
glEnable(GL_NORMALIZE);
glEnable(GL_COLOR_MATERIAL);
diff --git a/TODO b/TODO
index 45c1629a06..e091e2ca22 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,9 @@
-$Id: TODO,v 1.45 2004-05-13 05:34:06 geuzaine Exp $
+$Id: TODO,v 1.46 2004-05-14 16:47:30 geuzaine Exp $
+
+add a way to undo the geometry contour selections in the
+GUI... (un-click)
+
+********************************************************************
add ternary operator and <,>,<=,>=,== tests in MathEval
--
GitLab