diff --git a/Common/Views.cpp b/Common/Views.cpp index d9372ac0985879ac9cd439650ad8ec23d4590dcf..56187ecde8e7b1c3a3a44d0d8577c1073c3d8880 100644 --- a/Common/Views.cpp +++ b/Common/Views.cpp @@ -1,4 +1,4 @@ -// $Id: Views.cpp,v 1.163 2005-01-13 20:36:27 geuzaine Exp $ +// $Id: Views.cpp,v 1.164 2005-01-24 17:39:28 geuzaine Exp $ // // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle // @@ -1208,14 +1208,14 @@ void WriteView(Post_View *v, char *filename, int format, int append) int binary = (format == 1) ? 1 : 0; int parsed = (format == 2); int stl = (format == 3); - int txtpts = (format == 4); + int txt = (format == 4); if(stl){ WriteViewSTL(v, filename); return; } - if(txtpts){ + if(txt){ WriteViewTXT(v, filename); return; } diff --git a/Plugin/OctreePost.cpp b/Plugin/OctreePost.cpp index eb26d5deb0b86ffe431bb5c38e232ec2f4c7cba1..06f567b3924fe5fad7ba0428865049f5390ecefc 100644 --- a/Plugin/OctreePost.cpp +++ b/Plugin/OctreePost.cpp @@ -1,4 +1,4 @@ -// $Id: OctreePost.cpp,v 1.12 2005-01-09 02:15:07 geuzaine Exp $ +// $Id: OctreePost.cpp,v 1.13 2005-01-24 17:39:28 geuzaine Exp $ // // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle // @@ -29,6 +29,7 @@ static double computeBarycentricTriangle(double *X, double *Y, double *Z, double *P, double *U) { + // FIXME: only valid for triangles in the XY-plane double mat[2][2], b[2]; U[2] = 0.0; mat[0][0] = X[1]-X[0]; @@ -37,7 +38,6 @@ static double computeBarycentricTriangle(double *X, double *Y, double *Z, mat[1][1] = Y[2]-Y[0]; b[0] = P[0] -X[0]; b[1] = P[1] -Y[0]; - // Msg(WARNING, "louloutte %lf %lf %lf %lf %lf",P[0],P[1],X[0],Y[0]); sys2x2(mat, b, U); return 0.5 * ( mat[0][0] * mat[1][1] - mat[1][0] *mat[0][1]); @@ -116,6 +116,7 @@ void PostTriangleBB(void *a, double *min, double *max) minmax(3, X, Y, Z, min, max); + // FIXME: only valid for triangles in the XY-plane min[2] = -1; max[2] = 1; } @@ -185,7 +186,6 @@ static void addListOfStuff(Octree *o, for(int i = 0; i < List_Nbr(l); i += nbelm){ double * X = (double *)List_Pointer_Fast(l, i); - // Msg(WARNING, "Add in view : %lf %lf %lf %d %d %d", X[0],X[1],X[2],i,List_Nbr(l),nbelm); Octree_Insert(X, o); } } @@ -315,12 +315,6 @@ bool OctreePost::searchVector(double x, V[9*timestep+5] * U[0] + V[9*timestep+8] * U[1] + V[9*timestep+2] * (1-U[0]-U[1]); - /* Msg(WARNING, "found %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf", - values[0],values[1],values[2], - U[0],U[1], - X[0],X[1],X[2], - Y[0],Y[1],Y[2], - Z[0],Z[1],Z[2]); */ } return true; } diff --git a/doc/VERSIONS b/doc/VERSIONS index ed347e8a72cb4e296654d78e9c2b1a203c4ba688..061838552faddf085833d4930725e6f81ee4f82f 100644 --- a/doc/VERSIONS +++ b/doc/VERSIONS @@ -1,4 +1,4 @@ -$Id: VERSIONS,v 1.305 2005-01-20 19:05:13 geuzaine Exp $ +$Id: VERSIONS,v 1.306 2005-01-24 17:39:28 geuzaine Exp $ New in 1.59: added support for discrete (triangulated) surfaces, either in STL format or with the new "Discrete Surface" command; added @@ -11,8 +11,9 @@ Divergence); changed default colormap to match Matlab's "Jet" colormap; new transformation matrix option for views (for non-destructive rotations, symmetries, etc.); improved solver interface to keep the GUI responsive during solver calls; new C++ and -Python solver examples; simplified Tools->Visibility GUI; fixed small -bugs. +Python solver examples; simplified Tools->Visibility GUI; handle +negative numbers in transfinite lines with "Progression" gracefully; +fixed various small bugs. New in 1.58: fixed UNIX socket interface on Windows (broken by the TCP solver patch in 1.57); bumped version number of default