From 9f3f445eae24f28adfddf4870d36691c6a273ec1 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 12 Sep 2004 04:13:59 +0000
Subject: [PATCH] fix cygwin bustage
---
Fltk/Opengl_Window.cpp | 5 ++---
Graphics/Post.cpp | 15 ++++++---------
Makefile | 6 +++++-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Fltk/Opengl_Window.cpp b/Fltk/Opengl_Window.cpp
index 9a128df34d..e1f7a6a5d6 100644
--- a/Fltk/Opengl_Window.cpp
+++ b/Fltk/Opengl_Window.cpp
@@ -1,4 +1,4 @@
-// $Id: Opengl_Window.cpp,v 1.38 2004-08-28 00:48:37 geuzaine Exp $
+// $Id: Opengl_Window.cpp,v 1.39 2004-09-12 04:13:59 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -91,8 +91,7 @@ void Opengl_Window::draw()
glLoadIdentity();
glDisable(GL_DEPTH_TEST);
glColor3f(1., 1., 1.);
- glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ZERO);
- glBlendEquation(GL_FUNC_ADD);
+ glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ZERO); // glBlendEquation(GL_FUNC_ADD);
glEnable(GL_BLEND);
glLineWidth(0.2);
glBegin(GL_LINE_STRIP);
diff --git a/Graphics/Post.cpp b/Graphics/Post.cpp
index c2beef5f80..664d9eae2b 100644
--- a/Graphics/Post.cpp
+++ b/Graphics/Post.cpp
@@ -1,4 +1,4 @@
-// $Id: Post.cpp,v 1.77 2004-09-01 20:23:50 geuzaine Exp $
+// $Id: Post.cpp,v 1.78 2004-09-12 04:13:59 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -396,19 +396,16 @@ void Draw_Post(void)
// initialize alpha blending for transparency
if(CTX.alpha && ColorTable_IsAlpha(&v->CT)){
if(CTX.fake_transparency){
- // simple additive blending "a la xpost"
- glBlendFunc(GL_SRC_ALPHA, GL_ONE);
- glBlendEquation(GL_FUNC_ADD);
- // maximum intensity projection "a la volsuite"
- // glBlendFunc(GL_ONE, GL_ONE);
- // glBlendEquation(GL_MAX);
+ // simple additive blending "a la xpost":
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE); // glBlendEquation(GL_FUNC_ADD);
+ // maximum intensity projection "a la volsuite":
+ // glBlendFunc(GL_ONE, GL_ONE); // glBlendEquation(GL_MAX);
glEnable(GL_BLEND);
glDisable(GL_DEPTH_TEST);
}
else{
// real translucent blending (requires back-to-front traversal)
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glBlendEquation(GL_FUNC_ADD);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // glBlendEquation(GL_FUNC_ADD);
glEnable(GL_BLEND);
// if we don't use vertex arrays, do the sorting here - it's
// incorrect for hybrid views (use Plugin(DecomposeInSimplex)
diff --git a/Makefile b/Makefile
index baa8d86692..741998e570 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.367 2004-09-11 06:38:22 geuzaine Exp $
+# $Id: Makefile,v 1.368 2004-09-12 04:13:59 geuzaine Exp $
#
# Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
#
@@ -87,6 +87,10 @@ clean:
for i in doc lib ${GMSH_DIRS}; do (cd $$i && ${MAKE} clean); done
rm -f ${GMSH_VERSION_FILE}
+clean-most:
+ for i in doc lib ${GMSH_DIRS:Netgen=}; do (cd $$i && ${MAKE} clean); done
+ rm -f ${GMSH_VERSION_FILE}
+
depend:
for i in ${GMSH_DIRS};\
do (cd $$i && ${MAKE} depend "FLAGS=-DHAVE_GSL -DHAVE_FLTK"); done
--
GitLab