diff --git a/Geo/GEdge.h b/Geo/GEdge.h index f0e5f568d4123108c81015b7ffc874d5f168c596..47850c6255ae0ca4fc4bf068df479de8848cffd4 100644 --- a/Geo/GEdge.h +++ b/Geo/GEdge.h @@ -28,7 +28,6 @@ #include "MElement.h" // A model edge. - class GEdge : public GEntity { protected: GVertex *v0, *v1; diff --git a/Geo/GModel.h b/Geo/GModel.h index ca52a4e19d567f6f5e70195eaeb14d041318e774..b8043c01fa80c159572a8757a3b9caf8c9a036df 100644 --- a/Geo/GModel.h +++ b/Geo/GModel.h @@ -31,7 +31,6 @@ #include "SmoothNormals.h" // A geometric model. The model is a "not yet" non-manifold B-Rep. - class GModel { protected: diff --git a/Geo/MEdge.h b/Geo/MEdge.h index c5e74bc3efe74337d54be125ec95948d795cef01..6d452adb81f2d147485d76b1a11276880edc658c 100644 --- a/Geo/MEdge.h +++ b/Geo/MEdge.h @@ -23,6 +23,7 @@ #include "MVertex.h" #include "SVector3.h" +// A mesh edge. class MEdge { private: MVertex *_v[2]; @@ -52,26 +53,4 @@ class MEdge { } }; -class MEdgeLessThan { - public: - bool operator()(const MEdge &e1, const MEdge &e2) const - { - int e10 = e1.getVertex(0)->getNum(); - int e11 = e1.getVertex(1)->getNum(); - int e20 = e2.getVertex(0)->getNum(); - int e21 = e2.getVertex(1)->getNum(); - int i1 = std::min(e10, e11); - int i2 = std::min(e20, e21); - if(i1 < i2) - return true; - if(i1 > i2) - return false; - int j1 = std::max(e10, e11); - int j2 = std::max(e20, e21); - if(j1 < j2) - return true; - return false; - } -}; - #endif diff --git a/Geo/MElement.h b/Geo/MElement.h index a2dce869dad819b1ee68ccbdfa64994978b2b9c1..6d9122fa6755ae1e3750789a66568d8e5aace225 100644 --- a/Geo/MElement.h +++ b/Geo/MElement.h @@ -41,6 +41,7 @@ extern int quadfaces_hexa[6][4]; extern int quadfaces_prism[3][4]; extern int quadfaces_pyramid[1][4]; +// A mesh element. class MElement { private: diff --git a/Geo/MFace.h b/Geo/MFace.h index b29075fbdca5db4f34a47f1e6038764ca116424b..f6cec8c283424d8478c29635a11b33cc34ee56d3 100644 --- a/Geo/MFace.h +++ b/Geo/MFace.h @@ -28,6 +28,7 @@ extern Context_T CTX; +// A mesh face. class MFace { private: MVertex *_v[4]; diff --git a/Geo/MVertex.h b/Geo/MVertex.h index 7ed8592523b8756f2cd018c13e71bec0d1dfee6d..ae6d1d4c04f66e92d998ce28de9930b47ebb2098 100644 --- a/Geo/MVertex.h +++ b/Geo/MVertex.h @@ -26,6 +26,7 @@ class GEntity; +// A mesh vertex. class MVertex{ private: static int _globalNum;