Fix compilation errors for mfc samples.

diff --git a/samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp b/samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp
index 0376c6bfc87c7b23f772626af8e61d3425954448..0a70fb4aca4561a0c2136f60eb5d1abf6e86084d 100755 (executable)
--- a/samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp
+++ b/samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp
@@ -1304,7 +1304,7 @@ void CGeometryDoc::simplify(const TopoDS_Shape& aShape)
     //and all the polygons on the triangulations of the edges
     BRepTools::Clean(aShape);
     // adds a triangulation of the shape aShape with the deflection aDeflection
-    BRepMesh::Mesh(aShape,aDeflection);
+    BRepMesh_IncrementalMesh(aShape,aDeflection);
 
     Standard_Integer aIndex = 1, nbNodes = 0;
 

diff --git a/samples/mfc/standard/01_Geometry/src/StdAfx.h b/samples/mfc/standard/01_Geometry/src/StdAfx.h
index 971d2d42678384d79fbeccd838f77f08537b2708..9a0a9262b2da7fc16a3c02da11f08c6198ef24a3 100755 (executable)
--- a/samples/mfc/standard/01_Geometry/src/StdAfx.h
+++ b/samples/mfc/standard/01_Geometry/src/StdAfx.h
@@ -89,6 +89,7 @@
 #include <Aspect_Window.hxx>
 #include <Aspect_Background.hxx>
 
+#include <BRepMesh_IncrementalMesh.hxx>
 #include <BRepAlgo.hxx>
 #include <BRep_Builder.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
@@ -100,7 +101,6 @@
 #include <BndLib_Add3dCurve.hxx>
 #include <BndLib_AddSurface.hxx>   
 #include <BRep_Tool.hxx>
-#include <BRepMesh.hxx>
 
 #include <DsgPrs_LengthPresentation.hxx>
 #include <FairCurve_Batten.hxx>

diff --git a/samples/mfc/standard/07_Triangulation/src/StdAfx.h b/samples/mfc/standard/07_Triangulation/src/StdAfx.h
index c0541da06e9245c22a1dbfee3630d96366158e7f..2386e70a4b27d139906ef7cbf0790b6349509a85 100755 (executable)
--- a/samples/mfc/standard/07_Triangulation/src/StdAfx.h
+++ b/samples/mfc/standard/07_Triangulation/src/StdAfx.h
@@ -90,7 +90,6 @@
 #include "BRepPrimAPI_MakeSphere.hxx"
 #include "gp_Pnt.hxx"
 #include "BRepAlgoAPI_Cut.hxx"
-#include "BRepMesh.hxx"
 #include "TopExp_Explorer.hxx"
 #include "TopoDS_Face.hxx"
 #include "TopLoc_Location.hxx"
@@ -108,6 +107,7 @@
 #include "BRepBuilderAPI_MakeVertex.hxx"
 #include "TopoDS.hxx"
 #include "BRepTools.hxx"
+#include "BRepMesh_IncrementalMesh.hxx"
 
 #include <UnitsAPI.hxx>
 

diff --git a/samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp b/samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp
index d882bc07c488e128e6785a96a7d53bb734c8ec84..277e9185b85c83246769000c39ef236658b8e324 100755 (executable)
--- a/samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp
+++ b/samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp
@@ -16,9 +16,9 @@
 #include <BRep_Builder.hxx>
 #include <BRepTools.hxx>
 #include <BRep_Tool.hxx>
-#include <BRepMesh.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
+#include <BRepMesh_IncrementalMesh.hxx>
 
 #include <TopExp_Explorer.hxx>
 #include <TopLoc_Location.hxx>
@@ -189,7 +189,7 @@ void Tesselate_Presentation::tesselateShape(const TopoDS_Shape& aShape)
 //==========================================================================
 
   BRepTools::Clean(aShape);
-  BRepMesh::Mesh(aShape,aDeflection);
+  BRepMesh_IncrementalMesh(aShape,aDeflection);
 
   BRep_Builder aBuilder,aBuild1,aBuild2;
   TopoDS_Compound aCompound,aComp1,aComp2;

