Skip to content
Snippets Groups Projects
Commit 9f3f445e authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix cygwin bustage
parent a56caeca
No related branches found
No related tags found
No related merge requests found
// $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 // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
// //
...@@ -91,8 +91,7 @@ void Opengl_Window::draw() ...@@ -91,8 +91,7 @@ void Opengl_Window::draw()
glLoadIdentity(); glLoadIdentity();
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
glColor3f(1., 1., 1.); glColor3f(1., 1., 1.);
glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ZERO); glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ZERO); // glBlendEquation(GL_FUNC_ADD);
glBlendEquation(GL_FUNC_ADD);
glEnable(GL_BLEND); glEnable(GL_BLEND);
glLineWidth(0.2); glLineWidth(0.2);
glBegin(GL_LINE_STRIP); glBegin(GL_LINE_STRIP);
......
// $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 // Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
// //
...@@ -396,19 +396,16 @@ void Draw_Post(void) ...@@ -396,19 +396,16 @@ void Draw_Post(void)
// initialize alpha blending for transparency // initialize alpha blending for transparency
if(CTX.alpha && ColorTable_IsAlpha(&v->CT)){ if(CTX.alpha && ColorTable_IsAlpha(&v->CT)){
if(CTX.fake_transparency){ if(CTX.fake_transparency){
// simple additive blending "a la xpost" // simple additive blending "a la xpost":
glBlendFunc(GL_SRC_ALPHA, GL_ONE); glBlendFunc(GL_SRC_ALPHA, GL_ONE); // glBlendEquation(GL_FUNC_ADD);
glBlendEquation(GL_FUNC_ADD); // maximum intensity projection "a la volsuite":
// maximum intensity projection "a la volsuite" // glBlendFunc(GL_ONE, GL_ONE); // glBlendEquation(GL_MAX);
// glBlendFunc(GL_ONE, GL_ONE);
// glBlendEquation(GL_MAX);
glEnable(GL_BLEND); glEnable(GL_BLEND);
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
} }
else{ else{
// real translucent blending (requires back-to-front traversal) // real translucent blending (requires back-to-front traversal)
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // glBlendEquation(GL_FUNC_ADD);
glBlendEquation(GL_FUNC_ADD);
glEnable(GL_BLEND); glEnable(GL_BLEND);
// if we don't use vertex arrays, do the sorting here - it's // if we don't use vertex arrays, do the sorting here - it's
// incorrect for hybrid views (use Plugin(DecomposeInSimplex) // incorrect for hybrid views (use Plugin(DecomposeInSimplex)
......
# $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 # Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
# #
...@@ -87,6 +87,10 @@ clean: ...@@ -87,6 +87,10 @@ clean:
for i in doc lib ${GMSH_DIRS}; do (cd $$i && ${MAKE} clean); done for i in doc lib ${GMSH_DIRS}; do (cd $$i && ${MAKE} clean); done
rm -f ${GMSH_VERSION_FILE} 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: depend:
for i in ${GMSH_DIRS};\ for i in ${GMSH_DIRS};\
do (cd $$i && ${MAKE} depend "FLAGS=-DHAVE_GSL -DHAVE_FLTK"); done do (cd $$i && ${MAKE} depend "FLAGS=-DHAVE_GSL -DHAVE_FLTK"); done
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment