diff --git a/Common/Options.cpp b/Common/Options.cpp
index 358b5b05a6156a808f09c7d680c48efc64f70db9..53d558b7c8736208cc71a6c21e7194ad797eebab 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.107 2003-05-29 14:36:56 geuzaine Exp $
+// $Id: Options.cpp,v 1.108 2003-06-13 21:14:20 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -3267,7 +3267,7 @@ double opt_mesh_constrained_bgmesh(OPT_ARGS_NUM)
double opt_mesh_degree(OPT_ARGS_NUM)
{
if(action & GMSH_SET)
- CTX.mesh.degree = 1; //(int)val; // INTERDIT POUR LE MOMENT !!!
+ CTX.mesh.degree = (int)val;
#if defined(HAVE_FLTK)
if(WID && (action & GMSH_GUI))
WID->mesh_butt[3]->value(CTX.mesh.degree == 2);
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 66e68dd8f1fcf82271774067b7bd438d7f917fdc..5738937a7960a61b43295c4e795f5b00140c322b 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.236 2003-04-02 06:25:21 geuzaine Exp $
+// $Id: GUI.cpp,v 1.237 2003-06-13 21:14:20 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -1635,7 +1635,6 @@ void GUI::create_option_window()
}
mesh_butt[3] = new Fl_Check_Button(2 * WB, 2 * WB + 5 * BH, BW, BH, "Second order elements");
- mesh_butt[3]->deactivate(); //2nd order elements do not work. Disable the graphical option.
mesh_butt[3]->type(FL_TOGGLE_BUTTON);
mesh_butt[3]->down_box(TOGGLE_BOX);
mesh_butt[3]->selection_color(TOGGLE_COLOR);
diff --git a/Graphics/Mesh.cpp b/Graphics/Mesh.cpp
index c0e3cd55ba99562e1602cedfaeb1eccb6f03c0cc..46d1a8848fc60cb798e4733be3dbd45c525cc07f 100644
--- a/Graphics/Mesh.cpp
+++ b/Graphics/Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: Mesh.cpp,v 1.59 2003-03-21 00:52:39 geuzaine Exp $
+// $Id: Mesh.cpp,v 1.60 2003-06-13 21:14:20 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -781,28 +781,23 @@ void Draw_Simplex_Curves(void *a, void *b)
Yc = 0.5 * (s->V[0]->Pos.Y + s->V[1]->Pos.Y);
Zc = 0.5 * (s->V[0]->Pos.Z + s->V[1]->Pos.Z);
- double X[2], Y[2], Z[2];
+ double X[3], Y[3], Z[3];
+ int N = s->VSUP ? 3 : 2;
+
for(int i = 0; i < 2; i++) {
X[i] = Xc + CTX.mesh.explode * (s->V[i]->Pos.X - Xc);
Y[i] = Yc + CTX.mesh.explode * (s->V[i]->Pos.Y - Yc);
Z[i] = Zc + CTX.mesh.explode * (s->V[i]->Pos.Z - Zc);
}
-
- /*
- if(CTX.mesh.points){
- glColor4ubv((GLubyte*)&CTX.color.mesh.vertex);
- glBegin(GL_POINTS);
- glVertex3d(s->V[1]->Pos.X, s->V[1]->Pos.Y, s->V[1]->Pos.Z);
- glEnd();
-
- if(s->VSUP){
- glColor4ubv((GLubyte*)&CTX.color.mesh.vertex_supp);
- glBegin(GL_POINTS);
- glVertex3d(s->VSUP[0]->Pos.X, s->VSUP[0]->Pos.Y, s->VSUP[0]->Pos.Z);
- glEnd();
- }
- }
- */
+
+ if(N == 3){
+ X[2] = X[1];
+ Y[2] = Y[1];
+ Z[2] = Z[1];
+ X[1] = Xc + CTX.mesh.explode * (s->VSUP[0]->Pos.X - Xc);
+ Y[1] = Yc + CTX.mesh.explode * (s->VSUP[0]->Pos.Y - Yc);
+ Z[1] = Zc + CTX.mesh.explode * (s->VSUP[0]->Pos.Z - Zc);
+ }
if(CTX.mesh.color_carousel) {
if(theColor.type)
@@ -818,8 +813,9 @@ void Draw_Simplex_Curves(void *a, void *b)
if(CTX.mesh.lines) {
glBegin(GL_LINES);
- glVertex3d(X[0], Y[0], Z[0]);
- glVertex3d(X[1], Y[1], Z[1]);
+ for(int i = 0; i < N; i++){
+ glVertex3d(X[i], Y[i], Z[i]);
+ }
glEnd();
}
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index 119ddd5a43f1eaeb78a746d80665e34c94363930..595e2090fcde0b2869f3644bb606fed5cd13677f 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -1,4 +1,4 @@
-// $Id: Generator.cpp,v 1.43 2003-03-21 00:52:41 geuzaine Exp $
+// $Id: Generator.cpp,v 1.44 2003-06-13 21:14:20 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -184,6 +184,7 @@ void Init_Mesh(Mesh * M, int all)
M->MaxSimplexNum = 0;
ExitExtrude();
+ Reset_Degre2();
Tree_Action(M->Vertices, Free_Vertex);
Tree_Delete(M->Vertices);
diff --git a/Mesh/Mesh.h b/Mesh/Mesh.h
index c363303bcf689a115cd7a3b7820b4e3707e6b87a..71e71fd9c21345ef1e2f5b5d85f6e005feccb96a 100644
--- a/Mesh/Mesh.h
+++ b/Mesh/Mesh.h
@@ -504,6 +504,7 @@ void crEdges (Tree_T * TreeElem, Tree_T * treeedges);
double Lc_XYZ (double X, double Y, double Z, Mesh * m);
void Degre2 (Tree_T * AllNodes, Tree_T * TreeNodes, Tree_T * TreeElm,
Curve * c, Surface * s);
+void Reset_Degre2 ();
void ActionLiss (void *data, void *dummy);
void ActionLissSurf (void *data, void *dummy);
int Recombine (Tree_T *TreeAllVert, Tree_T *TreeAllElg, double a);
diff --git a/Mesh/SecondOrder.cpp b/Mesh/SecondOrder.cpp
index 56b90af9e46ab033055c5db4c710ca9f1b506f53..90ac61093a7ab3448cc0e7ed41b1846537f5d574 100644
--- a/Mesh/SecondOrder.cpp
+++ b/Mesh/SecondOrder.cpp
@@ -1,4 +1,4 @@
-// $Id: SecondOrder.cpp,v 1.13 2003-03-21 00:52:42 geuzaine Exp $
+// $Id: SecondOrder.cpp,v 1.14 2003-06-13 21:14:20 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -152,22 +152,28 @@ void PutMiddlePoint(void *a, void *b)
}
}
+static Tree_T *TreeEdges = NULL;
+
+void Reset_Degre2(){
+ if(TreeEdges){
+ Tree_Delete(TreeEdges);
+ }
+ TreeEdges = Tree_Create(sizeof(Edge), compareedge);
+}
+
void Degre2(Tree_T * AllNodes, Tree_T * TreeNodes, Tree_T * TreeElm,
Curve * c, Surface * s)
{
- static Tree_T *TreeEdges = NULL;
-
THES = s;
THEC = c;
THET = TreeNodes;
- if(!TreeEdges)
- TreeEdges = Tree_Create(sizeof(Edge), compareedge);
-
- if(THES || THEC)
+ if(THES || THEC){
EdgesInVolume = 0;
+ }
crEdges(TreeElm, TreeEdges);
Tree_Action(TreeEdges, PutMiddlePoint);
+
EdgesInVolume = 1;
}