diff --git a/samples/mfc/standard/07_Triangulation/src/TriangulationDoc.cpp b/samples/mfc/standard/07_Triangulation/src/TriangulationDoc.cpp
index 67d9008a01af8d8cc92ae0e2e332133f4d116033..598c70992cd7ca7dbd7c7373499945fea01d937f 100755 (executable)
--- a/samples/mfc/standard/07_Triangulation/src/TriangulationDoc.cpp
+++ b/samples/mfc/standard/07_Triangulation/src/TriangulationDoc.cpp
@@ -81,7 +81,7 @@ void CTriangulationDoc::OnTriangu()
        TopoDS_Shape theBox = BRepPrimAPI_MakeBox(200,60,60);
        TopoDS_Shape theSphere = BRepPrimAPI_MakeSphere(gp_Pnt(100,20,20),80);
        TopoDS_Shape ShapeFused = BRepAlgoAPI_Fuse(theSphere,theBox);
-       BRepMesh::Mesh(ShapeFused,1);
+       BRepMesh_IncrementalMesh(ShapeFused,1);
 
        Handle (AIS_Shape)      aSection = new AIS_Shape(ShapeFused);
        myAISContext->SetDisplayMode(aSection,1);
@@ -139,7 +139,7 @@ void CTriangulationDoc::OnVisu()
 TopoDS_Shape theBox = BRepPrimAPI_MakeBox(200,60,60);
 TopoDS_Shape theSphere = BRepPrimAPI_MakeSphere(gp_Pnt(100,20,20),80);
 TopoDS_Shape ShapeFused = BRepAlgoAPI_Fuse(theSphere,theBox);
-BRepMesh::Mesh(ShapeFused,1);
+BRepMesh_IncrementalMesh(ShapeFused,1);
 
 Handle (AIS_Shape)     aSection = new AIS_Shape(ShapeFused);
 myAISContext->SetDisplayMode(aSection,1);
@@ -264,7 +264,7 @@ void CTriangulationDoc::OnClear()
 TopoDS_Shape theBox = BRepPrimAPI_MakeBox(200,60,60);
 TopoDS_Shape theSphere = BRepPrimAPI_MakeSphere(gp_Pnt(100,20,20),80);
 TopoDS_Shape ShapeFused = BRepAlgoAPI_Fuse(theSphere,theBox);
-BRepMesh::Mesh(ShapeFused,1);
+BRepMesh_IncrementalMesh(ShapeFused,1);
 
 
 Handle (AIS_Shape)     aSection = new AIS_Shape(ShapeFused);

diff --git a/samples/mfc/standard/Common/User_Cylinder.cxx b/samples/mfc/standard/Common/User_Cylinder.cxx
index 7048c0194758ad4454ef28b3a98cac6fa138b53f..c62dba86292b5e095b9f75859a4b7b42be024f68 100755 (executable)
--- a/samples/mfc/standard/Common/User_Cylinder.cxx
+++ b/samples/mfc/standard/Common/User_Cylinder.cxx
@@ -12,7 +12,6 @@ IMPLEMENT_STANDARD_RTTIEXT(User_Cylinder,AIS_InteractiveObject)
 #include <Graphic3d_ArrayOfTriangles.hxx>
 #include <Graphic3d_StructureManager.hxx>
 #include <PrsMgr_PresentationManager3d.hxx>
-#include <BRepMesh.hxx>
 #include <StdPrs_ToolShadedShape.hxx>
 #include <Poly_Connect.hxx>
 #include <TColgp_Array1OfPnt.hxx>
@@ -22,6 +21,7 @@ IMPLEMENT_STANDARD_RTTIEXT(User_Cylinder,AIS_InteractiveObject)
 #include <Graphic3d_Array1OfVertex.hxx>
 #include <Aspect_Array1OfEdge.hxx>
 #include <Quantity_Color.hxx>
+#include <BRepMesh_IncrementalMesh.hxx>
 
 #include <AIS_GraphicTool.hxx>
 
@@ -108,7 +108,7 @@ case 6: //color
     myAspect->SetEdgeOn();
 
     myDeflection = AIS_Shape::GetDeflection(myShape,myDrawer);
