Ported Visualization to occt720

tpaviot · tpaviot · commit c849b3d62a7d · 2019-11-28T16:26:34.000+01:00
diff --git a/src/Visualization/Display3d.cpp b/src/Visualization/Display3d.cpp
@@ -39,9 +39,9 @@ static Handle(OpenGl_GraphicDriver)& GetGraphicDriver()
 // Function : WClass
 // Purpose  :
 //=========================================================
-static const Handle(MMgt_TShared)& WClass()
+static const Handle(Standard_Transient)& WClass()
 {
-  static Handle(MMgt_TShared) aWindowClass;
+  static Handle(Standard_Transient) aWindowClass;
 #ifdef WNT
   if (aWindowClass.IsNull())
   {
@@ -70,7 +70,7 @@ Standard_Boolean Display3d::InitOffscreen(int size_x, int size_y)
   }
   printf("Graphic_Driver created.\n");
   // Create V3dViewer and V3d_View
-  myV3dViewer = new V3d_Viewer(GetGraphicDriver(), (short* const)"viewer");
+  myV3dViewer = new V3d_Viewer(GetGraphicDriver());
   printf("V3d_Viewer created.\n");
   // Create AISInteractiveViewer
   myAISContext = new AIS_InteractiveContext(myV3dViewer);
@@ -164,7 +164,7 @@ void Display3d::Init(long window_handle)
   }
   printf("Graphic_Driver created.\n");
   // Create V3dViewer and V3d_View
-  myV3dViewer = new V3d_Viewer(GetGraphicDriver(), (short* const)"viewer");
+  myV3dViewer = new V3d_Viewer(GetGraphicDriver());
   printf("V3d_Viewer created.\n");
   // Create AISInteractiveViewer
   myAISContext = new AIS_InteractiveContext(myV3dViewer);
@@ -240,7 +240,7 @@ void Display3d::Test()
 {
       BRepPrimAPI_MakeBox S(100,50,40);
       Handle(AIS_Shape) anAISShape = new AIS_Shape(S.Shape());
-      myAISContext->Display(anAISShape);
+      myAISContext->Display(anAISShape, Standard_False);
       myV3dView->ZFitAll();
       myV3dView->FitAll();
 }
diff --git a/src/Visualization/Tesselator.cpp b/src/Visualization/Tesselator.cpp
@@ -24,7 +24,7 @@
 //---------------------------------------------------------------------------
 #include <TopExp_Explorer.hxx>
 #include <Bnd_Box.hxx>
-#include <StdPrs_ToolShadedShape.hxx>
+#include <StdPrs_ToolTriangulatedShape.hxx>
 #include <BRepMesh_IncrementalMesh.hxx>
 #include <TopoDS.hxx>
 #include <Poly_Connect.hxx>
@@ -146,7 +146,7 @@ void Tesselator::SetDeviation(Standard_Real aDeviation)
 void Tesselator::Tesselate(bool compute_edges, float mesh_quality, bool parallel)
 {
     TopExp_Explorer       ExpFace;
-    StdPrs_ToolShadedShape   SST;
+    StdPrs_ToolTriangulatedShape   SST;
 
     gp_Dir d;
     gp_Pnt p;
@@ -239,7 +239,7 @@ void Tesselator::TesselateWithUVCoords(bool compute_edges, float mesh_quality, b
   Standard_Real dVmax;
 
   TopExp_Explorer       ExpFace;
-  StdPrs_ToolShadedShape   SST;
+  StdPrs_ToolTriangulatedShape   SST;
 
   gp_Dir d;
   gp_Pnt p;
diff --git a/src/Visualization/Visualization.h b/src/Visualization/Visualization.h
@@ -35,7 +35,6 @@
 #include <V3d_Viewer.hxx>
 #include <V3d_View.hxx>
 #include <AIS_Shape.hxx>
-#include <Handle_Graphic3d_GraphicDriver.hxx>
 #include <Graphic3d_Camera.hxx>
 #include <Graphic3d_RenderingParams.hxx>
 #include <Graphic3d_RenderingMode.hxx>
