From db860869ce53938fc068deae16a6ef048633d37f Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 5 Feb 2008 21:03:13 +0000
Subject: [PATCH] *** empty log message ***
---
Fltk/GUI.cpp | 4 ++--
Mesh/DivideAndConquer.cpp | 4 ++--
Plugin/Triangulate.cpp | 16 ++++++++--------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 4853a2883a..beaeca6b10 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.651 2008-01-30 15:27:41 remacle Exp $
+// $Id: GUI.cpp,v 1.652 2008-02-05 21:03:13 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -290,7 +290,7 @@ Context_Item menu_mesh[] = {
{"Second order", (Fl_Callback *)mesh_degree_cb, (void*)2 } ,
{"Optimize", (Fl_Callback *)mesh_optimize_cb} ,
#if defined(HAVE_NETGEN)
- {"Optimize (netgen)", (Fl_Callback *)mesh_optimize_netgen_cb} ,
+ {"Optimize (Netgen)", (Fl_Callback *)mesh_optimize_netgen_cb} ,
#endif
#if defined(HAVE_FOURIER_MODEL)
{"Reparameterize", (Fl_Callback *)mesh_parameterize_cb} ,
diff --git a/Mesh/DivideAndConquer.cpp b/Mesh/DivideAndConquer.cpp
index 7a8d7763dd..7374902a1c 100644
--- a/Mesh/DivideAndConquer.cpp
+++ b/Mesh/DivideAndConquer.cpp
@@ -1,4 +1,4 @@
-// $Id: DivideAndConquer.cpp,v 1.12 2008-01-22 19:54:04 geuzaine Exp $
+// $Id: DivideAndConquer.cpp,v 1.13 2008-02-05 21:03:13 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -539,7 +539,7 @@ int Conversion(DocPeek doc)
n = doc->numPoints;
striangle = (Striangle *) Malloc(n * sizeof(Striangle));
- count2 = (int)CountPointsOnHull(n, doc->points);
+ count2 = CountPointsOnHull(n, doc->points);
// nombre de triangles que l'on doit obtenir
count2 = 2 * (n - 1) - count2;
diff --git a/Plugin/Triangulate.cpp b/Plugin/Triangulate.cpp
index 46591c2d29..4278529f7b 100644
--- a/Plugin/Triangulate.cpp
+++ b/Plugin/Triangulate.cpp
@@ -1,4 +1,4 @@
-// $Id: Triangulate.cpp,v 1.42 2008-02-05 19:02:39 geuzaine Exp $
+// $Id: Triangulate.cpp,v 1.43 2008-02-05 21:03:13 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -100,10 +100,10 @@ static void Triangulate(int nbIn, List_T *inList, int *nbOut, List_T *outList,
// project points onto plane
std::vector<MVertex*> points;
int nb = List_Nbr(inList) / nbIn;
- for(int i = 0; i < List_Nbr(inList); i += nb)
- points.push_back(new MVertex(*(double *)List_Pointer_Fast(inList, i),
- *(double *)List_Pointer_Fast(inList, i + 1),
- *(double *)List_Pointer_Fast(inList, i + 2)));
+ for(int i = 0; i < List_Nbr(inList); i += nb){
+ double *p = (double *)List_Pointer_Fast(inList, i);
+ points.push_back(new MVertex(p[0], p[1], p[2]));
+ }
discreteFace *s = new discreteFace(GModel::current(), GModel::current()->numFace() + 1);
s->computeMeanPlane(points);
double plan[3][3];
@@ -116,10 +116,10 @@ static void Triangulate(int nbIn, List_T *inList, int *nbOut, List_T *outList,
for(unsigned int i = 0; i < points.size(); i++) bbox += points[i]->point();
double lc = norm(SVector3(bbox.max(), bbox.min()));
- // build a point record structure for the divide and conquer
+ // build a point record structure for the divide and conquer algorithm
DocRecord doc;
doc.points = (PointRecord*)malloc(points.size() * sizeof(PointRecord));
- for (unsigned int i = 0; i < points.size(); i++){
+ for(unsigned int i = 0; i < points.size(); i++){
double XX = CTX.mesh.rand_factor * lc * (double)rand() / (double)RAND_MAX;
double YY = CTX.mesh.rand_factor * lc * (double)rand() / (double)RAND_MAX;
doc.points[i].where.h = points[i]->x() + XX;
@@ -130,7 +130,7 @@ static void Triangulate(int nbIn, List_T *inList, int *nbOut, List_T *outList,
}
// triangulate
- Make_Mesh_With_Points(&doc, doc.points, points.size());
+ Make_Mesh_With_Points(&doc, doc.points, nbIn);
// create output (using unperturbed data)
for(int i = 0; i < doc.numTriangles; i++){
--
GitLab