-    BRepMesh::Mesh(myShape,myDeflection);
+    BRepMesh_IncrementalMesh(myShape,myDeflection);
 
     myX1OnOff = Standard_False;
     myXBlueOnOff = Standard_False;
@@ -151,8 +151,6 @@ case 6: //color
     cout <<"Deflection = " << myDeflection << "\n" << endl;
 #endif
 
-    StdPrs_ToolShadedShape SST;
-
     Standard_Integer NumFace;
     TopExp_Explorer ExpFace;
 
@@ -191,7 +189,7 @@ case 6: //color
       {
         // triangles(nt).Get(n1,n2,n3); // le triangle est n1,n2,n3
 
-        if (SST.Orientation(myFace) == TopAbs_REVERSED) // si la face est "reversed"
+        if (myFace.Orientation() == TopAbs_REVERSED) // si la face est "reversed"
           triangles(nt).Get(n1,n3,n2); // le triangle est n1,n3,n2
         else
           triangles(nt).Get(n1,n2,n3); // le triangle est n1,n2,n3
@@ -242,7 +240,7 @@ case 6: //color
       const Poly_Array1OfTriangle& triangles = myT->Triangles();
       TColgp_Array1OfDir myNormal(Nodes.Lower(), Nodes.Upper());
 
-      SST.Normal(myFace, pc, myNormal);
+      StdPrs_ToolShadedShape::Normal(myFace, pc, myNormal);
       BRepTools::UVBounds(myFace,Umin, Umax, Vmin, Vmax);
       dUmax = (Umax - Umin);
       dVmax = (Vmax - Vmin);
@@ -258,7 +256,7 @@ case 6: //color
       for (nt = 1; nt <= nnn; nt++)
       {
         // triangles(nt).Get(n1,n2,n3); // le triangle est n1,n2,n3
-        if (SST.Orientation(myFace) == TopAbs_REVERSED) // si la face est "reversed"
+        if (myFace.Orientation() == TopAbs_REVERSED) // si la face est "reversed"
           triangles(nt).Get(n1,n3,n2); // le triangle est n1,n3,n2
         else
           triangles(nt).Get(n1,n2,n3); // le triangle est n1,n2,n3
@@ -278,7 +276,7 @@ case 6: //color
 #ifdef DEBUG
         cout << "On traite actuellement le triangle : "<< nt <<"\n";
 #endif
-        if (SST.Orientation(myFace) == TopAbs_REVERSED) // si la face est "reversed"
+        if (myFace.Orientation() == TopAbs_REVERSED) // si la face est "reversed"
           triangles(nt).Get(n1,n3,n2); // le triangle est n1,n3,n2
         else
           triangles(nt).Get(n1,n2,n3); // le triangle est n1,n2,n3

diff --git a/src/StdPrs/StdPrs_ToolShadedShape.hxx b/src/StdPrs/StdPrs_ToolShadedShape.hxx
index be0ae3272f6b223dd6010e484e1bf0bb5dfb4f67..76d2a87477f92a522949d93ae972743fed54aecd 100644 (file)
--- a/src/StdPrs/StdPrs_ToolShadedShape.hxx
+++ b/src/StdPrs/StdPrs_ToolShadedShape.hxx
@@ -34,14 +34,14 @@ public:
 
   //! Checks back faces visibility for specified shape (to activate back-face culling). <br>
   //! @return true if shape is closed Solid or compound of closed Solids. <br>
-  static Standard_Boolean IsClosed(const TopoDS_Shape& theShape);
+  Standard_EXPORT static Standard_Boolean IsClosed(const TopoDS_Shape& theShape);
   
-  static Handle_Poly_Triangulation Triangulation(const TopoDS_Face& aFace,
+  Standard_EXPORT static Handle_Poly_Triangulation Triangulation(const TopoDS_Face& aFace,
                                                  TopLoc_Location& loc);
   
-  static void Normal(const TopoDS_Face& aFace,
-                     Poly_Connect& PC,
-                     TColgp_Array1OfDir& Nor);
+  Standard_EXPORT static void Normal(const TopoDS_Face& aFace,
+                                     Poly_Connect& PC,
+                                     TColgp_Array1OfDir& Nor);
 };
 
 #endif