From 8f87638de59fba45451c3d456191fd22a575c0f8 Mon Sep 17 00:00:00 2001
From: Christoph Moench-Tegeder <cmt@burggraben.net>
Date: Wed, 17 Nov 2021 23:31:36 +0100
Subject: [PATCH] remove references to old OpenCascade API
@mroszko figured out that the "new" API exists in all supported
OpenCascade versions (>=7.3 for KiCad 6), so just remove the old
code.
---
plugins/3d/oce/loadmodel.cpp | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/plugins/3d/oce/loadmodel.cpp b/plugins/3d/oce/loadmodel.cpp
index 79ddca3ce9..0a25f1859b 100644
--- a/plugins/3d/oce/loadmodel.cpp
+++ b/plugins/3d/oce/loadmodel.cpp
@@ -80,8 +80,6 @@
#include <TDF_Tool.hxx>
#include <TDataStd_Name.hxx>
-#include <Standard_Version.hxx>
-
#include "plugins/3dapi/ifsg_all.h"
@@ -1118,11 +1116,6 @@ bool processFace( const TopoDS_Face& face, DATA& data, SGNODE* parent,
else
S3D::AddSGNodeRef( vshape.GetRawPtr(), ocolor );
-#if OCC_VERSION_HEX < 0x070600
- const TColgp_Array1OfPnt& arrPolyNodes = triangulation->Nodes();
- const Poly_Array1OfTriangle& arrTriangles = triangulation->Triangles();
-#endif
-
std::vector< SGPOINT > vertices;
std::vector< int > indices;
std::vector< int > indices2;
@@ -1130,22 +1123,14 @@ bool processFace( const TopoDS_Face& face, DATA& data, SGNODE* parent,
for( int i = 1; i <= triangulation->NbNodes(); i++ )
{
-#if OCC_VERSION_HEX < 0x070600
- gp_XYZ v( arrPolyNodes(i).Coord() );
-#else
gp_XYZ v( triangulation->Node(i).Coord() );
-#endif
vertices.emplace_back( v.X(), v.Y(), v.Z() );
}
for( int i = 1; i <= triangulation->NbTriangles(); i++ )
{
int a, b, c;
-#if OCC_VERSION_HEX < 0x070600
- arrTriangles( i ).Get( a, b, c );
-#else
triangulation->Triangle(i).Get(a, b, c);
-#endif
a--;
if( reverse )