From d7d704806a365a959358862b26e98b0bd4412e52 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 12 Sep 2007 20:14:35 +0000
Subject: [PATCH] rewrote vertex array code for meshes in the same way we do it
now for post-processing (much simpler, pretty much same speed, and takes a
bit less memory)
---
Common/Makefile | 28 +--
Common/VertexArray.h | 2 +
Fltk/Makefile | 143 ++++++------
Geo/GEntity.cpp | 15 +-
Geo/GEntity.h | 15 +-
Geo/GModel.cpp | 10 +-
Geo/MEdge.h | 14 ++
Geo/MElement.cpp | 328 ++++++++++++---------------
Geo/MElement.h | 34 ++-
Geo/MRep.h | 237 --------------------
Geo/Makefile | 144 +++++++-----
Graphics/Makefile | 95 ++++----
Graphics/Mesh.cpp | 454 +++++++++++++++++---------------------
Graphics/SelectBuffer.cpp | 36 ++-
Mesh/HighOrder.cpp | 15 +-
Mesh/Makefile | 339 ++++++++++++++--------------
Mesh/meshGEdge.cpp | 5 +-
Mesh/meshGFace.cpp | 5 +-
Mesh/meshGRegion.cpp | 7 +-
Parser/Makefile | 58 ++---
Plugin/Makefile | 29 +--
Post/Makefile | 22 +-
Post/PView.h | 2 +-
23 files changed, 899 insertions(+), 1138 deletions(-)
delete mode 100644 Geo/MRep.h
diff --git a/Common/Makefile b/Common/Makefile
index ff518fde71..13e43474d5 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.141 2007-09-11 14:01:54 geuzaine Exp $
+# $Id: Makefile,v 1.142 2007-09-12 20:14:34 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -108,21 +108,21 @@ CommandLine.o: CommandLine.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
OS.o: OS.cpp Message.h
Visibility.o: Visibility.cpp Visibility.h GmshDefines.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/GFace.h \
- ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
- ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/GModel.h \
- ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.h \
- ../Geo/SBoundingBox3d.h ../Parser/Parser.h ../DataStr/Tree.h \
- ../DataStr/avl.h
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
+ ../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
+ ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
+ ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h \
+ ../Geo/GRegion.h ../Geo/SBoundingBox3d.h ../Parser/Parser.h \
+ ../DataStr/Tree.h ../DataStr/avl.h
Trackball.o: Trackball.cpp Trackball.h
VertexArray.o: VertexArray.cpp VertexArray.h ../Geo/SVector3.h \
../Geo/SPoint3.h Context.h ../DataStr/List.h ../Numeric/Numeric.h
diff --git a/Common/VertexArray.h b/Common/VertexArray.h
index b92e9a3b70..e99b87eb91 100644
--- a/Common/VertexArray.h
+++ b/Common/VertexArray.h
@@ -89,6 +89,8 @@ class VertexArray{
MElement *ele=0, bool unique=true);
// sorts the elements back to front wrt the eye position
void sort(double x, double y, double z);
+ // regain temporay memory once the array is constructed
+ void finalize(){ _barycenters.clear(); }
};
#endif
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 2bd3c26833..ba5691c9f6 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.149 2007-09-11 14:01:54 geuzaine Exp $
+# $Id: Makefile,v 1.150 2007-09-12 20:14:34 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -123,50 +123,51 @@ GUI_Extras.o: GUI_Extras.cpp ../Common/Gmsh.h ../Common/Message.h \
SpherePosition_Widget.h Shortcut_Window.h
GUI_Projection.o: GUI_Projection.cpp ../Geo/GModelIO_F.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/GFace.h \
- ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
- ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
- ../Graphics/Draw.h ../Common/Options.h ../Post/ColorTable.h \
- ../Parser/OpenFile.h ../Graphics/SelectBuffer.h GUI_Projection.h \
- ../Common/GmshUI.h ../Geo/FProjectionFace.h ../Geo/GModel.h \
- ../Geo/Range.h GUI.h Opengl_Window.h Colorbar_Window.h Popup_Button.h \
- SpherePosition_Widget.h Shortcut_Window.h GUI_Extras.h ../Geo/FFace.h \
- ../Geo/GFace.h ../Geo/GModel.h ../Geo/Range.h ../Geo/FEdge.h \
- ../Geo/GEdge.h ../Geo/GModel.h ../Geo/FVertex.h ../Geo/GModel.h \
- ../Geo/GVertex.h ../Geo/Range.h ../Common/Message.h
-GUI_Classifier.o: GUI_Classifier.cpp GUI_Classifier.h ../Common/GmshUI.h \
- ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
- ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \
- ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
- ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h \
- ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h \
- ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h \
- ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
../Common/SmoothData.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
- ../Geo/SBoundingBox3d.h GUI.h Opengl_Window.h Colorbar_Window.h \
- ../Post/ColorTable.h Popup_Button.h SpherePosition_Widget.h \
- Shortcut_Window.h ../Geo/Geo.h ../Geo/gmshSurface.h ../Geo/Pair.h \
- ../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
- ../Geo/SBoundingBox3d.h ../DataStr/Tree.h ../DataStr/avl.h \
- ../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/Gmsh.h \
- ../Common/Message.h ../DataStr/Malloc.h ../DataStr/Tools.h \
- ../DataStr/List.h ../DataStr/Tree.h ../Graphics/Draw.h \
- ../Common/Options.h ../Graphics/SelectBuffer.h GUI_Projection.h \
- ../Geo/FProjectionFace.h ../Geo/GModel.h ../Geo/Range.h GUI_Extras.h \
+ ../Geo/SBoundingBox3d.h ../Graphics/Draw.h ../Common/Options.h \
+ ../Post/ColorTable.h ../Parser/OpenFile.h ../Graphics/SelectBuffer.h \
+ GUI_Projection.h ../Common/GmshUI.h ../Geo/FProjectionFace.h \
+ ../Geo/GModel.h ../Geo/Range.h GUI.h Opengl_Window.h Colorbar_Window.h \
+ Popup_Button.h SpherePosition_Widget.h Shortcut_Window.h GUI_Extras.h \
+ ../Geo/FFace.h ../Geo/GFace.h ../Geo/GModel.h ../Geo/Range.h \
+ ../Geo/FEdge.h ../Geo/GEdge.h ../Geo/GModel.h ../Geo/FVertex.h \
+ ../Geo/GModel.h ../Geo/GVertex.h ../Geo/Range.h ../Common/Message.h
+GUI_Classifier.o: GUI_Classifier.cpp GUI_Classifier.h ../Common/GmshUI.h \
+ ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \
+ ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
+ ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Numeric/Numeric.h ../Common/Context.h \
+ ../DataStr/List.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
+ ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h GUI.h \
+ Opengl_Window.h Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \
+ SpherePosition_Widget.h Shortcut_Window.h ../Geo/Geo.h \
+ ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \
+ ../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SBoundingBox3d.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../Geo/SPoint2.h \
+ ../Geo/ExtrudeParams.h ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/Tools.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../Graphics/Draw.h ../Common/Options.h \
+ ../Graphics/SelectBuffer.h GUI_Projection.h ../Geo/FProjectionFace.h \
+ ../Geo/GModel.h ../Geo/Range.h GUI_Extras.h \
../Mesh/meshGFaceDelaunayInsertion.h ../Mesh/meshGFaceOptimize.h \
../Geo/gmshEdge.h ../Geo/Geo.h ../Geo/GEdge.h ../Geo/gmshVertex.h \
../Geo/Geo.h ../Geo/GVertex.h ../Geo/Range.h ../Geo/gmshFace.h \
@@ -182,18 +183,18 @@ Callbacks.o: Callbacks.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/GeoStringInterface.h ../Geo/Geo.h ../Geo/findLinks.h \
../Mesh/Generator.h ../Mesh/HighOrder.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/MVertex.h ../Geo/SPoint3.h \
- ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
- ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
- ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h \
- ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h \
- ../Geo/SVector3.h ../Common/Context.h ../Geo/ExtrudeParams.h \
- ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
- ../Graphics/Draw.h ../Graphics/SelectBuffer.h ../Post/PView.h \
- ../Common/VertexArray.h ../Post/PViewData.h ../Post/PViewOptions.h \
+ ../Geo/SBoundingBox3d.h ../Common/VertexArray.h ../Geo/MVertex.h \
+ ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
+ ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h \
+ ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h \
+ ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Context.h \
+ ../Geo/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
+ ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
+ ../Geo/SBoundingBox3d.h ../Graphics/Draw.h ../Graphics/SelectBuffer.h \
+ ../Post/PView.h ../Post/PViewData.h ../Post/PViewOptions.h \
../Post/ColorTable.h ../Parser/CreateFile.h ../Parser/OpenFile.h \
../Common/CommandLine.h ../Common/Options.h GUI.h Opengl_Window.h \
Colorbar_Window.h Popup_Button.h SpherePosition_Widget.h GUI_Extras.h \
@@ -210,17 +211,18 @@ Opengl.o: Opengl.cpp ../Common/Gmsh.h ../Common/Message.h \
../Graphics/Draw.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Graphics/SelectBuffer.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
+ ../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \
../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
- ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h \
- ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h \
- ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h \
- ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
- ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h GUI.h \
- Opengl_Window.h Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \
+ ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
+ ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/ExtrudeParams.h GUI.h Opengl_Window.h \
+ Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \
SpherePosition_Widget.h ../Graphics/gl2ps.h
Opengl_Window.o: Opengl_Window.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
@@ -232,17 +234,18 @@ Opengl_Window.o: Opengl_Window.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
../Graphics/Draw.h ../Graphics/SelectBuffer.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/MVertex.h ../Geo/SPoint3.h \
- ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
- ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
- ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h \
- ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h \
- ../Geo/SVector3.h ../Geo/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h \
- ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h \
- ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
- ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
- ../Geo/ExtrudeParams.h GUI.h Opengl_Window.h Colorbar_Window.h \
- ../Post/ColorTable.h Popup_Button.h SpherePosition_Widget.h
+ ../Geo/SBoundingBox3d.h ../Common/VertexArray.h ../Geo/MVertex.h \
+ ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
+ ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h \
+ ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h \
+ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/ExtrudeParams.h \
+ ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/ExtrudeParams.h GUI.h Opengl_Window.h \
+ Colorbar_Window.h ../Post/ColorTable.h Popup_Button.h \
+ SpherePosition_Widget.h
Colorbar_Window.o: Colorbar_Window.cpp ../Common/Gmsh.h \
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
diff --git a/Geo/GEntity.cpp b/Geo/GEntity.cpp
index f956e162a6..44d4ad9d8c 100644
--- a/Geo/GEntity.cpp
+++ b/Geo/GEntity.cpp
@@ -1,4 +1,4 @@
-// $Id: GEntity.cpp,v 1.12 2007-07-27 13:27:08 geuzaine Exp $
+// $Id: GEntity.cpp,v 1.13 2007-09-12 20:14:34 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -20,20 +20,27 @@
// Please report all bugs and problems to <gmsh@geuz.org>.
#include "GEntity.h"
-#include "MRep.h"
#include "Context.h"
extern Context_T CTX;
GEntity::GEntity(GModel *m, int t)
- : _model(m), _tag(t), _visible(true), _selection(0), meshRep(0)
+ : _model(m), _tag(t), _visible(true), _selection(0),
+ _allElementsVisible(1), va_lines(0), va_triangles(0), va_quads(0)
{
_color = CTX.PACK_COLOR(0, 0, 255, 0);
}
GEntity::~GEntity()
{
- if(meshRep) delete meshRep;
+ deleteVertexArrays();
+}
+
+void GEntity::deleteVertexArrays()
+{
+ if(va_lines) delete va_lines; va_lines = 0;
+ if(va_triangles) delete va_triangles; va_triangles = 0;
+ if(va_quads) delete va_quads; va_quads = 0;
}
char GEntity::getVisibility()
diff --git a/Geo/GEntity.h b/Geo/GEntity.h
index 9eceb2938a..19dca36fd8 100644
--- a/Geo/GEntity.h
+++ b/Geo/GEntity.h
@@ -26,6 +26,7 @@
#include "Range.h"
#include "SPoint3.h"
#include "SBoundingBox3d.h"
+#include "VertexArray.h"
#include "GmshDefines.h"
class GModel;
@@ -34,7 +35,6 @@ class GEdge;
class GFace;
class GRegion;
class MVertex;
-class MRep;
// A geometric model entity.
class GEntity {
@@ -48,6 +48,9 @@ class GEntity {
// The visibility and the selection flag
char _visible, _selection;
+ // Flag storing if all mesh elements are visible
+ char _allElementsVisible;
+
// The color of the entity (ignored if set to transparent blue)
unsigned int _color;
@@ -131,6 +134,8 @@ class GEntity {
virtual ~GEntity();
+ void deleteVertexArrays();
+
// Spatial dimension of the entity
virtual int dim() const { throw; }
@@ -213,14 +218,18 @@ class GEntity {
// Resets the mesh attributes to default values
virtual void resetMeshAttributes() { return; }
+ // Get/set all mesh element visibility flag
+ bool getAllElementsVisible(){ return _allElementsVisible ? true : false; }
+ void setAllElementsVisible(bool val){ _allElementsVisible = val ? 1 : 0; }
+
// The mesh vertices uniquely owned by the entity
std::vector<MVertex*> mesh_vertices;
// The physical entitites (if any) that contain this entity
std::vector<int> physicals;
- // A representation of the mesh of the entity
- MRep *meshRep;
+ // Vertex arrays to draw the mesh efficiently
+ VertexArray *va_lines, *va_triangles, *va_quads;
};
class GEntityLessThan {
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 3ece4f48e2..b69f1edcf1 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -1,4 +1,4 @@
-// $Id: GModel.cpp,v 1.46 2007-08-21 19:05:39 geuzaine Exp $
+// $Id: GModel.cpp,v 1.47 2007-09-12 20:14:34 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -22,8 +22,8 @@
#include "GModel.h"
#include "gmshSurface.h"
#include "Field.h"
-#include "MRep.h"
#include "BackgroundMesh.h"
+#include "Message.h"
std::vector<GModel*> GModel::list;
@@ -154,18 +154,18 @@ void GModel::removeInvisibleElements()
removeInvisible((*it)->hexahedra, all);
removeInvisible((*it)->prisms, all);
removeInvisible((*it)->pyramids, all);
- if((*it)->meshRep) (*it)->meshRep->destroy();
+ (*it)->deleteVertexArrays();
}
for(fiter it = firstFace(); it != lastFace(); ++it){
bool all = !(*it)->getVisibility();
removeInvisible((*it)->triangles, all);
removeInvisible((*it)->quadrangles, all);
- if((*it)->meshRep) (*it)->meshRep->destroy();
+ (*it)->deleteVertexArrays();
}
for(eiter it = firstEdge(); it != lastEdge(); ++it){
bool all = !(*it)->getVisibility();
removeInvisible((*it)->lines, all);
- if((*it)->meshRep) (*it)->meshRep->destroy();
+ (*it)->deleteVertexArrays();
}
}
diff --git a/Geo/MEdge.h b/Geo/MEdge.h
index e4fcf195a6..a37a6a82de 100644
--- a/Geo/MEdge.h
+++ b/Geo/MEdge.h
@@ -57,6 +57,20 @@ class MEdge {
t.normalize();
return t;
}
+ SVector3 normal() const
+ {
+ // this computes one of the normals to the edge
+ SVector3 t = tangent(), ex(0., 0., 0.);
+ if(t[0] == 0.)
+ ex[0] = 1.;
+ else if(t[1] == 0.)
+ ex[1] = 1.;
+ else
+ ex[2] = 1.;
+ SVector3 n = crossprod(t, ex);
+ n.normalize();
+ return n;
+ }
inline SPoint3 barycenter() const
{
return interpolate(0.5);
diff --git a/Geo/MElement.cpp b/Geo/MElement.cpp
index c68e1d69f1..06a4a0fded 100644
--- a/Geo/MElement.cpp
+++ b/Geo/MElement.cpp
@@ -1,4 +1,4 @@
-// $Id: MElement.cpp,v 1.38 2007-09-05 13:19:15 remacle Exp $
+// $Id: MElement.cpp,v 1.39 2007-09-12 20:14:34 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -27,7 +27,6 @@
#include "Message.h"
#include "Context.h"
-
extern Context_T CTX;
int MElement::_globalNum = 0;
@@ -69,6 +68,44 @@ double MElement::rhoShapeMeasure()
return 0.;
}
+int MElement::getNumEdgesRep()
+{
+ return getNumEdges();
+}
+
+int MElement::getEdgeRep(int num, double *x, double *y, double *z, SVector3 *n)
+{
+ MEdge e = getEdge(num);
+ SVector3 normal = (getDim() == 2) ? getFace(0).normal() : e.normal();
+ for(int i = 0; i < 2; i++){
+ MVertex *v = e.getVertex(i);
+ x[i] = v->x();
+ y[i] = v->y();
+ z[i] = v->z();
+ n[i] = normal;
+ }
+ return 2;
+}
+
+int MElement::getNumFacesRep()
+{
+ return getNumFaces();
+}
+
+int MElement::getFaceRep(int num, double *x, double *y, double *z, SVector3 *n)
+{
+ MFace f = getFace(num);
+ SVector3 normal = f.normal();
+ for(int i = 0; i < f.getNumVertices(); i++){
+ MVertex *v = f.getVertex(i);
+ x[i] = v->x();
+ y[i] = v->y();
+ z[i] = v->z();
+ n[i] = normal;
+ }
+ return f.getNumVertices();
+}
+
double MTetrahedron::gammaShapeMeasure()
{
double p0[3] = { _v[0]->x(), _v[0]->y(), _v[0]->z() };
@@ -344,17 +381,15 @@ bool MTriangle::invertmappingXY(double *p, double *uv, double tol)
return false;
}
-
bool MTriangle::invertmappingUV(GFace* gf, double *p, double *uv, double tol)
{
double mat[2][2];
double b[2];
+ double u0, v0, u1, v1, u2, v2;
- double u0,v0,u1,v1,u2,v2;
-
- parametricCoordinates ( getVertex(0), gf, u0, v0);
- parametricCoordinates ( getVertex(1), gf, u1, v1);
- parametricCoordinates ( getVertex(2), gf, u2, v2);
+ parametricCoordinates(getVertex(0), gf, u0, v0);
+ parametricCoordinates(getVertex(1), gf, u1, v1);
+ parametricCoordinates(getVertex(2), gf, u2, v2);
mat[0][0] = u1 - u0;
mat[0][1] = u2 - u0;
@@ -375,14 +410,13 @@ bool MTriangle::invertmappingUV(GFace* gf, double *p, double *uv, double tol)
return false;
}
-
double MTriangle::getSurfaceUV(GFace *gf)
{
- double u3,v3,u1,v1,u2,v2;
+ double u3, v3, u1, v1, u2, v2;
- parametricCoordinates ( getVertex(0), gf, u1, v1);
- parametricCoordinates ( getVertex(1), gf, u2, v2);
- parametricCoordinates ( getVertex(2), gf, u3, v3);
+ parametricCoordinates(getVertex(0), gf, u1, v1);
+ parametricCoordinates(getVertex(1), gf, u2, v2);
+ parametricCoordinates(getVertex(2), gf, u3, v3);
const double vv1 [2] = {u2 - u1, v2 - v1};
const double vv2 [2] = {u3 - u1, v3 - v1};
@@ -407,73 +441,32 @@ double MTriangle::getSurfaceXY() const
return s * 0.5;
}
-void MTriangle::circumcenterXYZ(double *p1, double *p2, double *p3,double *res, double *uv)
+void MTriangle::circumcenterXYZ(double *p1, double *p2, double *p3,
+ double *res, double *uv)
{
- double v1[3] = {p2[0]-p1[0],p2[1]-p1[1],p2[2]-p1[2]};
- double v2[3] = {p3[0]-p1[0],p3[1]-p1[1],p3[2]-p1[2]};
- double vx[3] = {p2[0]-p1[0],p2[1]-p1[1],p2[2]-p1[2]};
- double vy[3] = {p3[0]-p1[0],p3[1]-p1[1],p3[2]-p1[2]};
- double vz[3]; prodve (vx,vy,vz);prodve (vz,vx,vy);
- norme(vx); norme(vy);norme(vz);
- double p1P[2] = {0.0,0.0};
- double p2P[2];prosca(v1,vx,&p2P[0]);prosca(v1,vy,&p2P[1]);
- double p3P[2];prosca(v2,vx,&p3P[0]);prosca(v2,vy,&p3P[1]);
+ double v1[3] = {p2[0] - p1[0], p2[1] - p1[1], p2[2] - p1[2]};
+ double v2[3] = {p3[0] - p1[0], p3[1] - p1[1], p3[2] - p1[2]};
+ double vx[3] = {p2[0] - p1[0], p2[1] - p1[1], p2[2] - p1[2]};
+ double vy[3] = {p3[0] - p1[0], p3[1] - p1[1], p3[2] - p1[2]};
+ double vz[3]; prodve(vx, vy, vz); prodve(vz, vx, vy);
+ norme(vx); norme(vy); norme(vz);
+ double p1P[2] = {0.0, 0.0};
+ double p2P[2]; prosca(v1, vx, &p2P[0]); prosca(v1, vy, &p2P[1]);
+ double p3P[2]; prosca(v2, vx, &p3P[0]); prosca(v2, vy, &p3P[1]);
double resP[2];
circumcenterXY(p1P, p2P, p3P,resP);
- if (uv)
- {
- double mat[2][2] = {{p2P[0]-p1P[0],p3P[0]-p1P[0]},
- {p2P[1]-p1P[1],p3P[1]-p1P[1]}};
- double rhs[2] = {resP[0]-p1P[0],resP[1]-p1P[1]};
- sys2x2(mat,rhs,uv);
- }
-
-
-
-// double d1 = sqrt((p2P[0] - resP[0]) * (p2P[0] - resP[0]) +
-// (p2P[1] - resP[1]) * (p2P[1] - resP[1]));
-
-// double d2 = sqrt((p1P[0] - resP[0]) * (p1P[0] - resP[0]) +
-// (p1P[1] - resP[1]) * (p1P[1] - resP[1])) ;
-
-// double d3 = sqrt((p3P[0] - resP[0]) * (p3P[0] - resP[0]) +
-// (p3P[1] - resP[1]) * (p3P[1] - resP[1]) );
-
-
-// printf("%g %g - %g %g -- %g %g %g\n",p2P[0],p2P[1],p3P[0],p3P[1],d1,d2,d3);
+ if(uv){
+ double mat[2][2] = {{p2P[0] - p1P[0], p3P[0] - p1P[0]},
+ {p2P[1] - p1P[1], p3P[1] - p1P[1]}};
+ double rhs[2] = {resP[0] - p1P[0], resP[1] - p1P[1]};
+ sys2x2(mat, rhs, uv);
+ }
res[0] = p1[0] + resP[0] * vx[0] + resP[1] * vy[0];
res[1] = p1[1] + resP[0] * vx[1] + resP[1] * vy[1];
res[2] = p1[2] + resP[0] * vx[2] + resP[1] * vy[2];
-
-
-// double d2 = sqrt((p1P[0] - resP[0]) * (p1P[0] - resP[0]) +
-// (p1P[1] - resP[1]) * (p1P[1] - resP[1])) ;
-
-// double d3 = sqrt((p3P[0] - resP[0]) * (p3P[0] - resP[0]) +
-// (p3P[1] - resP[1]) * (p3P[1] - resP[1]) );
-
-
-
-
- return;
-
- double d1 = sqrt((res[0] - p1[0]) * (res[0] - p1[0]) +
- (res[1] - p1[1]) * (res[1] - p1[1]) +
- (res[2] - p1[2]) * (res[2] - p1[2]) );
- double d2 = sqrt((res[0] - p2[0]) * (res[0] - p2[0]) +
- (res[1] - p2[1]) * (res[1] - p2[1]) +
- (res[2] - p2[2]) * (res[2] - p2[2]) );
- double d3 = sqrt((res[0] - p3[0]) * (res[0] - p3[0]) +
- (res[1] - p3[1]) * (res[1] - p3[1]) +
- (res[2] - p3[2]) * (res[2] - p3[2]) );
-
- printf(" -- %g %g %g\n",d1,d2,d3);
-
-
-
}
void MTriangle::circumcenterXY(double *p1, double *p2, double *p3, double *res)
@@ -501,59 +494,27 @@ void MTriangle::circumcenterXY(double *p1, double *p2, double *p3, double *res)
res[1] = (double)((a1 * (x2 - x3) + a2 * (x3 - x1) + a3 * (x1 - x2)) / d);
}
-
void MTriangle::circumcenterUV(GFace *gf, double *res)
{
- double u3,v3,u1,v1,u2,v2;
-
- parametricCoordinates ( getVertex(0), gf, u1, v1);
- parametricCoordinates ( getVertex(1), gf, u2, v2);
- parametricCoordinates ( getVertex(2), gf, u3, v3);
-
-// Pair<SVector3,SVector3> der = gf->firstDer(SPoint2((u1+u2+u3)/3.,(v1+v2+v3)/3.)) ;
-// const double a = dot(der.first() ,der.first() );
-// const double b = dot(der.second(),der.first() );
-// const double d = dot(der.second(),der.second());
-
-// double sys[2][2];
-// double rhs[2];
-
-// sys[0][0] = 2. * a * (u1 - u2) + 2. * b * (v1 - v2);
-// sys[0][1] = 2. * d * (v1 - v2) + 2. * b * (u1 - u2);
-// sys[1][0] = 2. * a * (u1 - u3) + 2. * b * (v1 - v3);
-// sys[1][1] = 2. * d * (v1 - v3) + 2. * b * (u1 - u3);
-
-// rhs[0] =
-// a * (u1 * u1 - u2 * u2) + d * (v1 * v1 - v2 * v2) + 2. * b * (u1 * v1 -
-// u2 * v2);
-// rhs[1] =
-// a * (u1 * u1 - u3 * u3) + d * (v1 * v1 - v3 * v3) + 2. * b * (u1 * v1 -
-// u3 * v3);
-// sys2x2(sys, rhs, res);
-
-// return;
- double p1[2] ={u1,v1};
- double p2[2] ={u2,v2};
- double p3[2] ={u3,v3};
-
-// printf("%g %g vs ",res[0],res[1]);
- circumcenterXY(p1,p2,p3,res);
- // printf("%g %g \n ",res[0],res[1]);
+ double u3, v3, u1, v1, u2, v2;
+
+ parametricCoordinates(getVertex(0), gf, u1, v1);
+ parametricCoordinates(getVertex(1), gf, u2, v2);
+ parametricCoordinates(getVertex(2), gf, u3, v3);
+
+ double p1[2] = {u1, v1};
+ double p2[2] = {u2, v2};
+ double p3[2] = {u3, v3};
+
+ circumcenterXY(p1, p2, p3, res);
}
void MTriangle::circumcenterXY(double *res) const
{
- double p1[2] = {_v[0]->x(),_v[0]->y()};
- double p2[2] = {_v[1]->x(),_v[1]->y()};
- double p3[2] = {_v[2]->x(),_v[2]->y()};
- circumcenterXY(p1,p2,p3,res);
-}
-
-int MTriangleN::getNumFacesRep(){ return 1; }
-
-MFace MTriangleN::getFaceRep(int num)
-{
- return MFace(_v[0],_v[1],_v[2]);
+ double p1[2] = {_v[0]->x(), _v[0]->y()};
+ double p2[2] = {_v[1]->x(), _v[1]->y()};
+ double p3[2] = {_v[2]->x(), _v[2]->y()};
+ circumcenterXY(p1, p2, p3, res);
}
int MTriangleN::getNumFaceVertices(){
@@ -592,6 +553,7 @@ int P3[9][2] = {
{2,1},
{1,2}
};
+
int P4[12][2] = {
{0,0},
{1,0},
@@ -683,104 +645,98 @@ double coef5[15][15]={
{ 0.00000000, 0.00000000, 25.00000000, -0.00000000, -160.41666667, -0.00000000, 369.79166667, -0.00000000, -364.58333333, 0.00000000, 130.20833333, -25.00000000, 60.41666667, -38.54166667, 6.25000000}
};
-
-void GradGeomShapeFunctionP1 (double u, double v, double grads[6][2])
+void GradGeomShapeFunctionP1(double u, double v, double grads[6][2])
{
- for (int i=0;i<3;i++){
- grads[i][0] = 0;
- grads[i][1] = 0;
- for (int j=0;j<3;j++){
- if (P1[j][0] > 0)grads[i][0] += coef1[i][j] * pow(u,P1[j][0] - 1 ) * pow(v,P1[j][1] ) ;
- if (P1[j][1] > 0)grads[i][1] += coef1[i][j] * pow(u,P1[j][0] ) * pow(v,P1[j][1] -1 ) ;
+ for (int i = 0; i < 3; i++){
+ grads[i][0] = 0;
+ grads[i][1] = 0;
+ for(int j = 0; j < 3; j++){
+ if(P1[j][0] > 0) grads[i][0] += coef1[i][j] * pow(u,P1[j][0] - 1) * pow(v, P1[j][1]);
+ if(P1[j][1] > 0) grads[i][1] += coef1[i][j] * pow(u,P1[j][0]) * pow(v, P1[j][1] - 1);
}
}
}
-void GradGeomShapeFunctionP2 (double u, double v, double grads[6][2])
+
+void GradGeomShapeFunctionP2(double u, double v, double grads[6][2])
{
- for (int i=0;i<6;i++){
- grads[i][0] = 0;
- grads[i][1] = 0;
- for (int j=0;j<6;j++){
- if (P2[j][0] > 0)grads[i][0] += coef2[i][j] * pow(u,P2[j][0] - 1 ) * pow(v,P2[j][1] ) ;
- if (P2[j][1] > 0)grads[i][1] += coef2[i][j] * pow(u,P2[j][0] ) * pow(v,P2[j][1] -1 ) ;
+ for(int i = 0; i < 6; i++){
+ grads[i][0] = 0;
+ grads[i][1] = 0;
+ for (int j = 0; j < 6; j++){
+ if(P2[j][0] > 0) grads[i][0] += coef2[i][j] * pow(u, P2[j][0] - 1) * pow(v, P2[j][1]);
+ if(P2[j][1] > 0) grads[i][1] += coef2[i][j] * pow(u, P2[j][0]) * pow(v, P2[j][1] - 1);
}
}
}
-void GradGeomShapeFunctionP3 (double u, double v, double grads[9][2])
+
+void GradGeomShapeFunctionP3 (double u, double v, double grads[9][2])
{
- for (int i=0;i<9;i++){
- grads[i][0] = 0;
- grads[i][1] = 0;
- for (int j=0;j<9;j++){
- if (P3[j][0] > 0)grads[i][0] += coef3[i][j] * pow(u,P3[j][0] - 1 ) * pow(v,P3[j][1] ) ;
- if (P3[j][1] > 0)grads[i][1] += coef3[i][j] * pow(u,P3[j][0] ) * pow(v,P3[j][1] -1 ) ;
+ for(int i = 0; i < 9; i++){
+ grads[i][0] = 0;
+ grads[i][1] = 0;
+ for(int j = 0; j < 9; j++){
+ if(P3[j][0] > 0) grads[i][0] += coef3[i][j] * pow(u, P3[j][0] - 1) * pow(v, P3[j][1]);
+ if(P3[j][1] > 0) grads[i][1] += coef3[i][j] * pow(u, P3[j][0]) * pow(v, P3[j][1] - 1);
}
}
}
-void GradGeomShapeFunctionP4 (double u, double v, double grads[12][2])
+
+void GradGeomShapeFunctionP4(double u, double v, double grads[12][2])
{
- for (int i=0;i<12;i++){
- grads[i][0] = 0;
- grads[i][1] = 0;
- for (int j=0;j<12;j++){
- if (P4[j][0] > 0)grads[i][0] += coef4[i][j] * pow(u,P4[j][0] - 1 ) * pow(v,P4[j][1] ) ;
- if (P4[j][1] > 0)grads[i][1] += coef4[i][j] * pow(u,P4[j][0] ) * pow(v,P4[j][1] -1 ) ;
+ for(int i = 0; i < 12; i++){
+ grads[i][0] = 0;
+ grads[i][1] = 0;
+ for(int j = 0; j < 12; j++){
+ if(P4[j][0] > 0) grads[i][0] += coef4[i][j] * pow(u, P4[j][0] - 1) * pow(v, P4[j][1]);
+ if(P4[j][1] > 0) grads[i][1] += coef4[i][j] * pow(u, P4[j][0]) * pow(v, P4[j][1] - 1);
}
}
}
-void GradGeomShapeFunctionP5 (double u, double v, double grads[15][2])
+void GradGeomShapeFunctionP5(double u, double v, double grads[15][2])
{
- for (int i=0;i<15;i++){
- grads[i][0] = 0;
- grads[i][1] = 0;
- for (int j=0;j<15;j++){
- if (P5[j][0] > 0)grads[i][0] += coef5[i][j] * pow(u,P5[j][0] - 1 ) * pow(v,P5[j][1] ) ;
- if (P5[j][1] > 0)grads[i][1] += coef5[i][j] * pow(u,P5[j][0] ) * pow(v,P5[j][1] -1 ) ;
+ for(int i = 0; i < 15; i++){
+ grads[i][0] = 0;
+ grads[i][1] = 0;
+ for (int j = 0; j < 15; j++){
+ if(P5[j][0] > 0) grads[i][0] += coef5[i][j] * pow(u, P5[j][0] - 1) * pow(v, P5[j][1]);
+ if(P5[j][1] > 0) grads[i][1] += coef5[i][j] * pow(u, P5[j][0]) * pow(v, P5[j][1] - 1);
}
}
}
-
-void MTriangle::jac ( int ord, MVertex *vs[] , double uu, double vv , double j[2][2])
+void MTriangle::jac(int ord, MVertex *vs[], double uu, double vv, double j[2][2])
{
double grads[256][2];
- switch (ord)
- {
- case 1:
- GradGeomShapeFunctionP1 ( uu , vv , grads );break;
- case 2:
- GradGeomShapeFunctionP2 ( uu , vv , grads );break;
- case 3:
- GradGeomShapeFunctionP3 ( uu , vv , grads );break;
- case 4:
- GradGeomShapeFunctionP4 ( uu , vv , grads );break;
- case 5:
- GradGeomShapeFunctionP5 ( uu , vv , grads );break;
- default:
- throw;
- }
- j[0][0] = 0 ; for (int i=0;i<3;i++)j[0][0] += grads [i][0] * _v[i] -> x() ;
- j[1][0] = 0 ; for (int i=0;i<3;i++)j[1][0] += grads [i][1] * _v[i] -> x() ;
- j[0][1] = 0 ; for (int i=0;i<3;i++)j[0][1] += grads [i][0] * _v[i] -> y() ;
- j[1][1] = 0 ; for (int i=0;i<3;i++)j[1][1] += grads [i][1] * _v[i] -> y() ;
- for (int i=3;i<3*ord;i++)j[0][0] += grads [i][0] * vs[i-3] -> x() ;
- for (int i=3;i<3*ord;i++)j[1][0] += grads [i][1] * vs[i-3] -> x() ;
- for (int i=3;i<3*ord;i++)j[0][1] += grads [i][0] * vs[i-3] -> y() ;
- for (int i=3;i<3*ord;i++)j[1][1] += grads [i][1] * vs[i-3] -> y() ;
+ switch(ord){
+ case 1: GradGeomShapeFunctionP1(uu, vv, grads); break;
+ case 2: GradGeomShapeFunctionP2(uu, vv, grads); break;
+ case 3: GradGeomShapeFunctionP3(uu, vv, grads); break;
+ case 4: GradGeomShapeFunctionP4(uu, vv, grads); break;
+ case 5: GradGeomShapeFunctionP5(uu, vv, grads); break;
+ default: throw;
+ }
+ j[0][0] = 0 ; for(int i = 0; i < 3; i++) j[0][0] += grads [i][0] * _v[i] -> x();
+ j[1][0] = 0 ; for(int i = 0; i < 3; i++) j[1][0] += grads [i][1] * _v[i] -> x();
+ j[0][1] = 0 ; for(int i = 0; i < 3; i++) j[0][1] += grads [i][0] * _v[i] -> y();
+ j[1][1] = 0 ; for(int i = 0; i < 3; i++) j[1][1] += grads [i][1] * _v[i] -> y();
+ for(int i = 3; i < 3 * ord; i++) j[0][0] += grads[i][0] * vs[i - 3] -> x();
+ for(int i = 3; i < 3 * ord; i++) j[1][0] += grads[i][1] * vs[i - 3] -> x();
+ for(int i = 3; i < 3 * ord; i++) j[0][1] += grads[i][0] * vs[i - 3] -> y();
+ for(int i = 3; i < 3 * ord; i++) j[1][1] += grads[i][1] * vs[i - 3] -> y();
}
-void MTriangleN::jac ( double uu, double vv , double j[2][2])
+void MTriangleN::jac(double uu, double vv , double j[2][2])
{
- MTriangle::jac (_order,&(*(_vs.begin())),uu,vv,j);
+ MTriangle::jac(_order, &(*(_vs.begin())), uu, vv, j);
}
-void MTriangle6::jac ( double uu, double vv , double j[2][2])
+void MTriangle6::jac(double uu, double vv , double j[2][2])
{
- MTriangle::jac (2,_vs,uu,vv,j);
+ MTriangle::jac(2, _vs, uu, vv, j);
}
-void MTriangle::jac ( double uu, double vv , double j[2][2])
+
+void MTriangle::jac(double uu, double vv, double j[2][2])
{
- jac (1,0,uu,vv,j);
+ jac(1, 0, uu, vv, j);
}
-
diff --git a/Geo/MElement.h b/Geo/MElement.h
index 08d6d94a81..509064e67b 100644
--- a/Geo/MElement.h
+++ b/Geo/MElement.h
@@ -103,16 +103,16 @@ class MElement
virtual MEdge getEdge(int num) = 0;
// get an edge representation for drawing
- virtual int getNumEdgesRep(){ return getNumEdges(); }
- virtual MEdge getEdgeRep(int num){ return getEdge(num); }
+ virtual int getNumEdgesRep();
+ virtual int getEdgeRep(int num, double *x, double *y, double *z, SVector3 *n);
// get the faces
virtual int getNumFaces() = 0;
virtual MFace getFace(int num) = 0;
// get a face representation for drawing
- virtual int getNumFacesRep(){ return getNumFaces(); }
- virtual MFace getFaceRep(int num){ return getFace(num); }
+ virtual int getNumFacesRep();
+ virtual int getFaceRep(int num, double *x, double *y, double *z, SVector3 *n);
// get the max/min edge length
virtual double maxEdge();
@@ -229,6 +229,7 @@ class MLine3 : public MLine {
return getVertex(map[num]);
}
virtual int getNumEdgeVertices(){ return 1; }
+ /*
virtual int getNumEdgesRep(){ return 2; }
virtual MEdge getEdgeRep(int num)
{
@@ -237,6 +238,7 @@ class MLine3 : public MLine {
};
return MEdge(getVertex(edges_lin3[num][0]), getVertex(edges_lin3[num][1]));
}
+ */
virtual int getTypeForMSH(){ return MSH_LIN_3; }
virtual int getTypeForUNV(){ return 24; } // parabolic beam
virtual const char *getStringForPOS(){ return "SL2"; }
@@ -272,11 +274,13 @@ class MLineN : public MLine {
return _vs[num-1];
}
virtual int getNumEdgeVertices(){ return _vs.size(); }
+ /*
virtual int getNumEdgesRep(){ return _vs.size() + 1; }
virtual MEdge getEdgeRep(int num)
{
return MEdge(getVertexUNV(num),getVertexUNV(num+1));
}
+ */
virtual int getTypeForMSH(){
if(_vs.size() == 2) return MSH_LIN_4;
if(_vs.size() == 3) return MSH_LIN_5;
@@ -381,6 +385,7 @@ class MTriangle6 : public MTriangle {
return getVertex(map[num]);
}
virtual int getNumEdgeVertices(){ return 3; }
+ /*
virtual int getNumEdgesRep(){ return 6; }
virtual MEdge getEdgeRep(int num)
{
@@ -401,6 +406,7 @@ class MTriangle6 : public MTriangle {
getVertex(trifaces_tri2[num][1]),
getVertex(trifaces_tri2[num][2]));
}
+ */
virtual int getTypeForMSH(){ return MSH_TRI_6; }
virtual int getTypeForUNV(){ return 92; } // thin shell parabolic triangle
virtual const char *getStringForPOS(){ return "ST2"; }
@@ -448,6 +454,7 @@ class MTriangleN : public MTriangle {
}
virtual int getNumFaceVertices();
virtual int getNumEdgeVertices(){ return _order - 1; }
+ /*
virtual int getNumEdgesRep(){ return 3 * _order ; }
virtual MEdge getEdgeRep(int num)
{
@@ -455,6 +462,7 @@ class MTriangleN : public MTriangle {
}
virtual int getNumFacesRep();
virtual MFace getFaceRep(int num);
+ */
virtual int getTypeForMSH(){
if (_order == 3 && _vs.size() == 6) return MSH_TRI_9;
if (_order == 3 && _vs.size() == 7) return MSH_TRI_10;
@@ -586,6 +594,7 @@ class MQuadrangle8 : public MQuadrangle {
return getVertex(map[num]);
}
virtual int getNumEdgeVertices(){ return 4; }
+ /*
virtual int getNumEdgesRep(){ return 8; }
virtual MEdge getEdgeRep(int num)
{
@@ -607,6 +616,7 @@ class MQuadrangle8 : public MQuadrangle {
getVertex(trifaces_qua8[num][1]),
getVertex(trifaces_qua8[num][2]));
}
+ */
virtual int getTypeForMSH(){ return MSH_QUA_8; }
virtual int getTypeForUNV(){ return 95; } // shell parabolic quadrilateral
virtual const char *getStringForPOS(){ return 0; } // not available
@@ -643,6 +653,7 @@ class MQuadrangle9 : public MQuadrangle {
virtual MVertex *getVertex(int num){ return num < 4 ? _v[num] : _vs[num - 4]; }
virtual int getNumEdgeVertices(){ return 4; }
virtual int getNumFaceVertices(){ return 1; }
+ /*
virtual int getNumEdgesRep(){ return 8; }
virtual MEdge getEdgeRep(int num)
{
@@ -665,6 +676,7 @@ class MQuadrangle9 : public MQuadrangle {
getVertex(trifaces_qua9[num][1]),
getVertex(trifaces_qua9[num][2]));
}
+ */
virtual int getTypeForMSH(){ return MSH_QUA_9; }
virtual int getTypeForUNV(){ return 0; } // not available
virtual const char *getStringForPOS(){ return "SQ2"; }
@@ -835,6 +847,7 @@ class MTetrahedron10 : public MTetrahedron {
return getVertex(map[num]);
}
virtual int getNumEdgeVertices(){ return 6; }
+ /*
virtual int getNumEdgesRep(){ return 12; }
virtual MEdge getEdgeRep(int num)
{
@@ -861,6 +874,7 @@ class MTetrahedron10 : public MTetrahedron {
getVertex(trifaces_tetra10[num][1]),
getVertex(trifaces_tetra10[num][2]));
}
+ */
virtual int getTypeForMSH(){ return MSH_TET_10; }
virtual int getTypeForUNV(){ return 118; } // solid parabolic tetrahedron
virtual const char *getStringForPOS(){ return "SS2"; }
@@ -994,6 +1008,7 @@ class MHexahedron20 : public MHexahedron {
return getVertex(map[num]);
}
virtual int getNumEdgeVertices(){ return 12; }
+ /*
virtual int getNumEdgesRep(){ return 24; }
virtual MEdge getEdgeRep(int num)
{
@@ -1028,6 +1043,7 @@ class MHexahedron20 : public MHexahedron {
getVertex(trifaces_hexa20[num][1]),
getVertex(trifaces_hexa20[num][2]));
}
+ */
virtual int getTypeForMSH(){ return MSH_HEX_20; }
virtual int getTypeForUNV(){ return 116; } // solid parabolic brick
virtual const char *getStringForPOS(){ return 0; } // not available
@@ -1077,6 +1093,7 @@ class MHexahedron27 : public MHexahedron {
virtual int getNumEdgeVertices(){ return 12; }
virtual int getNumFaceVertices(){ return 6; }
virtual int getNumVolumeVertices(){ return 1; }
+ /*
virtual int getNumEdgesRep(){ return 24; }
virtual MEdge getEdgeRep(int num)
{
@@ -1117,6 +1134,7 @@ class MHexahedron27 : public MHexahedron {
getVertex(trifaces_hexa27[num][1]),
getVertex(trifaces_hexa27[num][2]));
}
+ */
virtual int getTypeForMSH(){ return MSH_HEX_27; }
virtual int getTypeForUNV(){ return 0; } // not available
virtual const char *getStringForPOS(){ return "SH2"; }
@@ -1254,6 +1272,7 @@ class MPrism15 : public MPrism {
return getVertex(map[num]);
}
virtual int getNumEdgeVertices(){ return 9; }
+ /*
virtual int getNumEdgesRep(){ return 18; }
virtual MEdge getEdgeRep(int num)
{
@@ -1284,6 +1303,7 @@ class MPrism15 : public MPrism {
getVertex(trifaces_prism15[num][1]),
getVertex(trifaces_prism15[num][2]));
}
+ */
virtual int getTypeForMSH(){ return MSH_PRI_15; }
virtual int getTypeForUNV(){ return 113; } // solid parabolic wedge
virtual const char *getStringForPOS(){ return 0; } // not available
@@ -1326,6 +1346,7 @@ class MPrism18 : public MPrism {
virtual MVertex *getVertex(int num){ return num < 6 ? _v[num] : _vs[num - 6]; }
virtual int getNumEdgeVertices(){ return 9; }
virtual int getNumFaceVertices(){ return 3; }
+ /*
virtual int getNumEdgesRep(){ return 18; }
virtual MEdge getEdgeRep(int num)
{
@@ -1359,6 +1380,7 @@ class MPrism18 : public MPrism {
getVertex(trifaces_prism18[num][1]),
getVertex(trifaces_prism18[num][2]));
}
+ */
virtual int getTypeForMSH(){ return MSH_PRI_18; }
virtual int getTypeForUNV(){ return 0; } // not available
virtual const char *getStringForPOS(){ return "SI2"; }
@@ -1472,6 +1494,7 @@ class MPyramid13 : public MPyramid {
virtual int getNumVertices(){ return 13; }
virtual MVertex *getVertex(int num){ return num < 5 ? _v[num] : _vs[num - 5]; }
virtual int getNumEdgeVertices(){ return 8; }
+ /*
virtual int getNumEdgesRep(){ return 16; }
virtual MEdge getEdgeRep(int num)
{
@@ -1501,6 +1524,7 @@ class MPyramid13 : public MPyramid {
getVertex(trifaces_pyramid13[num][1]),
getVertex(trifaces_pyramid13[num][2]));
}
+ */
virtual int getTypeForMSH(){ return MSH_PYR_13; }
virtual int getTypeForUNV(){ return 0; } // not available
virtual const char *getStringForPOS(){ return 0; } // not available
@@ -1541,6 +1565,7 @@ class MPyramid14 : public MPyramid {
virtual MVertex *getVertex(int num){ return num < 5 ? _v[num] : _vs[num - 5]; }
virtual int getNumEdgeVertices(){ return 8; }
virtual int getNumFaceVertices(){ return 1; }
+ /*
virtual int getNumEdgesRep(){ return 16; }
virtual MEdge getEdgeRep(int num)
{
@@ -1571,6 +1596,7 @@ class MPyramid14 : public MPyramid {
getVertex(trifaces_pyramid14[num][1]),
getVertex(trifaces_pyramid14[num][2]));
}
+ */
virtual int getTypeForMSH(){ return MSH_PYR_14; }
virtual int getTypeForUNV(){ return 0; } // not available
virtual const char *getStringForPOS(){ return "SY2"; }
diff --git a/Geo/MRep.h b/Geo/MRep.h
deleted file mode 100644
index 5385faec16..0000000000
--- a/Geo/MRep.h
+++ /dev/null
@@ -1,237 +0,0 @@
-#ifndef _MREP_H_
-#define _MREP_H_
-
-// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-// USA.
-//
-// Please report all bugs and problems to <gmsh@geuz.org>.
-
-#include <set>
-#include <map>
-#include <algorithm>
-#include "GEdge.h"
-#include "GFace.h"
-#include "GRegion.h"
-#include "MVertex.h"
-#include "MEdge.h"
-#include "MElement.h"
-#include "VertexArray.h"
-#include "Message.h"
-#include "OS.h"
-
-// #define HAVE_HASH_MAP
-
-#if defined(HAVE_HASH_MAP)
-#include <ext/hash_map>
-#endif
-
-struct equalEdge {
- bool operator()(const std::pair<MVertex*, MVertex*> &p1,
- const std::pair<MVertex*, MVertex*> &p2) const
- {
- return (p1.first == p2.first && p1.second == p2.second);
- }
-};
-
-struct hashEdge {
- size_t operator() (const std::pair<MVertex*, MVertex*> &p) const
- {
- return p.first->getNum() + p.second->getNum();
- }
-};
-
-// A mesh representation.
-class MRep {
- protected:
-
- // container for the edge representation
-#if defined(HAVE_HASH_MAP)
- typedef __gnu_cxx::hash_map<std::pair<MVertex*, MVertex*>, MElement*,
- hashEdge, equalEdge> ermap;
-#else
- typedef std::map<std::pair<MVertex*, MVertex*>, MElement*> ermap;
-#endif
- typedef std::map<MFace, MElement*, Equal_Face> frmap;
-
- ermap edges;
- frmap faces;
-
- // generates the edges from a bunch of elements
- template<class T>
- void generateEdgeRep(std::vector<T*> &elements)
- {
- for(unsigned int i = 0; i < elements.size(); i++){
- for(int j = 0; j < elements[i]->getNumEdgesRep(); j++){
- MEdge e = elements[i]->getEdgeRep(j);
- std::pair<MVertex*, MVertex*> p(e.getMinVertex(), e.getMaxVertex());
- if(!edges.count(p)) edges[p] = elements[i];
- }
- }
- }
-
- // generates the boundary faces from a bunch of elements
- template<class T>
- void generateBoundaryFaceRep(std::vector<T*> &elements)
- {
- // FIXME: TODO
-
- for(unsigned int i = 0; i < elements.size(); i++){
- for(int j = 0; j < elements[i]->getNumFacesRep(); j++){
- MFace f = elements[i]->getFaceRep(j);
- frmap::iterator it = faces.find(f);
- if(it == faces.end())
- faces[f] = elements[i];
- else
- faces.erase(it);
- }
- }
- }
-
- public:
- // the vertex arrays
- VertexArray *va_lines, *va_triangles, *va_quads;
-
- // a flag telling if all the elements in the entity are visible
- bool allElementsVisible;
-
- public:
- MRep() : va_lines(0), va_triangles(0), va_quads(0), allElementsVisible(true) {}
- virtual ~MRep(){ destroy(); }
-
- // destroys everything
- void destroy(){
- resetArrays();
- edges.clear();
- faces.clear();
- allElementsVisible = true;
- }
-
- // destroys all the vertex arrays
- void resetArrays(){
- if(va_lines) delete va_lines;
- va_lines = 0;
- if(va_triangles) delete va_triangles;
- va_triangles = 0;
- if(va_quads) delete va_quads;
- va_quads = 0;
- }
-
- // generates the edge representation
- virtual void generateEdgeRep() = 0;
-
- // accesses the edge representation
- typedef ermap::const_iterator eriter;
- eriter firstEdgeRep() { return edges.begin(); }
- eriter lastEdgeRep() { return edges.end(); }
- int getNumEdgeRep() { return edges.size(); }
-
- // generates the boundary face representation
- virtual void generateBoundaryFaceRep(){}
-
- // accesses the face representation
- typedef frmap::const_iterator friter;
- friter firstFaceRep() { return faces.begin(); }
- friter lastFaceRep() { return faces.end(); }
- int getNumFaceRep() { return faces.size(); }
-
- // returns the element at a given position in a vertex array
- // (element pointers are not always stored: returning 0 is not an
- // error)
- MElement *getElement(int va_type, int index)
- {
- switch(va_type){
- case 2:
- if(va_lines && index < va_lines->getNumElementPointers())
- return *va_lines->getElementPointerArray(index);
- break;
- case 3:
- if(va_triangles && index < va_triangles->getNumElementPointers())
- return *va_triangles->getElementPointerArray(index);
- break;
- case 4:
- if(va_quads && index < va_quads->getNumElementPointers())
- return *va_quads->getElementPointerArray(index);
- break;
- }
- return 0;
- }
-};
-
-class MRepEdge : public MRep {
- private:
- GEdge *_e;
-
- public:
- MRepEdge(GEdge *e) : _e(e) {}
- virtual ~MRepEdge(){}
- virtual void generateEdgeRep()
- {
- if(edges.size()) return;
- MRep::generateEdgeRep(_e->lines);
- }
-};
-
-class MRepFace : public MRep {
- private:
- GFace *_f;
-
- public:
- MRepFace(GFace *f) : _f(f) {}
- virtual ~MRepFace(){}
- virtual void generateEdgeRep()
- {
- if(edges.size()) return;
- double t = Cpu();
- MRep::generateEdgeRep(_f->triangles);
- MRep::generateEdgeRep(_f->quadrangles);
- Msg(DEBUG, "Created %d edges in surface %d (%gs)",
- (int)edges.size(), _f->tag(), Cpu()-t);
- }
-};
-
-class MRepRegion : public MRep {
- private:
- GRegion *_r;
-
- public:
- MRepRegion(GRegion *r) : _r(r) {}
- virtual ~MRepRegion(){}
- virtual void generateEdgeRep()
- {
- if(edges.size()) return;
- double t = Cpu();
- MRep::generateEdgeRep(_r->tetrahedra);
- MRep::generateEdgeRep(_r->hexahedra);
- MRep::generateEdgeRep(_r->prisms);
- MRep::generateEdgeRep(_r->pyramids);
- Msg(DEBUG, "Created %d edges in volume %d (%gs)",
- (int)edges.size(), _r->tag(), Cpu()-t);
- }
- virtual void generateBoundaryFaceRep()
- {
- if(faces.size()) return;
- double t = Cpu();
- MRep::generateBoundaryFaceRep(_r->tetrahedra);
- MRep::generateBoundaryFaceRep(_r->hexahedra);
- MRep::generateBoundaryFaceRep(_r->prisms);
- MRep::generateBoundaryFaceRep(_r->pyramids);
- Msg(DEBUG, "Created %d boundary faces in volume %d (%gs)",
- (int)faces.size(), _r->tag(), Cpu()-t);
- }
-};
-
-#endif
diff --git a/Geo/Makefile b/Geo/Makefile
index b5b408047b..7de66d24d7 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.162 2007-09-10 04:47:02 geuzaine Exp $
+# $Id: Makefile,v 1.163 2007-09-12 20:14:34 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -71,57 +71,61 @@ depend:
# DO NOT DELETE THIS LINE
GEntity.o: GEntity.cpp GEntity.h Range.h SPoint3.h SBoundingBox3d.h \
- ../Common/GmshDefines.h MRep.h GEdge.h GVertex.h MVertex.h GPoint.h \
- SPoint2.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
- ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
- ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
- GRegion.h ../Common/VertexArray.h ../Geo/SVector3.h ../Common/Message.h \
- ../Common/OS.h
+ ../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Common/GmshDefines.h ../Common/Context.h ../DataStr/List.h
GVertex.o: GVertex.cpp GVertex.h GEntity.h Range.h SPoint3.h \
- SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
+ SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
GFace.h GEdgeLoop.h GEdge.h SVector3.h MElement.h MEdge.h \
../Common/Hash.h MFace.h ../Numeric/Numeric.h ../Common/Context.h \
../DataStr/List.h ExtrudeParams.h ../Common/SmoothData.h Pair.h \
../Common/Message.h
GEdge.o: GEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
- SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
+ SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
GRegion.h
GEdgeLoop.o: GEdgeLoop.cpp GEdgeLoop.h GEdge.h GEntity.h Range.h \
- SPoint3.h SBoundingBox3d.h ../Common/GmshDefines.h GVertex.h MVertex.h \
- GPoint.h SPoint2.h SVector3.h MElement.h MEdge.h ../Common/Hash.h \
- MFace.h ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
+ SPoint3.h SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h GVertex.h MVertex.h GPoint.h \
+ SPoint2.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
+ ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h ../Common/Message.h
GFace.o: GFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
- SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
+ SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
GRegion.h ../Common/Message.h
GRegion.o: GRegion.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
- SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
+ SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
GRegion.h
gmshVertex.o: gmshVertex.cpp GFace.h GPoint.h GEntity.h Range.h SPoint3.h \
- SBoundingBox3d.h ../Common/GmshDefines.h GEdgeLoop.h GEdge.h GVertex.h \
+ SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h GEdgeLoop.h GEdge.h GVertex.h \
MVertex.h SPoint2.h SVector3.h MElement.h MEdge.h ../Common/Hash.h \
MFace.h ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h Pair.h gmshVertex.h Geo.h \
gmshSurface.h ../DataStr/Tree.h ../DataStr/avl.h GeoInterpolation.h \
../Common/Message.h
gmshEdge.o: gmshEdge.cpp GFace.h GPoint.h GEntity.h Range.h SPoint3.h \
- SBoundingBox3d.h ../Common/GmshDefines.h GEdgeLoop.h GEdge.h GVertex.h \
+ SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h GEdgeLoop.h GEdge.h GVertex.h \
MVertex.h SPoint2.h SVector3.h MElement.h MEdge.h ../Common/Hash.h \
MFace.h ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h Pair.h gmshEdge.h Geo.h \
gmshSurface.h ../DataStr/Tree.h ../DataStr/avl.h gmshVertex.h \
GeoInterpolation.h ../Common/Message.h
gmshFace.o: gmshFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
- SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
+ SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
@@ -129,75 +133,84 @@ gmshFace.o: gmshFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
../DataStr/avl.h gmshEdge.h gmshFace.h GeoInterpolation.h \
../Common/Message.h
gmshRegion.o: gmshRegion.cpp GModel.h GVertex.h GEntity.h Range.h \
- SPoint3.h SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h \
- SPoint2.h GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h \
- MFace.h ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
+ SPoint3.h SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
+ GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
+ ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
GRegion.h gmshFace.h Geo.h gmshSurface.h ../DataStr/Tree.h \
../DataStr/avl.h gmshVertex.h gmshRegion.h ../Common/Message.h
gmshSurface.o: gmshSurface.cpp gmshSurface.h Pair.h Range.h SPoint2.h \
SPoint3.h SVector3.h SBoundingBox3d.h ../Common/Message.h
OCCVertex.o: OCCVertex.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
- SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
+ SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
GRegion.h OCCVertex.h OCCIncludes.h OCCEdge.h OCCFace.h
OCCEdge.o: OCCEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
- SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
+ SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
GRegion.h ../Common/Message.h OCCEdge.h OCCVertex.h OCCIncludes.h \
OCCFace.h
OCCFace.o: OCCFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
- SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
+ SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
GRegion.h OCCVertex.h OCCIncludes.h OCCEdge.h OCCFace.h \
../Common/Message.h
OCCRegion.o: OCCRegion.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
- SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
+ SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
GRegion.h OCCVertex.h OCCIncludes.h OCCEdge.h OCCFace.h OCCRegion.h \
../Common/Message.h
FEdge.o: FEdge.cpp ../Common/Message.h FEdge.h GEdge.h GEntity.h Range.h \
- SPoint3.h SBoundingBox3d.h ../Common/GmshDefines.h GVertex.h MVertex.h \
- GPoint.h SPoint2.h SVector3.h MElement.h MEdge.h ../Common/Hash.h \
- MFace.h ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
+ SPoint3.h SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h GVertex.h MVertex.h GPoint.h \
+ SPoint2.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
+ ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GModel.h GFace.h GEdgeLoop.h \
Pair.h GRegion.h FVertex.h
FFace.o: FFace.cpp FVertex.h GModel.h GVertex.h GEntity.h Range.h \
- SPoint3.h SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h \
- SPoint2.h GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h \
- MFace.h ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
+ SPoint3.h SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
+ GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
+ ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
GRegion.h FFace.h FEdge.h ../Common/Message.h
FProjectionFace.o: FProjectionFace.cpp FProjectionFace.h GModel.h \
GVertex.h GEntity.h Range.h SPoint3.h SBoundingBox3d.h \
+ ../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \
../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h GEdge.h SVector3.h \
MElement.h MEdge.h ../Common/Hash.h MFace.h ../Numeric/Numeric.h \
../Common/Context.h ../DataStr/List.h ExtrudeParams.h \
../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h GRegion.h
GModel.o: GModel.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
- SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
+ SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
GRegion.h gmshSurface.h ../Mesh/Field.h ../Post/PView.h \
- ../Common/VertexArray.h ../Geo/SVector3.h ../Post/PViewData.h \
- ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h ../Post/ColorTable.h \
- ../Geo/Geo.h ../Geo/gmshSurface.h ../DataStr/Tree.h ../DataStr/avl.h \
- ../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Geo/GEdge.h \
- ../Post/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h \
- MRep.h ../Common/Message.h ../Common/OS.h ../Mesh/BackgroundMesh.h
+ ../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Post/PViewOptions.h \
+ ../Post/ColorTable.h ../Geo/Geo.h ../Geo/gmshSurface.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../Geo/SPoint2.h \
+ ../Geo/ExtrudeParams.h ../Geo/GEdge.h ../Post/OctreePost.h \
+ ../Common/Octree.h ../Common/OctreeInternals.h ../Mesh/BackgroundMesh.h
GModelIO_Geo.o: GModelIO_Geo.cpp GModel.h GVertex.h GEntity.h Range.h \
- SPoint3.h SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h \
- SPoint2.h GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h \
- MFace.h ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
+ SPoint3.h SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
+ GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
+ ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
GRegion.h Geo.h gmshSurface.h ../DataStr/Tree.h ../DataStr/avl.h \
../Parser/OpenFile.h ../DataStr/Tools.h ../DataStr/List.h \
@@ -205,35 +218,40 @@ GModelIO_Geo.o: GModelIO_Geo.cpp GModel.h GVertex.h GEntity.h Range.h \
gmshEdge.h gmshRegion.h ../Parser/Parser.h
GModelIO_Mesh.o: GModelIO_Mesh.cpp ../Common/Message.h \
../Common/GmshDefines.h GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
- SBoundingBox3d.h MVertex.h GPoint.h SPoint2.h GEdge.h SVector3.h \
+ SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h MVertex.h GPoint.h SPoint2.h GEdge.h SVector3.h \
MElement.h MEdge.h ../Common/Hash.h MFace.h ../Numeric/Numeric.h \
../Common/Context.h ../DataStr/List.h ExtrudeParams.h \
../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h GRegion.h \
gmshRegion.h Geo.h gmshSurface.h ../DataStr/Tree.h ../DataStr/avl.h \
gmshFace.h gmshVertex.h gmshEdge.h
GModelIO_OCC.o: GModelIO_OCC.cpp GModelIO_OCC.h GModel.h GVertex.h \
- GEntity.h Range.h SPoint3.h SBoundingBox3d.h ../Common/GmshDefines.h \
- MVertex.h GPoint.h SPoint2.h GEdge.h SVector3.h MElement.h MEdge.h \
+ GEntity.h Range.h SPoint3.h SBoundingBox3d.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h \
+ GPoint.h SPoint2.h GEdge.h SVector3.h MElement.h MEdge.h \
../Common/Hash.h MFace.h ../Numeric/Numeric.h ../Common/Context.h \
../DataStr/List.h ExtrudeParams.h ../Common/SmoothData.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h OCCIncludes.h ../Common/Message.h \
OCCVertex.h OCCEdge.h OCCFace.h OCCRegion.h
GModelIO_F.o: GModelIO_F.cpp GModel.h GVertex.h GEntity.h Range.h \
- SPoint3.h SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h \
- SPoint2.h GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h \
- MFace.h ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
+ SPoint3.h SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
+ GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
+ ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
GRegion.h ../Common/Message.h FVertex.h FEdge.h FFace.h GModelIO_F.h
GModelIO_CGNS.o: GModelIO_CGNS.cpp GModel.h GVertex.h GEntity.h Range.h \
- SPoint3.h SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h \
- SPoint2.h GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h \
- MFace.h ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
+ SPoint3.h SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
+ GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
+ ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
GRegion.h ../Common/Message.h MNeighbour.h
GModelIO_MED.o: GModelIO_MED.cpp GModel.h GVertex.h GEntity.h Range.h \
- SPoint3.h SBoundingBox3d.h ../Common/GmshDefines.h MVertex.h GPoint.h \
- SPoint2.h GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h \
- MFace.h ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
+ SPoint3.h SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h \
+ GEdge.h SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
+ ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h \
GRegion.h ../Common/Message.h
ExtrudeParams.o: ExtrudeParams.cpp ../Common/Gmsh.h ../Common/Message.h \
@@ -247,9 +265,10 @@ Geo.o: Geo.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h Geo.h \
../Common/GmshDefines.h gmshSurface.h Pair.h Range.h SPoint2.h \
SPoint3.h SVector3.h SBoundingBox3d.h ExtrudeParams.h \
- ../Common/SmoothData.h GModel.h GVertex.h GEntity.h MVertex.h GPoint.h \
- GEdge.h MElement.h MEdge.h ../Common/Hash.h MFace.h ../Common/Context.h \
- GFace.h GEdgeLoop.h GRegion.h GeoInterpolation.h ../Parser/Parser.h
+ ../Common/SmoothData.h GModel.h GVertex.h GEntity.h \
+ ../Common/VertexArray.h ../Geo/SVector3.h MVertex.h GPoint.h GEdge.h \
+ MElement.h MEdge.h ../Common/Hash.h MFace.h ../Common/Context.h GFace.h \
+ GEdgeLoop.h GRegion.h GeoInterpolation.h ../Parser/Parser.h
GeoStringInterface.o: GeoStringInterface.cpp ../Common/Gmsh.h \
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
@@ -257,8 +276,9 @@ GeoStringInterface.o: GeoStringInterface.cpp ../Common/Gmsh.h \
gmshSurface.h Pair.h Range.h SPoint2.h SPoint3.h SVector3.h \
SBoundingBox3d.h ExtrudeParams.h ../Common/SmoothData.h \
GeoStringInterface.h ../Parser/Parser.h ../Parser/OpenFile.h \
- ../Common/Context.h GModel.h GVertex.h GEntity.h MVertex.h GPoint.h \
- GEdge.h MElement.h MEdge.h ../Common/Hash.h MFace.h GFace.h GEdgeLoop.h \
+ ../Common/Context.h GModel.h GVertex.h GEntity.h \
+ ../Common/VertexArray.h ../Geo/SVector3.h MVertex.h GPoint.h GEdge.h \
+ MElement.h MEdge.h ../Common/Hash.h MFace.h GFace.h GEdgeLoop.h \
GRegion.h
GeoInterpolation.o: GeoInterpolation.cpp ../Common/Gmsh.h \
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
@@ -271,18 +291,20 @@ findLinks.o: findLinks.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
GModel.h GVertex.h GEntity.h Range.h SPoint3.h SBoundingBox3d.h \
+ ../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \
../Common/GmshDefines.h MVertex.h GPoint.h SPoint2.h GEdge.h SVector3.h \
MElement.h MEdge.h ../Common/Hash.h MFace.h ../Numeric/Numeric.h \
../Common/Context.h ExtrudeParams.h ../Common/SmoothData.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h
MVertex.o: MVertex.cpp MVertex.h SPoint3.h GEdge.h GEntity.h Range.h \
- SBoundingBox3d.h ../Common/GmshDefines.h GVertex.h GPoint.h SPoint2.h \
+ SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Common/GmshDefines.h GVertex.h GPoint.h SPoint2.h \
SVector3.h MElement.h MEdge.h ../Common/Hash.h MFace.h \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
ExtrudeParams.h ../Common/SmoothData.h GFace.h GEdgeLoop.h Pair.h
MElement.o: MElement.cpp MElement.h ../Common/GmshDefines.h MVertex.h \
SPoint3.h MEdge.h SVector3.h ../Common/Hash.h MFace.h \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h GEntity.h \
- Range.h SBoundingBox3d.h GFace.h GPoint.h GEdgeLoop.h GEdge.h GVertex.h \
- SPoint2.h ExtrudeParams.h ../Common/SmoothData.h Pair.h \
- ../Common/Message.h
+ Range.h SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ GFace.h GPoint.h GEdgeLoop.h GEdge.h GVertex.h SPoint2.h \
+ ExtrudeParams.h ../Common/SmoothData.h Pair.h ../Common/Message.h
diff --git a/Graphics/Makefile b/Graphics/Makefile
index dc4d349039..8d2b4cc295 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.128 2007-09-10 04:47:03 geuzaine Exp $
+# $Id: Makefile,v 1.129 2007-09-12 20:14:34 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -73,51 +73,52 @@ Draw.o: Draw.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../Common/GmshDefines.h Draw.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/Context.h ../Numeric/Numeric.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/MVertex.h ../Geo/SPoint3.h \
- ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
- ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h \
- ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h \
- ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h \
- ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
- ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
- ../Geo/SBoundingBox3d.h ../Post/PView.h ../Common/VertexArray.h \
- ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h
+ ../Geo/SBoundingBox3d.h ../Common/VertexArray.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
+ ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/GFace.h \
+ ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
+ ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
+ ../Post/PView.h ../Post/PViewData.h ../Post/PViewOptions.h \
+ ../Post/ColorTable.h
Mesh.o: Mesh.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Numeric/Numeric.h ../Common/Context.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
- ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
- ../Geo/SBoundingBox3d.h Draw.h ../Geo/MRep.h ../Geo/GEdge.h \
- ../Geo/GFace.h ../Geo/GRegion.h ../Geo/MVertex.h ../Geo/MEdge.h \
- ../Geo/MElement.h ../Common/VertexArray.h ../Common/OS.h gl2ps.h
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
+ ../Common/Context.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
+ ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h Draw.h \
+ ../Common/OS.h gl2ps.h
Geom.o: Geom.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h Draw.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/Context.h gl2ps.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Common/GmshDefines.h \
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Numeric/Numeric.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/GFace.h \
+ ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
+ ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h
Post.o: Post.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
@@ -132,21 +133,19 @@ SelectBuffer.o: SelectBuffer.cpp ../Common/Gmsh.h ../Common/Message.h \
../Common/GmshUI.h ../Common/GmshDefines.h Draw.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/Context.h \
SelectBuffer.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/MVertex.h \
- ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
- ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
- ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
- ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/GFace.h \
- ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
- ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/GModel.h \
- ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.h \
- ../Geo/SBoundingBox3d.h ../Geo/MRep.h ../Geo/GEdge.h ../Geo/GFace.h \
- ../Geo/GRegion.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MElement.h \
- ../Common/VertexArray.h ../Common/OS.h
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/MVertex.h ../Geo/SPoint3.h \
+ ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
+ ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Numeric/Numeric.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
+ ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
+ ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h \
+ ../Geo/GRegion.h ../Geo/SBoundingBox3d.h
Iso.o: Iso.cpp ../Numeric/Numeric.h
Entity.o: Entity.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
diff --git a/Graphics/Mesh.cpp b/Graphics/Mesh.cpp
index 1feca83c27..a33a8fcf1e 100644
--- a/Graphics/Mesh.cpp
+++ b/Graphics/Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: Mesh.cpp,v 1.201 2007-08-24 20:14:18 geuzaine Exp $
+// $Id: Mesh.cpp,v 1.202 2007-09-12 20:14:34 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -24,7 +24,6 @@
#include "GModel.h"
#include "Draw.h"
#include "Context.h"
-#include "MRep.h"
#include "OS.h"
#include "gl2ps.h"
@@ -73,10 +72,11 @@ static unsigned int getColorByElement(MElement *ele)
else if(CTX.mesh.color_carousel == 3){ // by partition
return CTX.color.mesh.carousel[abs(ele->getPartition() % 20)];
}
- else{ // by elementary or physical entity
- // this is not perfect (e.g. a triangle can have no vertices
- // categorized on a surface), but it's the best we can do "fast"
- // since we don't store the associated entity in the element
+ else{
+ // by elementary or physical entity (this is not perfect (since
+ // e.g. a triangle can have no vertices categorized on a surface),
+ // but it's the best we can do "fast" since we don't store the
+ // associated entity in the element
for(int i = 0; i < ele->getNumVertices(); i++){
GEntity *e = ele->getVertex(i)->onWhat();
if(e && (e->dim() == ele->getDim()))
@@ -190,7 +190,7 @@ static void drawNormals(std::vector<T*> &elements)
for(unsigned int i = 0; i < elements.size(); i++){
MElement *ele = elements[i];
if(!isElementVisible(ele)) continue;
- SVector3 n = ele->getFaceRep(0).normal();
+ SVector3 n = ele->getFace(0).normal();
for(int j = 0; j < 3; j++)
n[j] *= CTX.mesh.normals * CTX.pixel_equiv_x / CTX.s[j];
SPoint3 pc = ele->barycenter();
@@ -207,7 +207,7 @@ static void drawTangents(std::vector<T*> &elements)
for(unsigned int i = 0; i < elements.size(); i++){
MElement *ele = elements[i];
if(!isElementVisible(ele)) continue;
- SVector3 t = ele->getEdgeRep(0).tangent();
+ SVector3 t = ele->getEdge(0).tangent();
for(int j = 0; j < 3; j++)
t[j] *= CTX.mesh.tangents * CTX.pixel_equiv_x / CTX.s[j];
SPoint3 pc = ele->barycenter();
@@ -356,19 +356,19 @@ static void addSmoothNormals(GEntity *e, std::vector<T*> &elements)
{
for(unsigned int i = 0; i < elements.size(); i++){
MElement *ele = elements[i];
+ SPoint3 pc;
+ if(CTX.mesh.explode != 1.) pc = ele->barycenter();
for(int j = 0; j < ele->getNumFacesRep(); j++){
- MFace fr = ele->getFaceRep(j);
- SVector3 n = fr.normal();
- SPoint3 pc;
- if(CTX.mesh.explode != 1.) pc = ele->barycenter();
- for(int k = 0; k < fr.getNumVertices(); k++){
- MVertex *v = fr.getVertex(k);
- SPoint3 p(v->x(), v->y(), v->z());
+ double x[4], y[4], z[4];
+ SVector3 n[4];
+ int numverts = ele->getFaceRep(j, x, y, z, n);
+ for(int k = 0; k < numverts; k++){
if(CTX.mesh.explode != 1.){
- for(int l = 0; l < 3; l++)
- p[l] = pc[l] + CTX.mesh.explode * (p[l] - pc[l]);
+ x[k] = pc[0] + CTX.mesh.explode * (x[k] - pc[0]);
+ y[k] = pc[1] + CTX.mesh.explode * (y[k] - pc[1]);
+ z[k] = pc[2] + CTX.mesh.explode * (z[k] - pc[2]);
}
- e->model()->normals->add(p[0], p[1], p[2], n[0], n[1], n[2]);
+ e->model()->normals->add(x[k], y[k], z[k], n[k][0], n[k][1], n[k][2]);
}
}
}
@@ -376,97 +376,69 @@ static void addSmoothNormals(GEntity *e, std::vector<T*> &elements)
// Routines for filling and drawing the vertex arrays
-static void addEdgesInArrays(GEntity *e)
-{
- MRep *m = e->meshRep;
- for(MRep::eriter it = m->firstEdgeRep(); it != m->lastEdgeRep(); ++it){
- MVertex *v[2] = {it->first.first, it->first.second};
- MElement *ele = it->second;
- SVector3 n = ele->getFaceRep(0).normal();
- unsigned int color = getColorByElement(ele);
- for(int i = 0; i < 2; i++){
- if(e->dim() == 2 && CTX.mesh.smooth_normals)
- e->model()->normals->get(v[i]->x(), v[i]->y(), v[i]->z(), n[0], n[1], n[2]);
- m->va_lines->add(v[i]->x(), v[i]->y(), v[i]->z(), n[0], n[1], n[2], color, ele);
- }
- }
-}
-
-static void addFacesInArrays(GEntity *e)
-{
- MRep *m = e->meshRep;
- for(MRep::friter it = m->firstFaceRep(); it != m->lastFaceRep(); ++it){
- MFace f = it->first;
- MElement *ele = it->second;
- SVector3 n = f.normal();
- unsigned int color = getColorByElement(ele);
- for(int i = 0; i < f.getNumVertices(); i++){
- MVertex *v = f.getVertex(i);
- if(CTX.mesh.smooth_normals)
- e->model()->normals->get(v->x(), v->y(), v->z(), n[0], n[1], n[2]);
- if(f.getNumVertices() == 3)
- m->va_triangles->add(v->x(), v->y(), v->z(), n[0], n[1], n[2], color, ele);
- else if(f.getNumVertices() == 4)
- m->va_quads->add(v->x(), v->y(), v->z(), n[0], n[1], n[2], color, ele);
- }
- }
-}
-
template<class T>
-static void addElementsInArrays(GEntity *e, std::vector<T*> &elements)
+static void addElementsInArrays(GEntity *e, std::vector<T*> &elements,
+ bool edges, bool faces)
{
- MRep *m = e->meshRep;
for(unsigned int i = 0; i < elements.size(); i++){
MElement *ele = elements[i];
- if(!isElementVisible(ele)) continue;
- if(CTX.mesh.use_cut_plane && CTX.mesh.cut_plane_draw_intersect){
+
+ if(!isElementVisible(ele) || ele->getDim() < 1) continue;
+
+ if(CTX.mesh.use_cut_plane && CTX.mesh.cut_plane_draw_intersect)
if(e->dim() == 3 && intersectCutPlane(ele)) continue;
- }
- unsigned int color = getColorByElement(ele);
+
+ unsigned int c = getColorByElement(ele);
+ unsigned int col[4] = {c, c, c, c};
+
SPoint3 pc;
if(CTX.mesh.explode != 1.) pc = ele->barycenter();
- if(ele->getNumFacesRep()){
- for(int j = 0; j < ele->getNumFacesRep(); j++){
- MFace fr = ele->getFaceRep(j);
- SVector3 n = fr.normal();
- int numverts = fr.getNumVertices();
- for(int k = 0; k < numverts; k++){
- MVertex *v = fr.getVertex(k);
- SPoint3 p(v->x(), v->y(), v->z());
- if(CTX.mesh.explode != 1.){
- for(int l = 0; l < 3; l++)
- p[l] = pc[l] + CTX.mesh.explode * (p[l] - pc[l]);
+
+ if(edges && ele->getNumEdgesRep()){
+ for(int j = 0; j < ele->getNumEdgesRep(); j++){
+ double x[2], y[2], z[2];
+ SVector3 n[2];
+ ele->getEdgeRep(j, x, y, z, n);
+ if(CTX.mesh.explode != 1.){
+ for(int k = 0; k < 2; k++){
+ x[k] = pc[0] + CTX.mesh.explode * (x[k] - pc[0]);
+ y[k] = pc[1] + CTX.mesh.explode * (y[k] - pc[1]);
+ z[k] = pc[2] + CTX.mesh.explode * (z[k] - pc[2]);
}
- if(e->dim() == 2 && CTX.mesh.smooth_normals)
- e->model()->normals->get(p[0], p[1], p[2], n[0], n[1], n[2]);
- if(numverts == 3)
- m->va_triangles->add(p[0], p[1], p[2], n[0], n[1], n[2], color, ele);
- else if(numverts == 4)
- m->va_quads->add(p[0], p[1], p[2], n[0], n[1], n[2], color, ele);
}
+ if(e->dim() == 2 && CTX.mesh.smooth_normals)
+ for(int k = 0; k < 2; k++)
+ e->model()->normals->get(x[k], y[k], z[k], n[k][0], n[k][1], n[k][2]);
+ e->va_lines->add(x, y, z, n, col, ele);
}
}
- if(!ele->getNumFacesRep() || ele->getPolynomialOrder() > 1){
- SPoint3 pc;
- if(CTX.mesh.explode != 1.) pc = ele->barycenter();
- for(int j = 0; j < ele->getNumEdgesRep(); j++){
- MEdge er = ele->getEdgeRep(j);
- for(int k = 0; k < er.getNumVertices(); k++){
- MVertex *v = er.getVertex(k);
- SPoint3 p(v->x(), v->y(), v->z());
- if(CTX.mesh.explode != 1.){
- for(int l = 0; l < 3; l++)
- p[l] = pc[l] + CTX.mesh.explode * (p[l] - pc[l]);
+
+ if(faces && ele->getNumFacesRep()){
+ for(int j = 0; j < ele->getNumFacesRep(); j++){
+ double x[4], y[4], z[4];
+ SVector3 n[4];
+ int numverts = ele->getFaceRep(j, x, y, z, n);
+ if(CTX.mesh.explode != 1.){
+ for(int k = 0; k < numverts; k++){
+ x[k] = pc[0] + CTX.mesh.explode * (x[k] - pc[0]);
+ y[k] = pc[1] + CTX.mesh.explode * (y[k] - pc[1]);
+ z[k] = pc[2] + CTX.mesh.explode * (z[k] - pc[2]);
}
- m->va_lines->add(p[0], p[1], p[2], color, ele);
}
+ if(e->dim() == 2 && CTX.mesh.smooth_normals)
+ for(int k = 0; k < numverts; k++)
+ e->model()->normals->get(x[k], y[k], z[k], n[k][0], n[k][1], n[k][2]);
+ if(numverts == 3)
+ e->va_triangles->add(x, y, z, n, col, ele);
+ else if(numverts == 4)
+ e->va_quads->add(x, y, z, n, col, ele);
}
}
}
}
static void drawArrays(GEntity *e, VertexArray *va, GLint type, bool useNormalArray,
- int forceColor=0, unsigned int color=0, bool drawOutline=false)
+ int forceColor=0, unsigned int color=0)
{
if(!va) return;
@@ -518,15 +490,11 @@ static void drawArrays(GEntity *e, VertexArray *va, GLint type, bool useNormalAr
glColor4ubv((GLubyte *) & color);
}
- if(va->getNumVerticesPerElement() > 2 && !drawOutline && CTX.polygon_offset)
+ if(va->getNumVerticesPerElement() > 2 && CTX.polygon_offset)
glEnable(GL_POLYGON_OFFSET_FILL);
- if(drawOutline)
- glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-
glDrawArrays(type, 0, va->getNumVertices());
- glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
glDisable(GL_POLYGON_OFFSET_FILL);
glDisable(GL_LIGHTING);
@@ -561,20 +529,28 @@ class drawMeshGVertex {
// GEdge drawing routines
class initMeshGEdge {
- public :
+ private:
+ int _estimateNumLines(GEdge *e)
+ {
+ int num = 0;
+ if(CTX.mesh.lines){
+ num += e->lines.size();
+ if(areSomeElementsCurved(e->lines)) num *= 2;
+ }
+ return num + 100;
+ }
+ public:
void operator () (GEdge *e)
{
if(!e->getVisibility()) return;
- if(!e->meshRep) e->meshRep = new MRepEdge(e);
-
- MRep *m = e->meshRep;
- m->resetArrays();
- m->allElementsVisible = areAllElementsVisible(e->lines);
+ e->deleteVertexArrays();
+ e->setAllElementsVisible(areAllElementsVisible(e->lines));
if(CTX.mesh.lines){
- m->va_lines = new VertexArray(2, e->lines.size());
- addElementsInArrays(e, e->lines);
+ e->va_lines = new VertexArray(2, _estimateNumLines(e));
+ addElementsInArrays(e, e->lines, CTX.mesh.lines, false);
+ e->va_lines->finalize();
}
}
};
@@ -585,23 +561,19 @@ class drawMeshGEdge {
{
if(!e->getVisibility()) return;
- MRep *m = e->meshRep;
-
- if(!m) return;
-
if(CTX.render_mode == GMSH_SELECT) {
glPushName(1);
glPushName(e->tag());
}
if(CTX.mesh.lines)
- drawArrays(e, m->va_lines, GL_LINES, false);
+ drawArrays(e, e->va_lines, GL_LINES, false);
if(CTX.mesh.lines_num)
drawElementLabels(e, e->lines);
if(CTX.mesh.points || CTX.mesh.points_num){
- if(m->allElementsVisible)
+ if(e->getAllElementsVisible())
drawVerticesPerEntity(e);
else
drawVerticesPerElement(e, e->lines);
@@ -620,7 +592,7 @@ class drawMeshGEdge {
// GFace drawing routines
class initSmoothNormalsGFace {
- public :
+ public:
void operator () (GFace *f)
{
addSmoothNormals(f, f->triangles);
@@ -629,50 +601,59 @@ class initSmoothNormalsGFace {
};
class initMeshGFace {
- public :
+ private:
+ bool _curved;
+ int _estimateNumLines(GFace *f)
+ {
+ int num = 0;
+ if(CTX.mesh.surfaces_edges){
+ num += (3 * f->triangles.size() + 4 * f->quadrangles.size()) / 2;
+ if(CTX.mesh.explode != 1.) num *= 2;
+ if(_curved) num *= 2;
+ }
+ return num + 100;
+ }
+ int _estimateNumTriangles(GFace *f)
+ {
+ int num = 0;
+ if(CTX.mesh.surfaces_faces){
+ num += f->triangles.size();
+ if(_curved) num *= 4;
+ }
+ return num + 100;
+ }
+ int _estimateNumQuads(GFace *f)
+ {
+ int num = 0;
+ if(CTX.mesh.surfaces_faces){
+ num += f->quadrangles.size();
+ if(_curved) num *= 4;
+ }
+ return num + 100;
+ }
+ public:
void operator () (GFace *f)
{
if(!f->getVisibility()) return;
- if(!f->meshRep) f->meshRep = new MRepFace(f);
-
- MRep *m = f->meshRep;
- m->resetArrays();
- m->allElementsVisible =
- CTX.mesh.triangles && areAllElementsVisible(f->triangles) &&
- CTX.mesh.quadrangles && areAllElementsVisible(f->quadrangles);
-
- bool curvedElements =
- areSomeElementsCurved(f->triangles) ||
- areSomeElementsCurved(f->quadrangles);
-
- bool useEdges = CTX.mesh.surfaces_edges ? true : false;
- if(CTX.mesh.surfaces_faces || CTX.mesh.explode != 1. ||
- CTX.pick_elements || !m->allElementsVisible)
- useEdges = false; // cannot use edges in these cases
-
- // Further optimizations are possible when useEdges is true:
- // 1) store the unique vertices in the vertex array and use
- // glDrawElements() instead of glDrawArrays(). Question:
- // which normal do you choose for each vertex, and so how
- // can you achieve accurate "flat shading" rendering?
- // 2) use tc to stripe the triangles and draw strips instead of
- // individual triangles
-
- if(useEdges){
- Msg(DEBUG, "Using edges to draw surface %d", f->tag());
- m->generateEdgeRep();
- m->va_lines = new VertexArray(2, m->getNumEdgeRep());
- addEdgesInArrays(f);
- }
- else if(CTX.mesh.surfaces_edges || CTX.mesh.surfaces_faces){
- if(curvedElements) // cannot simply draw polygon outlines!
- m->va_lines = new VertexArray(2, 6 * f->triangles.size()
- + 8 * f->quadrangles.size());
- m->va_triangles = new VertexArray(3, f->triangles.size());
- m->va_quads = new VertexArray(4, f->quadrangles.size());
- if(CTX.mesh.triangles) addElementsInArrays(f, f->triangles);
- if(CTX.mesh.quadrangles) addElementsInArrays(f, f->quadrangles);
+ f->deleteVertexArrays();
+ f->setAllElementsVisible
+ (CTX.mesh.triangles && areAllElementsVisible(f->triangles) &&
+ CTX.mesh.quadrangles && areAllElementsVisible(f->quadrangles));
+
+ bool edg = CTX.mesh.surfaces_edges;
+ bool fac = CTX.mesh.surfaces_faces;
+ if(edg || fac){
+ _curved = (areSomeElementsCurved(f->triangles) ||
+ areSomeElementsCurved(f->quadrangles));
+ f->va_lines = new VertexArray(2, _estimateNumLines(f));
+ f->va_triangles = new VertexArray(3, _estimateNumTriangles(f));
+ f->va_quads = new VertexArray(4, _estimateNumQuads(f));
+ if(CTX.mesh.triangles) addElementsInArrays(f, f->triangles, edg, fac);
+ if(CTX.mesh.quadrangles) addElementsInArrays(f, f->quadrangles, edg, fac);
+ f->va_lines->finalize();
+ f->va_triangles->finalize();
+ f->va_quads->finalize();
}
}
};
@@ -683,32 +664,15 @@ class drawMeshGFace {
{
if(!f->getVisibility()) return;
- MRep *m = f->meshRep;
-
- if(!m) return;
-
if(CTX.render_mode == GMSH_SELECT) {
glPushName(2);
glPushName(f->tag());
}
- if(CTX.mesh.surfaces_edges){
- if(m->va_lines && m->va_lines->getNumVertices()){
- drawArrays(f, m->va_lines, GL_LINES, CTX.mesh.light && CTX.mesh.light_lines,
- CTX.mesh.surfaces_faces, CTX.color.mesh.line);
- }
- else{
- drawArrays(f, m->va_triangles, GL_TRIANGLES, CTX.mesh.light && CTX.mesh.light_lines,
- CTX.mesh.surfaces_faces, CTX.color.mesh.line, true);
- drawArrays(f, m->va_quads, GL_QUADS, CTX.mesh.light && CTX.mesh.light_lines,
- CTX.mesh.surfaces_faces, CTX.color.mesh.line, true);
- }
- }
-
- if(CTX.mesh.surfaces_faces){
- drawArrays(f, m->va_triangles, GL_TRIANGLES, CTX.mesh.light);
- drawArrays(f, m->va_quads, GL_QUADS, CTX.mesh.light);
- }
+ drawArrays(f, f->va_lines, GL_LINES, CTX.mesh.light && CTX.mesh.light_lines,
+ CTX.mesh.surfaces_faces, CTX.color.mesh.line);
+ drawArrays(f, f->va_triangles, GL_TRIANGLES, CTX.mesh.light);
+ drawArrays(f, f->va_quads, GL_QUADS, CTX.mesh.light);
if(CTX.mesh.surfaces_num) {
if(CTX.mesh.triangles)
@@ -718,7 +682,7 @@ class drawMeshGFace {
}
if(CTX.mesh.points || CTX.mesh.points_num){
- if(m->allElementsVisible)
+ if(f->getAllElementsVisible())
drawVerticesPerEntity(f);
else{
if(CTX.mesh.triangles) drawVerticesPerElement(f, f->triangles);
@@ -746,102 +710,90 @@ class drawMeshGFace {
// GRegion drawing routines
class initMeshGRegion {
- public :
+ private:
+ bool _curved;
+ int _estimateNumLines(GRegion *r)
+ {
+ int num = 0;
+ if(CTX.mesh.volumes_edges){
+ // suppose edge shared by 4 elements on averge (pessmistic)
+ num += (12 * r->tetrahedra.size() + 24 * r->hexahedra.size() +
+ 18 * r->prisms.size() + 16 * r->pyramids.size()) / 4;
+ if(CTX.mesh.explode != 1.) num *= 4;
+ if(_curved) num *= 2;
+ }
+ return num + 100;
+ }
+ int _estimateNumTriangles(GRegion *r)
+ {
+ int num = 0;
+ if(CTX.mesh.volumes_faces){
+ num += (4 * r->tetrahedra.size() + 2 * r->prisms.size() +
+ 4 * r->pyramids.size()) / 2;
+ if(CTX.mesh.explode != 1.) num *= 2;
+ if(_curved) num *= 4;
+ }
+ return num + 100;
+ }
+ int _estimateNumQuads(GRegion *r)
+ {
+ int num = 0;
+ if(CTX.mesh.volumes_faces){
+ num += (6 * r->hexahedra.size() + 3 * r->prisms.size() +
+ r->pyramids.size()) / 2;
+ if(CTX.mesh.explode != 1.) num *= 2;
+ if(_curved) num *= 4;
+ }
+ return num + 100;
+ }
+ public:
void operator () (GRegion *r)
{
if(!r->getVisibility()) return;
- if(!r->meshRep) r->meshRep = new MRepRegion(r);
-
- MRep *m = r->meshRep;
- m->resetArrays();
- m->allElementsVisible =
- CTX.mesh.tetrahedra && areAllElementsVisible(r->tetrahedra) &&
- CTX.mesh.hexahedra && areAllElementsVisible(r->hexahedra) &&
- CTX.mesh.prisms && areAllElementsVisible(r->prisms) &&
- CTX.mesh.pyramids && areAllElementsVisible(r->pyramids);
-
- bool useEdges = CTX.mesh.volumes_edges ? true : false;
- if(CTX.mesh.volumes_faces || CTX.mesh.explode != 1. ||
- CTX.pick_elements || !m->allElementsVisible)
- useEdges = false; // cannot use edges in these cases
-
- bool curvedElements =
- areSomeElementsCurved(r->tetrahedra) ||
- areSomeElementsCurved(r->hexahedra) ||
- areSomeElementsCurved(r->prisms) ||
- areSomeElementsCurved(r->pyramids);
-
- bool useSkin = CTX.mesh.volumes_faces ? true : false;
- if(CTX.mesh.explode != 1. || !m->allElementsVisible)
- useSkin = false;
- useSkin = false; // FIXME: to do
-
- if(useSkin){
- Msg(DEBUG, "Using boundary faces to draw volume %d", r->tag());
- m->generateBoundaryFaceRep();
- m->va_triangles = new VertexArray(3, m->getNumFaceRep());
- m->va_quads = new VertexArray(4, m->getNumFaceRep());
- addFacesInArrays(r);
- }
- else if(useEdges){
- Msg(DEBUG, "Using edges to draw volume %d", r->tag());
- m->generateEdgeRep();
- m->va_lines = new VertexArray(2, m->getNumEdgeRep());
- addEdgesInArrays(r);
- }
- else if(CTX.mesh.volumes_edges || CTX.mesh.volumes_faces){
- if(curvedElements) // cannot simply draw polygon outlines!
- m->va_lines = new VertexArray(2, 12 * r->tetrahedra.size() +
- 24 * r->hexahedra.size() +
- 18 * r->prisms.size() +
- 16 * r->pyramids.size());
- m->va_triangles = new VertexArray(3, 4 * r->tetrahedra.size() +
- 2 * r->prisms.size() +
- 4 * r->pyramids.size());
- m->va_quads = new VertexArray(4, 6 * r->hexahedra.size() +
- 3 * r->prisms.size() +
- r->pyramids.size());
- if(CTX.mesh.tetrahedra) addElementsInArrays(r, r->tetrahedra);
- if(CTX.mesh.hexahedra) addElementsInArrays(r, r->hexahedra);
- if(CTX.mesh.prisms) addElementsInArrays(r, r->prisms);
- if(CTX.mesh.pyramids) addElementsInArrays(r, r->pyramids);
+ r->deleteVertexArrays();
+ r->setAllElementsVisible
+ (CTX.mesh.tetrahedra && areAllElementsVisible(r->tetrahedra) &&
+ CTX.mesh.hexahedra && areAllElementsVisible(r->hexahedra) &&
+ CTX.mesh.prisms && areAllElementsVisible(r->prisms) &&
+ CTX.mesh.pyramids && areAllElementsVisible(r->pyramids));
+
+ bool edg = CTX.mesh.volumes_edges;
+ bool fac = CTX.mesh.volumes_faces;
+ if(edg || fac){
+ _curved = (areSomeElementsCurved(r->tetrahedra) ||
+ areSomeElementsCurved(r->hexahedra) ||
+ areSomeElementsCurved(r->prisms) ||
+ areSomeElementsCurved(r->pyramids));
+ r->va_lines = new VertexArray(2, _estimateNumLines(r));
+ r->va_triangles = new VertexArray(3, _estimateNumTriangles(r));
+ r->va_quads = new VertexArray(4, _estimateNumQuads(r));
+ if(CTX.mesh.tetrahedra) addElementsInArrays(r, r->tetrahedra, edg, fac);
+ if(CTX.mesh.hexahedra) addElementsInArrays(r, r->hexahedra, edg, fac);
+ if(CTX.mesh.prisms) addElementsInArrays(r, r->prisms, edg, fac);
+ if(CTX.mesh.pyramids) addElementsInArrays(r, r->pyramids, edg, fac);
+ r->va_lines->finalize();
+ r->va_triangles->finalize();
+ r->va_quads->finalize();
}
}
};
class drawMeshGRegion {
- public :
+ public:
void operator () (GRegion *r)
{
if(!r->getVisibility()) return;
- MRep *m = r->meshRep;
-
- if(!m) return;
-
if(CTX.render_mode == GMSH_SELECT) {
glPushName(3);
glPushName(r->tag());
}
- if(CTX.mesh.volumes_edges){
- if(m->va_lines && m->va_lines->getNumVertices()){
- drawArrays(r, m->va_lines, GL_LINES, CTX.mesh.light && CTX.mesh.light_lines,
- CTX.mesh.volumes_faces, CTX.color.mesh.line);
- }
- else{
- drawArrays(r, m->va_triangles, GL_TRIANGLES, CTX.mesh.light && CTX.mesh.light_lines,
- CTX.mesh.volumes_faces, CTX.color.mesh.line, true);
- drawArrays(r, m->va_quads, GL_QUADS, CTX.mesh.light && CTX.mesh.light_lines,
- CTX.mesh.volumes_faces, CTX.color.mesh.line, true);
- }
- }
-
- if(CTX.mesh.volumes_faces){
- drawArrays(r, m->va_triangles, GL_TRIANGLES, CTX.mesh.light);
- drawArrays(r, m->va_quads, GL_QUADS, CTX.mesh.light);
- }
+ drawArrays(r, r->va_lines, GL_LINES, CTX.mesh.light && CTX.mesh.light_lines,
+ CTX.mesh.volumes_faces, CTX.color.mesh.line);
+ drawArrays(r, r->va_triangles, GL_TRIANGLES, CTX.mesh.light);
+ drawArrays(r, r->va_quads, GL_QUADS, CTX.mesh.light);
if(CTX.mesh.volumes_num) {
if(CTX.mesh.tetrahedra)
@@ -859,7 +811,7 @@ class drawMeshGRegion {
}
if(CTX.mesh.points || CTX.mesh.points_num){
- if(m->allElementsVisible)
+ if(r->getAllElementsVisible())
drawVerticesPerEntity(r);
else{
if(CTX.mesh.tetrahedra) drawVerticesPerElement(r, r->tetrahedra);
diff --git a/Graphics/SelectBuffer.cpp b/Graphics/SelectBuffer.cpp
index 23bd91bf84..d9ceff99b0 100644
--- a/Graphics/SelectBuffer.cpp
+++ b/Graphics/SelectBuffer.cpp
@@ -1,4 +1,4 @@
-// $Id: SelectBuffer.cpp,v 1.13 2007-08-21 19:05:40 geuzaine Exp $
+// $Id: SelectBuffer.cpp,v 1.14 2007-09-12 20:14:34 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -26,7 +26,6 @@
#include "Context.h"
#include "SelectBuffer.h"
#include "GModel.h"
-#include "MRep.h"
extern Context_T CTX;
@@ -45,6 +44,27 @@ class hitDepthLessThan{
}
};
+// returns the element at a given position in a vertex array (element
+// pointers are not always stored: returning 0 is not an error)
+MElement *getElement(GEntity *e, int va_type, int index)
+{
+ switch(va_type){
+ case 2:
+ if(e->va_lines && index < e->va_lines->getNumElementPointers())
+ return *e->va_lines->getElementPointerArray(index);
+ break;
+ case 3:
+ if(e->va_triangles && index < e->va_triangles->getNumElementPointers())
+ return *e->va_triangles->getElementPointerArray(index);
+ break;
+ case 4:
+ if(e->va_quads && index < e->va_quads->getNumElementPointers())
+ return *e->va_quads->getElementPointerArray(index);
+ break;
+ }
+ return 0;
+}
+
bool ProcessSelectionBuffer(int entityType,
bool multipleSelection, bool meshSelection,
int x, int y, int w, int h,
@@ -169,8 +189,8 @@ bool ProcessSelectionBuffer(int entityType,
Msg(GERROR, "Problem in line selection processing");
return false;
}
- if(hits[i].type2 && e->meshRep){
- MElement *ele = e->meshRep->getElement(hits[i].type2, hits[i].ient2);
+ if(hits[i].type2){
+ MElement *ele = getElement(e, hits[i].type2, hits[i].ient2);
if(ele) elements.push_back(ele);
}
edges.push_back(e);
@@ -184,8 +204,8 @@ bool ProcessSelectionBuffer(int entityType,
Msg(GERROR, "Problem in surface selection processing");
return false;
}
- if(hits[i].type2 && f->meshRep){
- MElement *ele = f->meshRep->getElement(hits[i].type2, hits[i].ient2);
+ if(hits[i].type2){
+ MElement *ele = getElement(f, hits[i].type2, hits[i].ient2);
if(ele) elements.push_back(ele);
}
faces.push_back(f);
@@ -199,8 +219,8 @@ bool ProcessSelectionBuffer(int entityType,
Msg(GERROR, "Problem in volume selection processing");
return false;
}
- if(hits[i].type2 && r->meshRep){
- MElement *ele = r->meshRep->getElement(hits[i].type2, hits[i].ient2);
+ if(hits[i].type2){
+ MElement *ele = getElement(r, hits[i].type2, hits[i].ient2);
if(ele) elements.push_back(ele);
}
regions.push_back(r);
diff --git a/Mesh/HighOrder.cpp b/Mesh/HighOrder.cpp
index 63586b8452..abb93ba35f 100644
--- a/Mesh/HighOrder.cpp
+++ b/Mesh/HighOrder.cpp
@@ -1,4 +1,4 @@
-// $Id: HighOrder.cpp,v 1.14 2007-09-03 20:09:14 geuzaine Exp $
+// $Id: HighOrder.cpp,v 1.15 2007-09-12 20:14:34 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -21,7 +21,6 @@
#include "HighOrder.h"
#include "MElement.h"
-#include "MRep.h"
#include "Message.h"
#include "OS.h"
@@ -479,8 +478,7 @@ void setHighOrder(GEdge *ge, edgeContainer &edgeVertices, bool linear,
delete l;
}
ge->lines = lines2;
-
- if(ge->meshRep) ge->meshRep->destroy();
+ ge->deleteVertexArrays();
}
void setHighOrder(GFace *gf, edgeContainer &edgeVertices,
@@ -534,8 +532,7 @@ void setHighOrder(GFace *gf, edgeContainer &edgeVertices,
delete q;
}
gf->quadrangles = quadrangles2;
-
- if(gf->meshRep) gf->meshRep->destroy();
+ gf->deleteVertexArrays();
}
void setHighOrder(GRegion *gr, edgeContainer &edgeVertices,
@@ -627,8 +624,7 @@ void setHighOrder(GRegion *gr, edgeContainer &edgeVertices,
delete p;
}
gr->pyramids = pyramids2;
-
- if(gr->meshRep) gr->meshRep->destroy();
+ gr->deleteVertexArrays();
}
template<class T>
@@ -647,8 +643,7 @@ void setFirstOrder(GEntity *e, std::vector<T*> &elements)
delete ele;
}
elements = elements1;
-
- if(e->meshRep) e->meshRep->destroy();
+ e->deleteVertexArrays();
}
void removeHighOrderVertices(GEntity *e)
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 497a21794a..a0cc2474b0 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.182 2007-09-10 04:47:04 geuzaine Exp $
+# $Id: Makefile,v 1.183 2007-09-12 20:14:34 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -99,21 +99,21 @@ Generator.o: Generator.cpp ../Common/Gmsh.h ../Common/Message.h \
meshGRegion.h BackgroundMesh.h BoundaryLayer.h HighOrder.h
Field.o: Field.cpp ../Mesh/BDS.h ../Geo/GFace.h ../Geo/GPoint.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h \
- ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h \
- ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h \
- ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h \
- ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
- ../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Post/PView.h \
- ../Common/VertexArray.h ../Post/PViewData.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/Tree.h ../DataStr/avl.h \
- ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h Field.h \
- ../Geo/Geo.h ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Numeric/Numeric.h ../Common/Context.h \
+ ../DataStr/List.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
+ ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/ExtrudeParams.h ../Post/PView.h ../Post/PViewData.h \
+ ../Post/PViewOptions.h ../Post/ColorTable.h ../Common/Gmsh.h \
+ ../Common/Message.h ../DataStr/Malloc.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+ Field.h ../Geo/Geo.h ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h \
../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \
../Post/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h \
@@ -125,35 +125,31 @@ meshGEdge.o: meshGEdge.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
meshGEdge.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \
../Common/GmshDefines.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
- ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h \
- ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h \
- ../Geo/SVector3.h ../Numeric/Numeric.h ../Common/Context.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/GFace.h \
- ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
- ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/ExtrudeParams.h ../Geo/MRep.h ../Geo/GEdge.h ../Geo/GFace.h \
- ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
- ../Geo/ExtrudeParams.h ../Geo/MVertex.h ../Geo/MEdge.h \
- ../Geo/MElement.h ../Common/VertexArray.h ../Common/OS.h \
- BackgroundMesh.h
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
+ ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Numeric/Numeric.h ../Common/Context.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h BackgroundMesh.h
meshGEdgeExtruded.o: meshGEdgeExtruded.cpp ../Geo/ExtrudeParams.h \
../Common/SmoothData.h ../Numeric/Numeric.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
- ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
- ../Common/Message.h
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Context.h \
+ ../DataStr/List.h ../Geo/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h \
+ ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h ../Common/Message.h
meshGFace.o: meshGFace.cpp meshGFace.h meshGFaceDelaunayInsertion.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
@@ -162,60 +158,59 @@ meshGFace.o: meshGFace.cpp meshGFace.h meshGFaceDelaunayInsertion.h \
../DataStr/List.h meshGFaceOptimize.h DivideAndConquer.h \
BackgroundMesh.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
- ../Geo/MVertex.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
- ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
- ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/MRep.h \
- ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/MVertex.h \
- ../Geo/MEdge.h ../Geo/MElement.h ../Common/VertexArray.h \
- ../Common/Message.h ../Common/OS.h BDS.h ../Post/PView.h \
+ ../Common/VertexArray.h ../Geo/MVertex.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/GFace.h \
+ ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
+ ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/ExtrudeParams.h ../Common/Message.h BDS.h ../Post/PView.h \
../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h
meshGFaceTransfinite.o: meshGFaceTransfinite.cpp meshGFace.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/GFace.h \
- ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
- ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/ExtrudeParams.h ../Common/Message.h
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
+ ../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
+ ../Common/Message.h
meshGFaceExtruded.o: meshGFaceExtruded.cpp ../Geo/ExtrudeParams.h \
../Common/SmoothData.h ../Numeric/Numeric.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
- ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
- ../Common/Message.h
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Context.h \
+ ../DataStr/List.h ../Geo/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h \
+ ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h ../Common/Message.h
meshGFaceDelaunayInsertion.o: meshGFaceDelaunayInsertion.cpp BDS.h \
../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \
../Common/GmshDefines.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
../Geo/GEntity.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/MVertex.h \
../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/MElement.h \
- ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
- ../Post/PView.h ../Common/VertexArray.h ../Post/PViewData.h \
- ../Post/PViewOptions.h ../Post/ColorTable.h BackgroundMesh.h \
- meshGFaceDelaunayInsertion.h meshGFace.h ../Common/Message.h
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
+ ../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h ../Geo/MElement.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Post/PView.h \
+ ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ BackgroundMesh.h meshGFaceDelaunayInsertion.h meshGFace.h \
+ ../Common/Message.h
meshGFaceOptimize.o: meshGFaceOptimize.cpp meshGFaceOptimize.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
@@ -223,12 +218,12 @@ meshGFaceOptimize.o: meshGFaceOptimize.cpp meshGFaceOptimize.h \
../Geo/SVector3.h ../Numeric/Numeric.h ../Common/Context.h \
../DataStr/List.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
- ../Geo/SPoint3.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h \
- ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/MVertex.h ../Geo/GPoint.h \
- ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
- ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/ExtrudeParams.h
+ ../Geo/SPoint3.h ../Common/VertexArray.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/GEntity.h \
+ ../Geo/MVertex.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/MElement.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h
meshGRegion.o: meshGRegion.cpp meshGRegion.h \
meshGRegionDelaunayInsertion.h ../Geo/MElement.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \
@@ -237,22 +232,20 @@ meshGRegion.o: meshGRegion.cpp meshGRegion.h \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
- ../Geo/MVertex.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
- ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
- ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
- ../Geo/SBoundingBox3d.h ../Geo/gmshRegion.h ../Geo/Geo.h \
- ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \
- ../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SBoundingBox3d.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../Geo/SPoint2.h \
- ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/MRep.h ../Geo/GEdge.h \
- ../Geo/GFace.h ../Geo/GRegion.h ../Geo/MVertex.h ../Geo/MEdge.h \
- ../Geo/MElement.h ../Common/VertexArray.h ../Common/Message.h \
- ../Common/OS.h BDS.h ../Post/PView.h ../Post/PViewData.h \
- ../Post/PViewOptions.h ../Post/ColorTable.h
+ ../Common/VertexArray.h ../Geo/MVertex.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/GFace.h \
+ ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
+ ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
+ ../Geo/gmshRegion.h ../Geo/Geo.h ../Geo/gmshSurface.h ../Geo/Pair.h \
+ ../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
+ ../Geo/SBoundingBox3d.h ../DataStr/Tree.h ../DataStr/avl.h \
+ ../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h BDS.h \
+ ../Post/PView.h ../Post/PViewData.h ../Post/PViewOptions.h \
+ ../Post/ColorTable.h ../Common/Message.h
meshGRegionDelaunayInsertion.o: meshGRegionDelaunayInsertion.cpp \
BackgroundMesh.h meshGRegionDelaunayInsertion.h ../Geo/MElement.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \
@@ -261,58 +254,61 @@ meshGRegionDelaunayInsertion.o: meshGRegionDelaunayInsertion.cpp \
../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
- ../Geo/MVertex.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
- ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
- ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
- ../Geo/SBoundingBox3d.h ../Common/Message.h
+ ../Common/VertexArray.h ../Geo/MVertex.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/GFace.h \
+ ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
+ ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
+ ../Common/Message.h
meshGRegionTransfinite.o: meshGRegionTransfinite.cpp meshGFace.h \
../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \
../Common/GmshDefines.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
../Geo/GEntity.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/MVertex.h \
../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/MElement.h \
- ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
- ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
- ../Geo/ExtrudeParams.h ../Common/Message.h
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
+ ../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h ../Geo/MElement.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
+ ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
+ ../Common/Message.h
meshGRegionExtruded.o: meshGRegionExtruded.cpp ../Geo/ExtrudeParams.h \
../Common/SmoothData.h ../Numeric/Numeric.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
- ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
- meshGFace.h meshGRegion.h ../Common/Message.h
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Context.h \
+ ../DataStr/List.h ../Geo/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h \
+ ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h meshGFace.h \
+ meshGRegion.h ../Common/Message.h
meshGRegionCarveHole.o: meshGRegionCarveHole.cpp ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/GFace.h \
- ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
- ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
- ../Common/Message.h
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
+ ../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
+ ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
+ ../Geo/SBoundingBox3d.h ../Common/Message.h
DivideAndConquer.o: DivideAndConquer.cpp ../Common/Gmsh.h \
../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
@@ -322,66 +318,65 @@ BackgroundMesh.o: BackgroundMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
BackgroundMesh.h ../Numeric/Numeric.h ../Common/Context.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/GFace.h \
../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
../Geo/ExtrudeParams.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEdge.h \
../Geo/GFace.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h Field.h ../Post/PView.h \
- ../Common/VertexArray.h ../Post/PViewData.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h ../Geo/Geo.h ../Geo/gmshSurface.h ../Geo/Pair.h \
- ../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
+ ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ ../Geo/Geo.h ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h \
+ ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \
../Post/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h
BoundaryLayer.o: BoundaryLayer.cpp BoundaryLayer.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/GFace.h \
- ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
- ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
- meshGEdge.h meshGFace.h ../Common/Message.h
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
+ ../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
+ ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
+ ../Geo/SBoundingBox3d.h meshGEdge.h meshGFace.h ../Common/Message.h
BDS.o: BDS.cpp ../Numeric/Numeric.h ../Common/GmshMatrix.h BDS.h \
../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \
../Common/GmshDefines.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
../Geo/GEntity.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/MVertex.h \
../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Post/PView.h \
- ../Common/VertexArray.h ../Post/PViewData.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h ../Common/Message.h
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Context.h \
+ ../DataStr/List.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
+ ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/ExtrudeParams.h ../Post/PView.h ../Post/PViewData.h \
+ ../Post/PViewOptions.h ../Post/ColorTable.h ../Common/Message.h
HighOrder.o: HighOrder.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Numeric/Numeric.h ../Common/Context.h ../DataStr/List.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/GFace.h \
- ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
- ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
- ../Geo/MRep.h ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MElement.h \
- ../Common/VertexArray.h ../Common/Message.h ../Common/OS.h
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
+ ../Common/Context.h ../DataStr/List.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
+ ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
+ ../Geo/SBoundingBox3d.h ../Common/Message.h ../Common/OS.h
diff --git a/Mesh/meshGEdge.cpp b/Mesh/meshGEdge.cpp
index 297ea37e93..e98d2ce648 100644
--- a/Mesh/meshGEdge.cpp
+++ b/Mesh/meshGEdge.cpp
@@ -1,4 +1,4 @@
-// $Id: meshGEdge.cpp,v 1.41 2007-09-12 14:28:29 geuzaine Exp $
+// $Id: meshGEdge.cpp,v 1.42 2007-09-12 20:14:34 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -23,7 +23,6 @@
#include "meshGEdge.h"
#include "GEdge.h"
#include "GFace.h"
-#include "MRep.h"
#include "BackgroundMesh.h"
#include "Message.h"
@@ -281,7 +280,7 @@ void deMeshGEdge::operator() (GEdge *ge)
for (unsigned int i = 0; i < ge->lines.size(); i++)
delete ge->lines[i];
ge->lines.clear();
- if(ge->meshRep) ge->meshRep->destroy();
+ ge->deleteVertexArrays();
}
void meshGEdge::operator() (GEdge *ge)
diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp
index 31061b49c6..31f7deb689 100644
--- a/Mesh/meshGFace.cpp
+++ b/Mesh/meshGFace.cpp
@@ -1,4 +1,4 @@
-// $Id: meshGFace.cpp,v 1.86 2007-09-05 13:19:15 remacle Exp $
+// $Id: meshGFace.cpp,v 1.87 2007-09-12 20:14:34 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -29,7 +29,6 @@
#include "GFace.h"
#include "MVertex.h"
#include "MElement.h"
-#include "MRep.h"
#include "Context.h"
#include "GPoint.h"
#include "Message.h"
@@ -1557,7 +1556,7 @@ void deMeshGFace::operator() (GFace *gf)
gf->triangles.clear();
for (unsigned int i=0;i<gf->quadrangles.size();i++) delete gf->quadrangles[i];
gf->quadrangles.clear();
- if(gf->meshRep) gf->meshRep->destroy();
+ gf->deleteVertexArrays();
}
void meshGFace::operator() (GFace *gf)
diff --git a/Mesh/meshGRegion.cpp b/Mesh/meshGRegion.cpp
index b48c19d4bf..1c5cad48be 100644
--- a/Mesh/meshGRegion.cpp
+++ b/Mesh/meshGRegion.cpp
@@ -1,4 +1,4 @@
-// $Id: meshGRegion.cpp,v 1.32 2007-08-02 16:16:19 geuzaine Exp $
+// $Id: meshGRegion.cpp,v 1.33 2007-09-12 20:14:35 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -26,7 +26,6 @@
#include "GFace.h"
#include "GEdge.h"
#include "gmshRegion.h"
-#include "MRep.h"
#include "BDS.h"
#include "Message.h"
#include <vector>
@@ -137,7 +136,7 @@ void TransferTetgenMesh(GRegion *gr,
for(unsigned int i = 0; i < gf->triangles.size(); i++)
delete gf->triangles[i];
gf->triangles.clear();
- if(gf->meshRep) gf->meshRep->destroy();
+ gf->deleteVertexArrays();
++it;
}
@@ -361,7 +360,7 @@ void deMeshGRegion::operator() (GRegion *gr)
for(unsigned int i = 0; i < gr->pyramids.size(); i++)
delete gr->pyramids[i];
gr->pyramids.clear();
- if(gr->meshRep) gr->meshRep->destroy();
+ gr->deleteVertexArrays();
}
int intersect_line_triangle(double X[3], double Y[3], double Z[3] ,
diff --git a/Parser/Makefile b/Parser/Makefile
index c65cc1ef37..8f27724d12 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.127 2007-09-11 14:01:54 geuzaine Exp $
+# $Id: Makefile,v 1.128 2007-09-12 20:14:35 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -123,21 +123,21 @@ OpenFile.o: OpenFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
../Numeric/Numeric.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
- ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
- ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
- ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
- ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Context.h \
- ../Geo/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
- ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
- ../Geo/SBoundingBox3d.h Parser.h OpenFile.h ../Common/CommandLine.h \
- ../Post/PView.h ../Common/VertexArray.h ../Post/PViewData.h \
- ../Post/PViewOptions.h ../Post/ColorTable.h ../Graphics/ReadImg.h \
- ../Common/OS.h ../Mesh/HighOrder.h ../Common/GmshUI.h \
- ../Graphics/Draw.h ../Graphics/SelectBuffer.h ../Fltk/GUI.h \
- ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h \
+ ../Common/VertexArray.h ../Geo/MVertex.h ../Geo/SPoint3.h \
+ ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
+ ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Common/Context.h ../Geo/ExtrudeParams.h \
+ ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h \
+ Parser.h OpenFile.h ../Common/CommandLine.h ../Post/PView.h \
+ ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ ../Graphics/ReadImg.h ../Common/OS.h ../Mesh/HighOrder.h \
+ ../Common/GmshUI.h ../Graphics/Draw.h ../Graphics/SelectBuffer.h \
+ ../Fltk/GUI.h ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h \
../Fltk/Popup_Button.h ../Fltk/SpherePosition_Widget.h
CreateFile.o: CreateFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
@@ -149,19 +149,19 @@ CreateFile.o: CreateFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
../Numeric/Numeric.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
- ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
- ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
- ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
- ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Geo/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
- ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
- ../Geo/SBoundingBox3d.h ../Common/GmshUI.h ../Graphics/gl2ps.h \
- ../Graphics/gl2gif.h ../Graphics/PixelBuffer.h ../Graphics/Draw.h \
- ../Graphics/gl2jpeg.h ../Graphics/PixelBuffer.h ../Graphics/gl2png.h \
- ../Graphics/PixelBuffer.h ../Graphics/gl2ppm.h \
+ ../Common/VertexArray.h ../Geo/MVertex.h ../Geo/SPoint3.h \
+ ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
+ ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Geo/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h \
+ ../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
+ ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h ../Common/GmshUI.h \
+ ../Graphics/gl2ps.h ../Graphics/gl2gif.h ../Graphics/PixelBuffer.h \
+ ../Graphics/Draw.h ../Graphics/gl2jpeg.h ../Graphics/PixelBuffer.h \
+ ../Graphics/gl2png.h ../Graphics/PixelBuffer.h ../Graphics/gl2ppm.h \
../Graphics/PixelBuffer.h ../Graphics/gl2yuv.h \
../Graphics/PixelBuffer.h
FunctionManager.o: FunctionManager.cpp FunctionManager.h
diff --git a/Plugin/Makefile b/Plugin/Makefile
index 041be8d1a9..85a384eb5c 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.132 2007-09-11 15:29:01 geuzaine Exp $
+# $Id: Makefile,v 1.133 2007-09-12 20:14:35 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -199,19 +199,20 @@ Triangulate.o: Triangulate.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Numeric/Numeric.h \
../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/GEntity.h \
- ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Context.h ../Geo/ExtrudeParams.h ../Geo/MElement.h \
- ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
- ../Geo/gmshVertex.h ../Geo/Geo.h ../Geo/GVertex.h ../Geo/Range.h \
- Triangulate.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
- ../Post/PView.h ../Common/VertexArray.h ../Post/PViewData.h \
- ../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewDataList.h \
- ../Post/PViewData.h ../Post/AdaptiveViews.h ../Common/GmshMatrix.h
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Common/VertexArray.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/GEntity.h ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Common/Context.h ../Geo/ExtrudeParams.h \
+ ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/ExtrudeParams.h ../Geo/gmshVertex.h ../Geo/Geo.h \
+ ../Geo/GVertex.h ../Geo/Range.h Triangulate.h Plugin.h \
+ ../Common/Options.h ../Post/ColorTable.h ../Post/PView.h \
+ ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Post/AdaptiveViews.h \
+ ../Common/GmshMatrix.h
Warp.o: Warp.cpp Warp.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
../Common/Message.h ../Post/PView.h ../Common/VertexArray.h \
../Geo/SVector3.h ../Geo/SPoint3.h ../Common/SmoothData.h \
diff --git a/Post/Makefile b/Post/Makefile
index b77257dae2..c7d732883f 100644
--- a/Post/Makefile
+++ b/Post/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.16 2007-09-11 22:53:35 geuzaine Exp $
+# $Id: Makefile,v 1.17 2007-09-12 20:14:35 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -78,18 +78,18 @@ PViewDataGModel.o: PViewDataGModel.cpp PViewDataGModel.h PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h PViewDataList.h \
AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Common/GmshDefines.h \
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Common/VertexArray.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h \
../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
- ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Numeric/Numeric.h ../Common/Context.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
- ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h \
- ../Geo/GEntity.h ../Geo/MElement.h ../Geo/ExtrudeParams.h \
- ../Geo/SBoundingBox3d.h
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h ../Geo/MVertex.h \
+ ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Hash.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Numeric/Numeric.h \
+ ../Common/Context.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
+ ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/Pair.h ../Geo/ExtrudeParams.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h
PViewOptions.o: PViewOptions.cpp PViewOptions.h ColorTable.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/Message.h
AdaptiveViews.o: AdaptiveViews.cpp AdaptiveViews.h ../DataStr/List.h \
diff --git a/Post/PView.h b/Post/PView.h
index 59fce43fb9..163bc3cd37 100644
--- a/Post/PView.h
+++ b/Post/PView.h
@@ -87,7 +87,7 @@ class PView{
// write view to file in given format
bool write(std::string filename, int format, bool append=false);
- // vertex arrays to draw triangles and lines efficiently
+ // vertex arrays to draw the elements efficiently
VertexArray *va_points, *va_lines, *va_triangles, *va_vectors;
// smoothed normals
smooth_normals *normals;
--
GitLab