From 683e20d643617f580c9b8f8055190b654dd310dd Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Sat, 10 Oct 2009 08:52:30 +0000 Subject: [PATCH] fix compile (add default checkTopolgy in GFace) --- Fltk/graphicWindow.cpp | 1 + Geo/GFace.h | 8 ++++---- Geo/OCCFace.h | 1 - Geo/discreteFace.h | 1 - Geo/gmshFace.h | 1 - 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp index 3b542f48d9..bd752b2fbe 100644 --- a/Fltk/graphicWindow.cpp +++ b/Fltk/graphicWindow.cpp @@ -481,6 +481,7 @@ graphicWindow::graphicWindow(bool main, int numTiles) int mode = FL_RGB | FL_DEPTH | (CTX::instance()->db ? FL_DOUBLE : FL_SINGLE); if(CTX::instance()->antialiasing) mode |= FL_MULTISAMPLE; + mode |= FL_STEREO; for(unsigned int i = 0; i < gl.size(); i++) gl[i]->mode(mode); tile->end(); diff --git a/Geo/GFace.h b/Geo/GFace.h index 1eb20a7168..e0b2b6af23 100644 --- a/Geo/GFace.h +++ b/Geo/GFace.h @@ -121,10 +121,10 @@ class GFace : public GEntity // surface. This topological constant can be computed using both the // geometry and the mesh. Both approaches should give the same result ;-) // by default, genus is ZERO - int poincareMesh (); - int genusMesh () { return (poincareMesh() + edgeLoops.size() - 2) / 2; } - virtual int genusGeom (); - virtual bool checkTopology() = 0 ; + int poincareMesh(); + int genusMesh() { return (poincareMesh() + edgeLoops.size() - 2) / 2; } + virtual int genusGeom(); + virtual bool checkTopology(){ return true; } // return the point on the face corresponding to the given parameter virtual GPoint point(double par1, double par2) const = 0; diff --git a/Geo/OCCFace.h b/Geo/OCCFace.h index ee170f7f2e..863d184ea2 100644 --- a/Geo/OCCFace.h +++ b/Geo/OCCFace.h @@ -40,7 +40,6 @@ class OCCFace : public GFace { virtual double curvatures(const SPoint2 ¶m, SVector3 *dirMax, SVector3 *dirMin, double *curvMax, double *curvMin) const; surface_params getSurfaceParams() const; - virtual bool checkTopology() {return true;}; }; #endif diff --git a/Geo/discreteFace.h b/Geo/discreteFace.h index f210ebf2a3..87ed1db371 100644 --- a/Geo/discreteFace.h +++ b/Geo/discreteFace.h @@ -24,7 +24,6 @@ class discreteFace : public GFace { SVector3 *dudu, SVector3 *dvdv, SVector3 *dudv) const; void setBoundEdges(std::vector<int> tagEdges); void findEdges(std::map<MEdge, std::vector<int>, Less_Edge > &map_edges); - virtual bool checkTopology() {return true;}; }; #endif diff --git a/Geo/gmshFace.h b/Geo/gmshFace.h index 34440a14ab..59a368be3e 100644 --- a/Geo/gmshFace.h +++ b/Geo/gmshFace.h @@ -33,7 +33,6 @@ class gmshFace : public GFace { void *getNativePtr() const { return s; } virtual SPoint2 parFromPoint(const SPoint3 &) const; virtual void resetMeshAttributes(); - virtual bool checkTopology() {return true;}; }; #endif -- GitLab