0025811: Visualization - Incorrect texture mapping on faces with reversed orientation

Added section in StdPrs_ShadedShape to correct UV orientation on face triangulation whose orientation is reversed.
Expanded test cases.

dox/user_guides/step/step.md

@@ -1653,13 +1653,6 @@ For each Saved View OCCT STEP Reader will retrieve the following attributes:
 - clipping planes (single plane of combination of planes);
 - front and back plane clipping.
 
-### User defined attributes
-Attributes are implemented in accordance with <a href="https://www.mbx-if.org/documents/rec_prac_user_def_attributes_v18.pdf">Recommended practices for User Defined Attributes</a> section 4, 5, 6.1-6.3 and 7.
-Attributes can be read for shapes at levels:
-- Part/Product Level;
-- Component Instances in an Assembly;
-- Geometry Level.
-
 @subsection occt_step_7_3 Writing to STEP
 
 The translation from XDE to STEP can be initialized as follows: 
@@ -1737,8 +1730,5 @@ Interface_Static::SetIVal("write.step.schema", 5));
 ### Saved views
 Saved Views are not exported by OCCT.
 
-### User defined attributes
-Attributes can be imported from STEP.
-
 
 

src/AIS/AIS_InteractiveContext.cxx

@@ -438,7 +438,6 @@ void AIS_InteractiveContext::Display (const Handle(AIS_InteractiveObject)& theIO
   {
     setObjectStatus (theIObj, PrsMgr_DisplayStatus_Displayed, theDispMode, theSelectionMode);
     theIObj->ViewAffinity()->SetVisible (true); // reset view affinity mask
-    theIObj->ViewOcclusionMask()->SetVisible (true); // reset view occlusion mask
     myMainVwr->StructureManager()->RegisterObject (theIObj, theIObj->ViewAffinity());
     myMainPM->Display(theIObj, theDispMode);
     if (theSelectionMode != -1)
@@ -516,7 +515,6 @@ void AIS_InteractiveContext::Load (const Handle(AIS_InteractiveObject)& theIObj,
     GetDefModes (theIObj, aDispMode, aHiMod, aSelModeDef);
     setObjectStatus (theIObj, PrsMgr_DisplayStatus_Erased, aDispMode, theSelMode != -1 ? theSelMode : aSelModeDef);
     theIObj->ViewAffinity()->SetVisible (true); // reset view affinity mask
-    theIObj->ViewOcclusionMask()->SetVisible (true); // reset view occlusion mask
     myMainVwr->StructureManager()->RegisterObject (theIObj, theIObj->ViewAffinity());
   }
 

src/GeomLib/GeomLib_IsPlanarSurface.cxx

@@ -50,27 +50,22 @@ static Standard_Boolean Controle(const TColgp_Array1OfPnt& Poles,
     Standard_Real umin, umax, vmin, vmax;
     S->Bounds(umin, umax, vmin, vmax);
     S->D1((umin + umax) / 2, (vmin + vmax) / 2, P, DU, DV);
-    
-    if (DU.SquareMagnitude() > gp::Resolution() &&
-        DV.SquareMagnitude() > gp::Resolution())
-    {
-      // On prend DX le plus proche possible de DU
-      gp_Dir du(DU);
-      Standard_Real Angle1 = du.Angle(DX);
-      Standard_Real Angle2 = du.Angle(DY);
-      if (Angle1 > M_PI / 2) Angle1 = M_PI - Angle1;
-      if (Angle2 > M_PI / 2) Angle2 = M_PI - Angle2;
-      if (Angle2 < Angle1) {
-        du = DY; DY = DX; DX = du;
-      }
-      if (DX.Angle(DU) > M_PI / 2) DX.Reverse();
-      if (DY.Angle(DV) > M_PI / 2) DY.Reverse();
-
-      gp_Ax3 axe(Bary, DX^DY, DX);
-      Plan.SetPosition(axe);
-      Plan.SetLocation(Bary);
-      IsPlan = Standard_True;
+    // On prend DX le plus proche possible de DU
+    gp_Dir du(DU);
+    Standard_Real Angle1 = du.Angle(DX);
+    Standard_Real Angle2 = du.Angle(DY);
+    if (Angle1 > M_PI / 2) Angle1 = M_PI - Angle1;
+    if (Angle2 > M_PI / 2) Angle2 = M_PI - Angle2;
+    if (Angle2 < Angle1) {
+      du = DY; DY = DX; DX = du;
     }
+    if (DX.Angle(DU) > M_PI / 2) DX.Reverse();
+    if (DY.Angle(DV) > M_PI / 2) DY.Reverse();
+
+    gp_Ax3 axe(Bary, DX^DY, DX);
+    Plan.SetPosition(axe);
+    Plan.SetLocation(Bary);
+    IsPlan = Standard_True;
   }
   return IsPlan;
 }

src/GeomToStep/GeomToStep_MakeAxis1Placement.hxx

@@ -20,10 +20,10 @@
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
-#include <StepData_Factors.hxx>
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_Axis1Placement;
 class gp_Ax1;
 class gp_Ax2d;
@@ -43,16 +43,16 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeAxis1Placement(const gp_Ax1& A,
-                                                const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeAxis1Placement(const gp_Ax2d& A,
-                                                const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeAxis1Placement(const Handle(Geom_Axis1Placement)& A,
-                                                const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeAxis1Placement(const Handle(Geom2d_AxisPlacement)& A,
-                                                const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_Axis1Placement)& Value() const;
 

src/GeomToStep/GeomToStep_MakeAxis2Placement2d.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_Axis2Placement2d;
 class gp_Ax2;
 class gp_Ax22d;
@@ -40,10 +41,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeAxis2Placement2d(const gp_Ax2& A,
-                                                  const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                  const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeAxis2Placement2d(const gp_Ax22d& A,
-                                                  const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                  const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_Axis2Placement2d)& Value() const;
 

src/GeomToStep/GeomToStep_MakeAxis2Placement3d.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 #include <StepData_StepModel.hxx>
+class StepData_Factors;
 class StepGeom_Axis2Placement3d;
 class gp_Ax2;
 class gp_Ax3;
@@ -41,19 +42,19 @@ public:
   DEFINE_STANDARD_ALLOC
 
   
-  Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const StepData_Factors& theLocalFactors = StepData_Factors());
+  Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const gp_Ax2& A,
-                                                  const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                  const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const gp_Ax3& A,
-                                                  const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                  const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const gp_Trsf& T,
-                                                  const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                  const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeAxis2Placement3d(const Handle(Geom_Axis2Placement)& A,
-                                                  const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                  const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_Axis2Placement3d)& Value() const;
 

src/GeomToStep/GeomToStep_MakeBSplineCurveWithKnots.hxx

@@ -24,6 +24,7 @@
 #include <GeomToStep_Root.hxx>
 class Geom_BSplineCurve;
 class Geom2d_BSplineCurve;
+class StepData_Factors;
 class StepGeom_BSplineCurveWithKnots;
 
 
@@ -40,10 +41,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeBSplineCurveWithKnots(const Handle(Geom_BSplineCurve)& Bsplin,
-                                                       const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                       const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeBSplineCurveWithKnots(const Handle(Geom2d_BSplineCurve)& Bsplin,
-                                                       const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                       const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_BSplineCurveWithKnots)& Value() const;
 

src/GeomToStep/GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve;
 class Geom_BSplineCurve;
 class Geom2d_BSplineCurve;
@@ -41,10 +42,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve(const Handle(Geom_BSplineCurve)& Bsplin,
-                                                                              const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                                              const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve(const Handle(Geom2d_BSplineCurve)& Bsplin,
-                                                                              const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                                              const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve)& Value() const;
 

src/GeomToStep/GeomToStep_MakeBSplineSurfaceWithKnots.hxx

@@ -22,6 +22,7 @@
 #include <Standard_Handle.hxx>
 
 #include <GeomToStep_Root.hxx>
+class StepData_Factors;
 class StepGeom_BSplineSurfaceWithKnots;
 class Geom_BSplineSurface;
 
@@ -39,7 +40,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeBSplineSurfaceWithKnots(const Handle(Geom_BSplineSurface)& Bsplin,
-                                                         const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                         const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_BSplineSurfaceWithKnots)& Value() const;
 

src/GeomToStep/GeomToStep_MakeBSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface;
 class Geom_BSplineSurface;
 
@@ -40,7 +41,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeBSplineSurfaceWithKnotsAndRationalBSplineSurface(const Handle(Geom_BSplineSurface)& Bsplin,
-                                                                                  const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                                                  const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeBoundedCurve.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_BoundedCurve;
 class Geom_BoundedCurve;
 class Geom2d_BoundedCurve;
@@ -41,10 +42,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeBoundedCurve(const Handle(Geom_BoundedCurve)& C,
-                                              const StepData_Factors& theLocalFactors = StepData_Factors());
+                                              const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeBoundedCurve(const Handle(Geom2d_BoundedCurve)& C,
-                                              const StepData_Factors& theLocalFactors = StepData_Factors());
+                                              const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_BoundedCurve)& Value() const;
 

src/GeomToStep/GeomToStep_MakeBoundedSurface.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_BoundedSurface;
 class Geom_BoundedSurface;
 
@@ -40,7 +41,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeBoundedSurface(const Handle(Geom_BoundedSurface)& C,
-                                                const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_BoundedSurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeCircle.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_Circle;
 class gp_Circ;
 class Geom_Circle;
@@ -41,13 +42,13 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeCircle(const gp_Circ& C,
-                                        const StepData_Factors& theLocalFactors = StepData_Factors());
+                                        const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeCircle(const Handle(Geom_Circle)& C,
-                                        const StepData_Factors& theLocalFactors = StepData_Factors());
+                                        const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeCircle(const Handle(Geom2d_Circle)& C,
-                                        const StepData_Factors& theLocalFactors = StepData_Factors());
+                                        const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_Circle)& Value() const;
 

src/GeomToStep/GeomToStep_MakeConic.hxx

@@ -25,6 +25,7 @@
 class StepGeom_Conic;
 class Geom_Conic;
 class Geom2d_Conic;
+class StepData_Factors;
 
 
 //! This class implements the mapping between classes
@@ -39,10 +40,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeConic(const Handle(Geom_Conic)& C,
-                                       const StepData_Factors& theLocalFactors = StepData_Factors());
+                                       const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeConic(const Handle(Geom2d_Conic)& C,
-                                       const StepData_Factors& theLocalFactors = StepData_Factors());
+                                       const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_Conic)& Value() const;
 

src/GeomToStep/GeomToStep_MakeConicalSurface.hxx

@@ -24,6 +24,7 @@
 #include <GeomToStep_Root.hxx>
 class StepGeom_ConicalSurface;
 class Geom_ConicalSurface;
+class StepData_Factors;
 
 
 //! This class implements the mapping between class
@@ -38,7 +39,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeConicalSurface(const Handle(Geom_ConicalSurface)& CSurf,
-                                                const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_ConicalSurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeCurve.hxx

@@ -22,6 +22,7 @@
 #include <Standard_Handle.hxx>
 
 #include <GeomToStep_Root.hxx>
+class StepData_Factors;
 class StepGeom_Curve;
 class Geom_Curve;
 class Geom2d_Curve;
@@ -39,10 +40,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeCurve(const Handle(Geom_Curve)& C,
-                                       const StepData_Factors& theLocalFactors = StepData_Factors());
+                                       const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeCurve(const Handle(Geom2d_Curve)& C,
-                                       const StepData_Factors& theLocalFactors = StepData_Factors());
+                                       const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_Curve)& Value() const;
 

src/GeomToStep/GeomToStep_MakeCylindricalSurface.hxx

@@ -24,6 +24,7 @@
 #include <GeomToStep_Root.hxx>
 class StepGeom_CylindricalSurface;
 class Geom_CylindricalSurface;
+class StepData_Factors;
 
 
 //! This class implements the mapping between class
@@ -38,7 +39,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeCylindricalSurface(const Handle(Geom_CylindricalSurface)& CSurf,
-                                                    const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                    const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_CylindricalSurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeElementarySurface.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_ElementarySurface;
 class Geom_ElementarySurface;
 
@@ -40,7 +41,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeElementarySurface(const Handle(Geom_ElementarySurface)& S,
-                                                   const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                   const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_ElementarySurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeEllipse.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_Ellipse;
 class gp_Elips;
 class Geom_Ellipse;
@@ -41,13 +42,13 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeEllipse(const gp_Elips& C,
-                                         const StepData_Factors& theLocalFactors = StepData_Factors());
+                                         const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeEllipse(const Handle(Geom_Ellipse)& C,
-                                         const StepData_Factors& theLocalFactors = StepData_Factors());
+                                         const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeEllipse(const Handle(Geom2d_Ellipse)& C,
-                                         const StepData_Factors& theLocalFactors = StepData_Factors());
+                                         const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_Ellipse)& Value() const;
 

src/GeomToStep/GeomToStep_MakeHyperbola.hxx

@@ -38,10 +38,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeHyperbola(const Handle(Geom2d_Hyperbola)& C,
-                                           const StepData_Factors& theLocalFactors = StepData_Factors());
+                                           const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeHyperbola(const Handle(Geom_Hyperbola)& C,
-                                           const StepData_Factors& theLocalFactors = StepData_Factors());
+                                           const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_Hyperbola)& Value() const;
 

src/GeomToStep/GeomToStep_MakeLine.hxx

@@ -22,6 +22,7 @@
 #include <Standard_Handle.hxx>
 
 #include <GeomToStep_Root.hxx>
+class StepData_Factors;
 class StepGeom_Line;
 class gp_Lin;
 class gp_Lin2d;
@@ -41,16 +42,16 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeLine(const gp_Lin& L,
-                                      const StepData_Factors& theLocalFactors = StepData_Factors());
+                                      const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeLine(const gp_Lin2d& L,
-                                      const StepData_Factors& theLocalFactors = StepData_Factors());
+                                      const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeLine(const Handle(Geom_Line)& C,
-                                      const StepData_Factors& theLocalFactors = StepData_Factors());
+                                      const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeLine(const Handle(Geom2d_Line)& C,
-                                      const StepData_Factors& theLocalFactors = StepData_Factors());
+                                      const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_Line)& Value() const;
 

src/GeomToStep/GeomToStep_MakeParabola.hxx

@@ -25,6 +25,7 @@
 class StepGeom_Parabola;
 class Geom2d_Parabola;
 class Geom_Parabola;
+class StepData_Factors;
 
 
 //! This class implements the mapping between the class
@@ -38,10 +39,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeParabola(const Handle(Geom2d_Parabola)& C,
-                                          const StepData_Factors& theLocalFactors = StepData_Factors());
+                                          const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeParabola(const Handle(Geom_Parabola)& C,
-                                          const StepData_Factors& theLocalFactors = StepData_Factors());
+                                          const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_Parabola)& Value() const;
 

src/GeomToStep/GeomToStep_MakePlane.hxx

@@ -22,6 +22,7 @@
 #include <Standard_Handle.hxx>
 
 #include <GeomToStep_Root.hxx>
+class StepData_Factors;
 class StepGeom_Plane;
 class gp_Pln;
 class Geom_Plane;
@@ -39,10 +40,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakePlane(const gp_Pln& P,
-                                       const StepData_Factors& theLocalFactors = StepData_Factors());
+                                       const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakePlane(const Handle(Geom_Plane)& P,
-                                       const StepData_Factors& theLocalFactors = StepData_Factors());
+                                       const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_Plane)& Value() const;
 

src/GeomToStep/GeomToStep_MakePolyline.hxx

@@ -25,6 +25,7 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 
+class StepData_Factors;
 class StepGeom_Polyline;
 
 
@@ -38,10 +39,10 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakePolyline(const TColgp_Array1OfPnt& P,
-                                          const StepData_Factors& theLocalFactors = StepData_Factors());
+                                          const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakePolyline(const TColgp_Array1OfPnt2d& P,
-                                          const StepData_Factors& theLocalFactors = StepData_Factors());
+                                          const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_Polyline)& Value() const;
 

src/GeomToStep/GeomToStep_MakeRectangularTrimmedSurface.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_RectangularTrimmedSurface;
 class Geom_RectangularTrimmedSurface;
 
@@ -40,7 +41,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeRectangularTrimmedSurface(const Handle(Geom_RectangularTrimmedSurface)& RTSurf,
-                                                           const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                           const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_RectangularTrimmedSurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeSphericalSurface.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_SphericalSurface;
 class Geom_SphericalSurface;
 
@@ -39,7 +40,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeSphericalSurface(const Handle(Geom_SphericalSurface)& CSurf,
-                                                  const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                  const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_SphericalSurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeSurface.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_Surface;
 class Geom_Surface;
 
@@ -39,7 +40,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeSurface(const Handle(Geom_Surface)& C,
-                                         const StepData_Factors& theLocalFactors = StepData_Factors());
+                                         const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_Surface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeSurfaceOfLinearExtrusion.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_SurfaceOfLinearExtrusion;
 class Geom_SurfaceOfLinearExtrusion;
 
@@ -39,7 +40,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeSurfaceOfLinearExtrusion(const Handle(Geom_SurfaceOfLinearExtrusion)& CSurf,
-                                                          const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                          const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_SurfaceOfLinearExtrusion)& Value() const;
 

src/GeomToStep/GeomToStep_MakeSurfaceOfRevolution.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_SurfaceOfRevolution;
 class Geom_SurfaceOfRevolution;
 
@@ -39,7 +40,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeSurfaceOfRevolution(const Handle(Geom_SurfaceOfRevolution)& RevSurf,
-                                                     const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                     const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_SurfaceOfRevolution)& Value() const;
 

src/GeomToStep/GeomToStep_MakeSweptSurface.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_SweptSurface;
 class Geom_SweptSurface;
 
@@ -40,7 +41,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeSweptSurface(const Handle(Geom_SweptSurface)& S,
-                                              const StepData_Factors& theLocalFactors = StepData_Factors());
+                                              const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_SweptSurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeToroidalSurface.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_ToroidalSurface;
 class Geom_ToroidalSurface;
 
@@ -39,7 +40,7 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeToroidalSurface(const Handle(Geom_ToroidalSurface)& TorSurf,
-                                                 const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                 const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_ToroidalSurface)& Value() const;
 

src/GeomToStep/GeomToStep_MakeVector.hxx

@@ -23,6 +23,7 @@
 
 #include <GeomToStep_Root.hxx>
 
+class StepData_Factors;
 class StepGeom_Vector;
 class gp_Vec;
 class gp_Vec2d;
@@ -42,16 +43,16 @@ public:
 
   
   Standard_EXPORT GeomToStep_MakeVector(const gp_Vec& V,
-                                        const StepData_Factors& theLocalFactors = StepData_Factors());
+                                        const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeVector(const gp_Vec2d& V,
-                                        const StepData_Factors& theLocalFactors = StepData_Factors());
+                                        const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeVector(const Handle(Geom_Vector)& V,
-                                        const StepData_Factors& theLocalFactors = StepData_Factors());
+                                        const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT GeomToStep_MakeVector(const Handle(Geom2d_Vector)& V,
-                                        const StepData_Factors& theLocalFactors = StepData_Factors());
+                                        const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT const Handle(StepGeom_Vector)& Value() const;
 

src/GeomToStep/GeomToStep_Root.hxx

@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
-#include <StepData_Factors.hxx>
 
 #include <Standard_Boolean.hxx>
 

src/Graphic3d/FILES

@@ -208,4 +208,3 @@ Graphic3d_Layer.cxx
 Graphic3d_Layer.hxx
 Graphic3d_ZLayerId.hxx
 Graphic3d_ZLayerSettings.hxx
-Graphic3d_ViewOcclusionMask.hxx

src/Graphic3d/Graphic3d_CStructure.hxx

@@ -22,7 +22,6 @@
 #include <Graphic3d_ViewAffinity.hxx>
 #include <Graphic3d_TransformPers.hxx>
 #include <Graphic3d_ZLayerId.hxx>
-#include <Graphic3d_ViewOcclusionMask.hxx>
 #include <TopLoc_Datum3D.hxx>
 #include <NCollection_IndexedMap.hxx>
 
@@ -165,19 +164,6 @@ public:
   //! The method is called during traverse of BVH tree.
   void MarkAsNotCulled() const { myIsCulled = Standard_False; }
 
-  //! Returns True if the structure occulded in specified view, otherwise
-  //! returns False.
-  Standard_Boolean IsOccluded(const Standard_Integer theViewId) const 
-  {
-    return (!OcclusionMask->IsVisible(theViewId));
-  }
-
-  //! Marks structure as Occluded by other strcuture in specified view,!
-  void SetOccluionSate(const Standard_Integer theViewId, const bool theIsVisible) const 
-  {
-    OcclusionMask->SetVisible(theViewId, !theIsVisible);
-  }
-
   //! Returns whether check of object's bounding box clipping is enabled before drawing of object; TRUE by default.
   Standard_Boolean BndBoxClipCheck() const { return myBndBoxClipCheck; }
 
@@ -231,8 +217,7 @@ public:
 
 public:
 
-  Handle(Graphic3d_ViewAffinity) ViewAffinity;        //!< view affinity mask
-  Handle(Graphic3d_ViewOcclusionMask) OcclusionMask;  //!< view occlusion mask
+  Handle(Graphic3d_ViewAffinity) ViewAffinity; //!< view affinity mask
 
 protected:
 

src/Graphic3d/Graphic3d_CView.cxx

@@ -547,19 +547,6 @@ void Graphic3d_CView::DisplayedStructures (Graphic3d_MapOfStructure& theStructur
   }
 }
 
-// =======================================================================
-// function : OccludedStructures
-// purpose  :
-// =======================================================================
-void Graphic3d_CView::OccludedStructures(Graphic3d_MapOfStructure& theStructures) const
-{
-  for (Graphic3d_MapOfStructure::Iterator aStructIter (myStructsDisplayed); aStructIter.More(); aStructIter.Next())
-  {
-
-    if (aStructIter.Value()->CStructure()->IsOccluded(this->myId))
-      theStructures.Add(aStructIter.Key());
-  }
-}
 // =======================================================================
 // function : MinMaxValues
 // purpose  :

src/Graphic3d/Graphic3d_CView.hxx

@@ -130,12 +130,6 @@ public:
   //! Returns the set of structures displayed in this view.
   Standard_EXPORT void DisplayedStructures (Graphic3d_MapOfStructure& theStructures) const;
 
-  //! Returns number of occluded strcutures in the view
-  Standard_EXPORT void OccludedStructures(Graphic3d_MapOfStructure& theStructures) const;
- 
-  //! update occlusion test for dispalyed strcutures in the view
-  Standard_EXPORT virtual void UpdateOcclusion() = 0 ;
-
   //! Returns number of displayed structures in the view.
   virtual Standard_Integer NumberOfDisplayedStructures() const { return myStructsDisplayed.Extent(); }
 

src/Graphic3d/Graphic3d_FrameStatsTimer.hxx

@@ -22,8 +22,7 @@ enum Graphic3d_FrameStatsTimer
   Graphic3d_FrameStatsTimer_CpuCulling,
   Graphic3d_FrameStatsTimer_CpuPicking,
   Graphic3d_FrameStatsTimer_CpuDynamics,
-  Graphic3d_FrameStatsTimer_OcclusionCulling,
 };
-enum { Graphic3d_FrameStatsTimer_NB = Graphic3d_FrameStatsTimer_OcclusionCulling + 1 };
+enum { Graphic3d_FrameStatsTimer_NB = Graphic3d_FrameStatsTimer_CpuDynamics + 1 };
 
 #endif // _Graphic3d_FrameStatsTimer_HeaderFile

src/Graphic3d/Graphic3d_RenderingParams.cxx

@@ -65,7 +65,6 @@ void Graphic3d_RenderingParams::DumpJson (Standard_OStream& theOStream, Standard
   OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, CameraApertureRadius)
   OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, CameraFocalPlaneDist)
   OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, FrustumCullingState)
-  OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, OcculsionQueryState)
   
   OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, ToneMappingMethod)
   OCCT_DUMP_FIELD_VALUE_NUMERICAL (theOStream, Exposure)

src/Graphic3d/Graphic3d_RenderingParams.hxx

@@ -92,14 +92,6 @@ public:
     FrustumCulling_NoUpdate //!< culling is active, but the list of culled entities is not updated
   };
 
-  //! State of occulsion query
-  enum OcculsionQuery
-  {
-    OcculsionQuery_Off,     //!< occulsion query is disabled
-    OcculsionQuery_On,      //!< occulsion query is active
-    OcculsionQuery_NoUpdate //!< occulsion query is active, but the list of occulded entities is not updated
-  };
-
 public:
 
   //! Creates default rendering parameters.
@@ -147,7 +139,6 @@ public:
     CameraApertureRadius        (0.0f),
     CameraFocalPlaneDist        (1.0f),
     FrustumCullingState         (FrustumCulling_On),
-    OcculsionQueryState         (OcculsionQuery_Off),
     ToneMappingMethod           (Graphic3d_ToneMappingMethod_Disabled),
     Exposure                    (0.f),
     WhitePoint                  (1.f),
@@ -258,7 +249,6 @@ public: //! @name Ray-Tracing/Path-Tracing parameters
   Standard_ShortReal                CameraApertureRadius;        //!< aperture radius of perspective camera used for depth-of-field, 0.0 by default (no DOF) (path tracing only)
   Standard_ShortReal                CameraFocalPlaneDist;        //!< focal  distance of perspective camera used for depth-of field, 1.0 by default (path tracing only)
   FrustumCulling                    FrustumCullingState;         //!< state of frustum culling optimization; FrustumCulling_On by default
-  OcculsionQuery                    OcculsionQueryState;         //!< state of occulsion query; OcculsionQuery_OFF by default
 
   Graphic3d_ToneMappingMethod       ToneMappingMethod;           //!< specifies tone mapping method for path tracing, Graphic3d_ToneMappingMethod_Disabled by default
   Standard_ShortReal                Exposure;                    //!< exposure value used for tone mapping (path tracing), 0.0 by default

src/Graphic3d/Graphic3d_TransModeFlags.hxx

@@ -25,15 +25,8 @@ enum Graphic3d_TransModeFlags
   Graphic3d_TMF_TriedronPers   = 0x0020,                  //!< object behaves like trihedron - it is fixed at the corner of view and does not resizing (but rotating)
   Graphic3d_TMF_2d             = 0x0040,                  //!< object is defined in 2D screen coordinates (pixels) and does not resize, pan and rotate
   Graphic3d_TMF_CameraPers     = 0x0080,                  //!< object is in front of the camera
-  Graphic3d_TMF_OrthoPers      = 0x0100,                  //!< object is forced to be rendered with orthographic projection.
   Graphic3d_TMF_ZoomRotatePers = Graphic3d_TMF_ZoomPers
                                | Graphic3d_TMF_RotatePers //!< object doesn't resize and rotate
 };
 
-//! Bitwise OR operator for transform persistence mode flags. Be aware that some flags combinations are not valid.
-inline Graphic3d_TransModeFlags operator| (Graphic3d_TransModeFlags a, Graphic3d_TransModeFlags b)
-{
-  return static_cast<Graphic3d_TransModeFlags> (static_cast<uint32_t> (a) | static_cast<uint32_t> (b));
-}
-
 #endif

src/Graphic3d/Graphic3d_TransformPers.hxx

@@ -58,12 +58,6 @@ public:
     return (theMode & (Graphic3d_TMF_TriedronPers | Graphic3d_TMF_2d)) != 0;
   }
 
-  //! Return true if specified mode is orthographic projection transformation persistence.
-  static Standard_Boolean IsOrthoPers (Graphic3d_TransModeFlags theMode)
-  {
-    return (theMode & Graphic3d_TMF_OrthoPers) != 0;
-  }
-
 public:
 
   //! Set transformation persistence.
@@ -116,9 +110,6 @@ public:
   //! Return true for Graphic3d_TMF_TriedronPers and Graphic3d_TMF_2d modes.
   Standard_Boolean IsTrihedronOr2d() const { return IsTrihedronOr2d (myMode); }
 
-  //! Return true for Graphic3d_TMF_OrthoPers mode.
-  Standard_Boolean IsOrthoPers () const { return IsOrthoPers (myMode); }
-
   //! Transformation persistence mode flags.
   Graphic3d_TransModeFlags Mode() const { return myMode; }
 
@@ -306,32 +297,28 @@ public:
   //! @param theWorldView [in] the world view transformation matrix.
   //! @param theViewportWidth [in] the width of viewport (for 2d persistence).
   //! @param theViewportHeight [in] the height of viewport (for 2d persistence).
-  //! @param theToApplyProjPers [in] if should apply projection persistence to matrix (for orthographic persistence).
   //! @return transformation matrix to be applied to model world transformation of an object.
   template<class T>
   NCollection_Mat4<T> Compute (const Handle(Graphic3d_Camera)& theCamera,
                                const NCollection_Mat4<T>& theProjection,
                                const NCollection_Mat4<T>& theWorldView,
                                const Standard_Integer theViewportWidth,
-                               const Standard_Integer theViewportHeight,
-                               const Standard_Boolean theToApplyProjPers = false) const;
+                               const Standard_Integer theViewportHeight) const;
 
   //! Apply transformation persistence on specified matrices.
-  //! @param theCamera [in] camera definition
-  //! @param theProjection [in] projection matrix to modify
-  //! @param theWorldView [in/out]  world-view matrix to modify
-  //! @param theViewportWidth [in]  viewport width
-  //! @param theViewportHeight [in] viewport height
-  //! @param theAnchor [in] if not NULL, overrides anchor point
-  //! @param theToApplyProjPers [in] if should apply projection persistence to matrix (for orthographic persistence).
+  //! @param theCamera camera definition
+  //! @param theProjection projection matrix to modify
+  //! @param theWorldView  world-view matrix to modify
+  //! @param theViewportWidth  viewport width
+  //! @param theViewportHeight viewport height
+  //! @param theAnchor if not NULL, overrides anchor point
   template<class T>
   void Apply (const Handle(Graphic3d_Camera)& theCamera,
               const NCollection_Mat4<T>& theProjection,
               NCollection_Mat4<T>& theWorldView,
               const Standard_Integer theViewportWidth,
               const Standard_Integer theViewportHeight,
-              const gp_Pnt* theAnchor = NULL,
-              const Standard_Boolean theToApplyProjPers = true) const;
+              const gp_Pnt* theAnchor = NULL) const;
 
   //! Dumps the content of me into the stream
   Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const;
@@ -381,50 +368,41 @@ void Graphic3d_TransformPers::Apply (const Handle(Graphic3d_Camera)& theCamera,
                                      NCollection_Mat4<T>& theWorldView,
                                      const Standard_Integer theViewportWidth,
                                      const Standard_Integer theViewportHeight,
-                                     const gp_Pnt* theAnchor,
-                                     const Standard_Boolean theToApplyProjPers) const
+                                     const gp_Pnt* theAnchor) const
 {
   (void )theViewportWidth;
+  (void )theProjection;
   if (myMode == Graphic3d_TMF_None
    || theViewportHeight == 0)
   {
     return;
   }
 
-  Handle(Graphic3d_Camera) aCamera = theCamera;
-  if (IsOrthoPers() && !aCamera->IsOrthographic())
-  {
-    aCamera = new Graphic3d_Camera(*theCamera); // If OrthoPers, copy camera and set to orthographic projection
-    aCamera->SetProjectionType (Graphic3d_Camera::Projection_Orthographic);
-  }
-
-  NCollection_Mat4<Standard_Real> aWorldView = aCamera->OrientationMatrix();
-
   // use total size when tiling is active
-  const Standard_Integer aVPSizeY = aCamera->Tile().IsValid() ? aCamera->Tile().TotalSize.y() : theViewportHeight;
+  const Standard_Integer aVPSizeY = theCamera->Tile().IsValid() ? theCamera->Tile().TotalSize.y() : theViewportHeight;
 
   // a small enough jitter compensation offset
   // to avoid image dragging within single pixel in corner cases
   const Standard_Real aJitterComp = 0.001;
-  if ((myMode & Graphic3d_TMF_TriedronPers) != 0)
+  if (myMode == Graphic3d_TMF_TriedronPers)
   {
     // reset Z focus for trihedron persistence
-    const Standard_Real aFocus = aCamera->IsOrthographic()
-                               ? aCamera->Distance()
-                               : (aCamera->ZFocusType() == Graphic3d_Camera::FocusType_Relative
-                                ? Standard_Real(aCamera->ZFocus() * aCamera->Distance())
-                                : Standard_Real(aCamera->ZFocus()));
+    const Standard_Real aFocus = theCamera->IsOrthographic()
+                               ? theCamera->Distance()
+                               : (theCamera->ZFocusType() == Graphic3d_Camera::FocusType_Relative
+                                ? Standard_Real(theCamera->ZFocus() * theCamera->Distance())
+                                : Standard_Real(theCamera->ZFocus()));
 
     // scale factor to pixels
-    const gp_XYZ aViewDim = aCamera->ViewDimensions (aFocus);
+    const gp_XYZ aViewDim = theCamera->ViewDimensions (aFocus);
     const Standard_Real aScale = Abs(aViewDim.Y()) / Standard_Real(aVPSizeY);
-    const gp_Dir aForward = aCamera->Direction();
-    gp_XYZ aCenter = aCamera->Center().XYZ() + aForward.XYZ() * (aFocus - aCamera->Distance());
+    const gp_Dir aForward = theCamera->Direction();
+    gp_XYZ aCenter = theCamera->Center().XYZ() + aForward.XYZ() * (aFocus - theCamera->Distance());
     if ((myParams.Params2d.Corner & (Aspect_TOTP_LEFT | Aspect_TOTP_RIGHT)) != 0)
     {
       const Standard_Real anOffsetX = (Standard_Real(myParams.Params2d.OffsetX) + aJitterComp) * aScale;
-      const gp_Dir aSide   = aForward.Crossed (aCamera->Up());
-      const gp_XYZ aDeltaX = aSide.XYZ() * (Abs(aViewDim.X()) * aCamera->NDC2dOffsetX() - anOffsetX);
+      const gp_Dir aSide   = aForward.Crossed (theCamera->Up());
+      const gp_XYZ aDeltaX = aSide.XYZ() * (Abs(aViewDim.X()) * theCamera->NDC2dOffsetX() - anOffsetX);
       if ((myParams.Params2d.Corner & Aspect_TOTP_RIGHT) != 0)
       {
         aCenter += aDeltaX;
@@ -437,7 +415,7 @@ void Graphic3d_TransformPers::Apply (const Handle(Graphic3d_Camera)& theCamera,
     if ((myParams.Params2d.Corner & (Aspect_TOTP_TOP | Aspect_TOTP_BOTTOM)) != 0)
     {
       const Standard_Real anOffsetY = (Standard_Real(myParams.Params2d.OffsetY) + aJitterComp) * aScale;
-      const gp_XYZ aDeltaY = aCamera->Up().XYZ() * (Abs(aViewDim.Y()) * aCamera->NDC2dOffsetY() - anOffsetY);
+      const gp_XYZ aDeltaY = theCamera->Up().XYZ() * (Abs(aViewDim.Y()) * theCamera->NDC2dOffsetY() - anOffsetY);
       if ((myParams.Params2d.Corner & Aspect_TOTP_TOP) != 0)
       {
         aCenter += aDeltaY;
@@ -448,24 +426,27 @@ void Graphic3d_TransformPers::Apply (const Handle(Graphic3d_Camera)& theCamera,
       }
     }
 
+    NCollection_Mat4<Standard_Real> aWorldView = theCamera->OrientationMatrix();
     Graphic3d_TransformUtils::Translate (aWorldView, aCenter.X(), aCenter.Y(), aCenter.Z());
     Graphic3d_TransformUtils::Scale     (aWorldView, aScale,      aScale,      aScale);
+    theWorldView.ConvertFrom (aWorldView);
+    return;
   }
-  else if ((myMode & Graphic3d_TMF_2d) != 0)
+  else if (myMode == Graphic3d_TMF_2d)
   {
-    const Standard_Real aFocus = aCamera->IsOrthographic()
-                               ? aCamera->Distance()
-                               : (aCamera->ZFocusType() == Graphic3d_Camera::FocusType_Relative
-                                ? Standard_Real(aCamera->ZFocus() * aCamera->Distance())
-                                : Standard_Real(aCamera->ZFocus()));
+    const Standard_Real aFocus = theCamera->IsOrthographic()
+                               ? theCamera->Distance()
+                               : (theCamera->ZFocusType() == Graphic3d_Camera::FocusType_Relative
+                                ? Standard_Real(theCamera->ZFocus() * theCamera->Distance())
+                                : Standard_Real(theCamera->ZFocus()));
 
     // scale factor to pixels
-    const gp_XYZ        aViewDim = aCamera->ViewDimensions (aFocus);
+    const gp_XYZ        aViewDim = theCamera->ViewDimensions (aFocus);
     const Standard_Real aScale   = Abs(aViewDim.Y()) / Standard_Real(aVPSizeY);
     gp_XYZ aCenter (0.0, 0.0, -aFocus);
     if ((myParams.Params2d.Corner & (Aspect_TOTP_LEFT | Aspect_TOTP_RIGHT)) != 0)
     {
-      aCenter.SetX (-aViewDim.X() * aCamera->NDC2dOffsetX() + (Standard_Real(myParams.Params2d.OffsetX) + aJitterComp) * aScale);
+      aCenter.SetX (-aViewDim.X() * theCamera->NDC2dOffsetX() + (Standard_Real(myParams.Params2d.OffsetX) + aJitterComp) * aScale);
       if ((myParams.Params2d.Corner & Aspect_TOTP_RIGHT) != 0)
       {
         aCenter.SetX (-aCenter.X());
@@ -473,24 +454,26 @@ void Graphic3d_TransformPers::Apply (const Handle(Graphic3d_Camera)& theCamera,
     }
     if ((myParams.Params2d.Corner & (Aspect_TOTP_TOP | Aspect_TOTP_BOTTOM)) != 0)
     {
-      aCenter.SetY (-aViewDim.Y() * aCamera->NDC2dOffsetY() + (Standard_Real(myParams.Params2d.OffsetY) + aJitterComp) * aScale);
+      aCenter.SetY (-aViewDim.Y() * theCamera->NDC2dOffsetY() + (Standard_Real(myParams.Params2d.OffsetY) + aJitterComp) * aScale);
       if ((myParams.Params2d.Corner & Aspect_TOTP_TOP) != 0)
       {
         aCenter.SetY (-aCenter.Y());
       }
     }
 
-    aWorldView.InitIdentity();
-    Graphic3d_TransformUtils::Translate (aWorldView, aCenter.X(), aCenter.Y(), aCenter.Z());
-    Graphic3d_TransformUtils::Scale     (aWorldView, aScale,      aScale,      aScale);
+    theWorldView.InitIdentity();
+    Graphic3d_TransformUtils::Translate (theWorldView, T(aCenter.X()), T(aCenter.Y()), T(aCenter.Z()));
+    Graphic3d_TransformUtils::Scale     (theWorldView, T(aScale),      T(aScale),      T(aScale));
+    return;
   }
   else if ((myMode & Graphic3d_TMF_CameraPers) != 0)
   {
-    aWorldView.InitIdentity();
+    theWorldView.InitIdentity();
   }
   else
   {
     // Compute reference point for transformation in untransformed projection space.
+    NCollection_Mat4<Standard_Real> aWorldView = theCamera->OrientationMatrix();
     if (theAnchor != NULL)
     {
       Graphic3d_TransformUtils::Translate (aWorldView, theAnchor->X(), theAnchor->Y(), theAnchor->Z());
@@ -520,19 +503,12 @@ void Graphic3d_TransformPers::Apply (const Handle(Graphic3d_Camera)& theCamera,
     if ((myMode & Graphic3d_TMF_ZoomPers) != 0)
     {
       // lock zooming
-      Standard_Real aScale = persistentScale (aCamera, theViewportWidth, theViewportHeight);
+      Standard_Real aScale = persistentScale (theCamera, theViewportWidth, theViewportHeight);
       Graphic3d_TransformUtils::Scale (aWorldView, aScale, aScale, aScale);
     }
+    theWorldView.ConvertFrom (aWorldView);
+    return;
   }
-
-  if (!theCamera->IsOrthographic() && IsOrthoPers() && theToApplyProjPers)
-  {
-    Graphic3d_Mat4d aProjInv;
-    aProjInv.ConvertFrom (theProjection.Inverted());
-    aWorldView = (aProjInv * aCamera->ProjectionMatrix()) * aWorldView;
-  }
-
-  theWorldView.ConvertFrom (aWorldView);
 }
 
 // =======================================================================
@@ -579,7 +555,7 @@ void Graphic3d_TransformPers::Apply (const Handle(Graphic3d_Camera)& theCamera,
                                      const Standard_Integer theViewportHeight,
                                      BVH_Box<T, 3>& theBoundingBox) const
 {
-  NCollection_Mat4<T> aTPers = Compute (theCamera, theProjection, theWorldView, theViewportWidth, theViewportHeight, false);
+  NCollection_Mat4<T> aTPers = Compute (theCamera, theProjection, theWorldView, theViewportWidth, theViewportHeight);
   if (aTPers.IsIdentity()
   || !theBoundingBox.IsValid())
   {
@@ -618,8 +594,7 @@ NCollection_Mat4<T> Graphic3d_TransformPers::Compute (const Handle(Graphic3d_Cam
                                                       const NCollection_Mat4<T>& theProjection,
                                                       const NCollection_Mat4<T>& theWorldView,
                                                       const Standard_Integer theViewportWidth,
-                                                      const Standard_Integer theViewportHeight,
-                                                      const Standard_Boolean theToApplyProjPers) const
+                                                      const Standard_Integer theViewportHeight) const
 {
   if (myMode == Graphic3d_TMF_None)
   {
@@ -635,7 +610,7 @@ NCollection_Mat4<T> Graphic3d_TransformPers::Compute (const Handle(Graphic3d_Cam
 
   // compute only world-view matrix difference to avoid floating point instability
   // caused by projection matrix modifications outside of this algorithm (e.g. by Z-fit)
-  Apply (theCamera, theProjection, aWorldView, theViewportWidth, theViewportHeight, NULL, theToApplyProjPers);
+  Apply (theCamera, theProjection, aWorldView, theViewportWidth, theViewportHeight);
   return anUnviewMat * aWorldView;
 }
 

src/Graphic3d/Graphic3d_ViewOcclusionMask.hxx

@@ -1,25 +0,0 @@
-// Created on: 2024-02-20
-// Created by: Hossam Ali
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in
-// OCCT distribution for complete text of the license and disclaimer of any
-// warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _Graphic3d_ViewOcclusionMask_HeaderFile
-#define _Graphic3d_ViewOcclusionMask_HeaderFile
-
-#include <Graphic3d_ViewAffinity.hxx>
-
-//! define occlusion mask as alias for view affinity mask .
-typedef Graphic3d_ViewAffinity Graphic3d_ViewOcclusionMask;
-
-#endif //_Graphic3d_ViewOcclusionMask_HeaderFile

src/OpenGl/FILES

@@ -153,5 +153,3 @@ OpenGl_TextBuilder.hxx
 OpenGl_TextBuilder.cxx
 OpenGl_HaltonSampler.hxx
 OpenGl_ShaderProgramDumpLevel.hxx
-OpenGl_OcclusionQuery.hxx
-OpenGl_OcclusionQuery.cxx

src/OpenGl/OpenGl_LayerList.cxx

@@ -25,7 +25,6 @@
 #include <OpenGl_VertexBuffer.hxx>
 #include <OpenGl_View.hxx>
 #include <OpenGl_Workspace.hxx>
-#include <OpenGl_OcclusionQuery.hxx>
 
 namespace
 {
@@ -872,70 +871,6 @@ void OpenGl_LayerList::Render (const Handle(OpenGl_Workspace)& theWorkspace,
   theWorkspace->SetRenderFilter (aPrevFilter);
 }
 
-//=======================================================================
-//function : updateOcclusion
-//purpose  : update Occlsuion state for each struct in each layer 
-//=======================================================================
-void OpenGl_LayerList::UpdateOcclusion( const Handle(OpenGl_Workspace) & theWorkspace)
-{  
-  const Handle(OpenGl_Context) &aCtx = theWorkspace->GetGlContext();
-  aCtx->core11fwd->glEnable(GL_DEPTH_TEST);
-  aCtx->core11fwd->glDepthFunc (GL_LESS);
-
-
-  // Remember global settings for glDepth mask and write mask
-  GLboolean aPrevColorMask[4];
-  GLboolean aPrevDepthMask;
-  aCtx->core11fwd->glGetBooleanv(GL_COLOR_WRITEMASK, aPrevColorMask);
-  aCtx->core11fwd->glGetBooleanv(GL_DEPTH_WRITEMASK, &aPrevDepthMask);
-
-  // Turn off writing to depth and color buffers 
-  aCtx->core11fwd->glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-
-  // Start record occlusion test computational cost  
-  const Handle(OpenGl_FrameStats) &aStats = theWorkspace->GetGlContext()->FrameStats();
-  OSD_Timer &aTimer = aStats->ActiveDataFrame().ChangeTimer( Graphic3d_FrameStatsTimer_OcclusionCulling);
-  aTimer.Start();
-
-  // Loop for all layers
-  for (NCollection_List<Handle(Graphic3d_Layer)>::Iterator aLayerIter(myLayers);
-       aLayerIter.More(); aLayerIter.Next()) {
-
-    const Handle(Graphic3d_Layer) &aLayer = aLayerIter.ChangeValue();
-
-    // Exclude frustum culled layer
-    if (aLayer->IsCulled())
-      continue;
-
-    aCtx->core11fwd->glClear(GL_COLOR_BUFFER_BIT| GL_DEPTH_BUFFER_BIT);
-
-    // Render priority list
-    const Standard_Integer aViewId = theWorkspace->View()->Identification();
-
-    for (Standard_Integer aPriorityIter = Graphic3d_DisplayPriority_Bottom; aPriorityIter <= Graphic3d_DisplayPriority_Topmost; ++aPriorityIter) 
-    {
-      const Graphic3d_IndexedMapOfStructure &aStructures = aLayer->Structures((Graphic3d_DisplayPriority)aPriorityIter);
-      for (OpenGl_Structure::StructIterator aStructIter(aStructures); aStructIter.More(); aStructIter.Next()) 
-      {
-        const OpenGl_Structure *aStruct = aStructIter.Value();  
-       
-        // Exclude view frustum culled structs
-        if (aStruct->IsCulled() || !aStruct->IsVisible(aViewId))
-          continue;
-        
-        aStruct->UpdateOcclusion(theWorkspace);
-      }
-    }
-  }
-
-  // Back to prev settings 
-  aCtx->core11fwd->glDepthMask(aPrevDepthMask);
-  aCtx->core11fwd->glColorMask(aPrevColorMask[0], aPrevColorMask[1], aPrevColorMask[2], aPrevColorMask[3]);
-
-  aTimer.Stop();
-  aStats->ActiveDataFrame()[Graphic3d_FrameStatsTimer_CpuCulling] = aTimer.UserTimeCPU();
-}
-
 //=======================================================================
 //function : renderTransparent
 //purpose  : Render transparent objects using blending operator.

src/OpenGl/OpenGl_LayerList.hxx

@@ -106,9 +106,6 @@ public:
                                OpenGl_FrameBuffer*             theReadDrawFbo,
                                OpenGl_FrameBuffer*             theOitAccumFbo) const;
 
-  //! Update occlusion test
-  Standard_EXPORT void UpdateOcclusion(const Handle(OpenGl_Workspace) & theWorkspace);
-
   //! Returns the set of OpenGL Z-layers.
   const NCollection_List<Handle(Graphic3d_Layer)>& Layers() const { return myLayers; }
 

src/OpenGl/OpenGl_OcclusionQuery.cxx

@@ -1,110 +0,0 @@
-// Created on: 2024-02-20
-// Created by: Hossam Ali
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in
-// OCCT distribution for complete text of the license and disclaimer of any
-// warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <OpenGl_OcclusionQuery.hxx>
-
-#include <OpenGl_Context.hxx>
-#include <OpenGl_GlCore15.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(OpenGl_OcclusionQuery, OpenGl_Resource)
-
-// =======================================================================
-// function :
-// purpose  :
-// =======================================================================
-OpenGl_OcclusionQuery::OpenGl_OcclusionQuery(): myID(0), inUse(false), started(false)
-{
-}
-
-// =======================================================================
-// function :
-// purpose  :
-// =======================================================================
-OpenGl_OcclusionQuery::~OpenGl_OcclusionQuery() 
-{
-  Release(NULL);
-}
-// =======================================================================
-// function : Create()
-// purpose  :
-// =======================================================================
-void OpenGl_OcclusionQuery::Create(const Handle(OpenGl_Context) & theCtx,
-                                   GLenum theQueryType) {
-  theCtx->core15->glGenQueries(1, &myID);
-  myType = theQueryType;
-  inUse = false;
-  started = false;
-}
-// =======================================================================
-// function : Begin()
-// purpose  :
-// =======================================================================
-void OpenGl_OcclusionQuery::Begin(const Handle(OpenGl_Context) & theCtx) 
-{
-  inUse = true;
-  started = true;
-  theCtx->core15->glBeginQuery(myType, myID); 
-}
- 
-// =======================================================================
-// function : End()
-// purpose  :
-// =======================================================================
-void OpenGl_OcclusionQuery::End(const Handle(OpenGl_Context) & theCtx) const
-{
-  theCtx->core15->glEndQuery(myType);
-}
-
-// =======================================================================
-// function : isResultsReady()
-// purpose  :
-// =======================================================================
-int OpenGl_OcclusionQuery::IsResultsReady(const Handle(OpenGl_Context) & theCtx) const
-{
-  // check if the query started before check for results
-  if(!started)
-    return false;
-
-  GLint aReady = 0;
-  theCtx->core15->glGetQueryObjectiv(myID, GL_QUERY_RESULT_AVAILABLE, &aReady);
-  return aReady;
-  }
-
-// =======================================================================
-// function : GetResults()
-// purpose  :
-// =======================================================================
-int OpenGl_OcclusionQuery::GetResults(const Handle(OpenGl_Context) & theCtx)
-{
-  inUse = false;
-  GLint aResult;
-  theCtx->core15->glGetQueryObjectiv(myID, GL_QUERY_RESULT, &aResult); 
-  return aResult;
-}
-
-// =======================================================================
-// function : Release()
-// purpose  : Destroy the query opengl resources 
-// =======================================================================
-void OpenGl_OcclusionQuery::Release(OpenGl_Context *theCtx) {
-  if (myID == 0)
-    return;
-  if (theCtx != NULL) {
-    theCtx->core15->glDeleteQueries(1, &myID);
-    myID = 0;
-    started = false;
-  }
-}

src/OpenGl/OpenGl_OcclusionQuery.hxx

@@ -1,72 +0,0 @@
-// Created on: 2024-02-20
-// Created by: Hossam Ali
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in
-// OCCT distribution for complete text of the license and disclaimer of any
-// warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef OpenGl_OcclusionQuery_HeaderFile
-#define OpenGl_OcclusionQuery_HeaderFile
-
-#include <OpenGl_Resource.hxx>
-#include <OpenGl_GlCore15.hxx>
-
-class OpenGl_Context;
-
-DEFINE_STANDARD_HANDLE(OpenGl_OcclusionQuery, OpenGl_Resource)
-
-//! Implementation of OpenGl view.
-class OpenGl_OcclusionQuery : public OpenGl_Resource {
-public:
-  DEFINE_STANDARD_RTTIEXT(OpenGl_OcclusionQuery, OpenGl_Resource)
-
-  //! Constructor.
-  Standard_EXPORT OpenGl_OcclusionQuery();
-
-  //! Default destructor.
-  Standard_EXPORT virtual ~OpenGl_OcclusionQuery();
-  
-  //! Create the occlusion test Gl resources.
-  Standard_EXPORT virtual void Create(const Handle(OpenGl_Context)& theCtx, GLenum theType);
-
-  //! Begins occlusion query.
-  Standard_EXPORT virtual void Begin(const Handle(OpenGl_Context) & theCtx);
-
-  //! Ends occlusion query
-  Standard_EXPORT virtual void End(const Handle(OpenGl_Context) & theCtx) const;
-
-  //! Check if the query results ready for retrive or not.
-  Standard_EXPORT virtual int IsResultsReady(const Handle(OpenGl_Context) & theCtx) const;
-
-  //! Return the query results based on query type.
-  Standard_EXPORT virtual int GetResults(const Handle(OpenGl_Context) & theCtx);
-
-  //! Return is the query in use or not
-  Standard_EXPORT bool IsInUse() { return inUse; }
-
-  //! Return Query ID
-  Standard_EXPORT unsigned int GetID() const {return myID;}; 
-
-  //! Destroys query object.
-  Standard_EXPORT virtual void Release (OpenGl_Context * theCtx) Standard_OVERRIDE;
-
-  //! Returns estimated GPU memory usage - not implemented.
-  virtual Standard_Size EstimatedDataSize() const Standard_OVERRIDE { return 0; }
-
-private:
-  GLuint   myID;                     //!< OpenGL query ID.
-  GLenum   myType;                   //!< OpenGL query Type.
-  bool     inUse;                    //!< store bool answer is the query still inprogress or finished.
-  bool     started;                  //!< bool answer is the query stated before or this the first time.
-};
-
-#endif // _OpenGl_OcclusionQuery_Header

src/OpenGl/OpenGl_Structure.cxx

@@ -103,8 +103,7 @@ OpenGl_Structure::OpenGl_Structure (const Handle(Graphic3d_StructureManager)& th
   myInstancedStructure (NULL),
   myIsRaytracable      (Standard_False),
   myModificationState  (0),
-  myIsMirrored         (Standard_False),
-  myQuery(new OpenGl_OcclusionQuery())
+  myIsMirrored         (Standard_False)
 {
   updateLayerTransformation();
 }
@@ -627,44 +626,6 @@ void OpenGl_Structure::Render (const Handle(OpenGl_Workspace) &theWorkspace) con
   theWorkspace->SetHighlightStyle (Handle(Graphic3d_PresentationAttributes)());
 }
 
-// =======================================================================
-// function : RenderOccluder 
-// purpose  : 
-// =======================================================================
-void OpenGl_Structure::RenderOccluder(const Handle(OpenGl_Workspace)& theWorkspace) const 
-{
-  const Handle(OpenGl_Context) &aCtx = theWorkspace->GetGlContext();
-  aCtx->ApplyModelViewMatrix();
-  renderBoundingBox(theWorkspace);
-}
-// =======================================================================
-// function : OcclusionTest 
-// purpose  : 
-// =======================================================================
-void OpenGl_Structure::UpdateOcclusion(const Handle(OpenGl_Workspace)& theWorkspace) const
-{
-  const Handle(OpenGl_Context) &aCtx = theWorkspace->GetGlContext();
-  if (myQuery->GetID()==0)
-      myQuery->Create(aCtx, GL_ANY_SAMPLES_PASSED);
-
-  if(myQuery->IsResultsReady(aCtx))
-  {
-    int aResult = myQuery->GetResults(aCtx);
-    const Standard_Integer aViewId = theWorkspace->View()->Identification();
-    if (aResult<=0)
-      SetOccluionSate(aViewId, Standard_False);
-    else
-      SetOccluionSate(aViewId, Standard_True);
-  }
-
-  if(!myQuery->IsInUse())
-  {
-    myQuery->Begin(aCtx);
-    RenderOccluder(theWorkspace);
-    myQuery->End(aCtx);
-  }
-}
-
 // =======================================================================
 // function : Release
 // purpose  :
@@ -686,8 +647,6 @@ void OpenGl_Structure::ReleaseGlResources (const Handle(OpenGl_Context)& theGlCt
   {
     aGroupIter.ChangeValue()->Release (theGlCtx);
   }
-
-  myQuery->Release(theGlCtx.get());
 }
 
 //=======================================================================

src/OpenGl/OpenGl_Structure.hxx

@@ -21,7 +21,6 @@
 #include <OpenGl_GraphicDriver.hxx>
 #include <OpenGl_Group.hxx>
 #include <OpenGl_Workspace.hxx>
-#include <OpenGl_OcclusionQuery.hxx>
 
 #include <NCollection_List.hxx>
 
@@ -97,12 +96,6 @@ public:
   //! Renders the structure.
   Standard_EXPORT virtual void Render  (const Handle(OpenGl_Workspace)& theWorkspace) const;
 
-  //! Renders occluder presenation of the structure 
-  Standard_EXPORT void RenderOccluder(const Handle(OpenGl_Workspace)& theWorkspace) const;
-
-  //! Peforms occlusion test for the strcuture
-  Standard_EXPORT void UpdateOcclusion(const Handle(OpenGl_Workspace)& theWorkspace) const;
-  
   //! Releases structure resources.
   Standard_EXPORT virtual void Release (const Handle(OpenGl_Context)& theGlCtx);
 
@@ -172,14 +165,12 @@ protected:
 protected:
 
   OpenGl_Structure*          myInstancedStructure;
-  Graphic3d_Mat4             myRenderTrsf;                //!< transformation, actually used for rendering (includes Local Origin shift)
+  Graphic3d_Mat4             myRenderTrsf; //!< transformation, actually used for rendering (includes Local Origin shift)
 
   mutable Standard_Boolean   myIsRaytracable;
   mutable Standard_Size      myModificationState;
 
-  Standard_Boolean           myIsMirrored;                //!< Used to tell OpenGl to interpret polygons in clockwise order.
-
-  Handle(OpenGl_OcclusionQuery)      myQuery;             //! test the occlusion status of the structure;
+  Standard_Boolean           myIsMirrored; //!< Used to tell OpenGl to interpret polygons in clockwise order.
 
 };
 

src/OpenGl/OpenGl_View.cxx

@@ -1766,7 +1766,7 @@ void OpenGl_View::Redraw()
     aCtx->SetReadDrawBuffer (aStereoMode == Graphic3d_StereoMode_QuadBuffer ? GL_BACK_LEFT : GL_BACK);
     aCtx->SetResolution (myRenderParams.Resolution, myRenderParams.ResolutionRatio(),
                          aMainFbos[0] != NULL ? myRenderParams.RenderResolutionScale : 1.0f);
-    
+
     redraw (Graphic3d_Camera::Projection_MonoLeftEye, aMainFbos[0], aMainFbosOit[0]);
     myBackBufferRestored = Standard_True;
     myIsImmediateDrawn   = Standard_False;
@@ -2129,8 +2129,8 @@ void OpenGl_View::redraw (const Graphic3d_Camera::Projection theProjection,
   aCtx->core11fwd->glClearColor (aBgColor.r(), aBgColor.g(), aBgColor.b(), aCtx->caps->buffersOpaqueAlpha ? 1.0f : 0.0f);
   aCtx->core11fwd->glClear (toClear);
   aCtx->SetColorMask (true); // restore default alpha component write state
-  
-    render (theProjection, theReadDrawFbo, theOitAccumFbo, Standard_False);
+
+  render (theProjection, theReadDrawFbo, theOitAccumFbo, Standard_False);
 }
 
 // =======================================================================
@@ -2407,10 +2407,6 @@ void OpenGl_View::render (Graphic3d_Camera::Projection theProjection,
   {
     myAccumFrames = 0;
     myWorldViewProjState = aWVPState;
-
-    // Invalidiate occlusion query if camera has changed.
-    if (myRenderParams.OcculsionQueryState == Graphic3d_RenderingParams::OcculsionQuery_On)
-      myRenderParams.OcculsionQueryState = Graphic3d_RenderingParams::OcculsionQuery_NoUpdate;
   }
 
   myLocalOrigin.SetCoord (0.0, 0.0, 0.0);
@@ -2538,17 +2534,6 @@ void OpenGl_View::InvalidateBVHData (const Graphic3d_ZLayerId theLayerId)
   myZLayers.InvalidateBVHData (theLayerId);
 }
 
-//=======================================================================
-//function : updateOcclusionState
-//purpose  :
-//=======================================================================
-void OpenGl_View::UpdateOcclusion()
-{
-  myZLayers.UpdateOcclusion(myWorkspace);
- 
-  // re-validate occlusion results  
-  myRenderParams.OcculsionQueryState = Graphic3d_RenderingParams::OcculsionQuery_On;
-}
 //=======================================================================
 //function : renderStructs
 //purpose  :
@@ -2562,17 +2547,13 @@ void OpenGl_View::renderStructs (Graphic3d_Camera::Projection theProjection,
   {
     return;
   }
-    
+
   myZLayers.UpdateCulling (myWorkspace, theToDrawImmediate);
   if (myZLayers.NbStructures() <= 0)
   {
     return;
   }
 
-  // update occlusion here after update culling to ensure the frusrum culling updated
-  if (myRenderParams.OcculsionQueryState == Graphic3d_RenderingParams::OcculsionQuery_NoUpdate)
-    UpdateOcclusion();
-
   Handle(OpenGl_Context) aCtx = myWorkspace->GetGlContext();
   Standard_Boolean toRenderGL = theToDrawImmediate ||
     myRenderParams.Method != Graphic3d_RM_RAYTRACING ||

src/OpenGl/OpenGl_View.hxx

@@ -183,9 +183,6 @@ public:
   //! Returns additional buffers for depth peeling OIT.
   const Handle(OpenGl_DepthPeeling)& DepthPeelingFbos() const { return myDepthPeelingFbos; }
 
-  //! Perform occlusion test for the set of structures presented in the view  
-  Standard_EXPORT virtual void UpdateOcclusion()  Standard_OVERRIDE;
-
 public:
 
   //! Returns gradient background fill colors.
@@ -392,7 +389,7 @@ protected: //! @name Rendering of GL graphics (with prepared drawing buffer).
                                               OpenGl_FrameBuffer*    theReadDrawFbo,
                                               OpenGl_FrameBuffer*    theOitAccumFbo,
                                               const Standard_Boolean theToDrawImmediate);
-  
+
   //! Renders trihedron.
   void renderTrihedron (const Handle(OpenGl_Workspace) &theWorkspace);
 

src/PrsMgr/PrsMgr_PresentableObject.cxx

@@ -46,7 +46,6 @@ const gp_Trsf& PrsMgr_PresentableObject::getIdentityTrsf()
 PrsMgr_PresentableObject::PrsMgr_PresentableObject (const PrsMgr_TypeOfPresentation3d theType)
 : myParent (NULL),
   myViewAffinity (new Graphic3d_ViewAffinity()),
-  myViewOcclusionMask(new Graphic3d_ViewOcclusionMask()),
   myDrawer (new Prs3d_Drawer()),
   myTypeOfPresentation3d (theType),
   myDisplayStatus (PrsMgr_DisplayStatus_None),

src/PrsMgr/PrsMgr_PresentableObject.hxx

@@ -19,7 +19,6 @@
 
 #include <Aspect_TypeOfFacingModel.hxx>
 #include <gp_GTrsf.hxx>
-#include <Graphic3d_ViewOcclusionMask.hxx>
 #include <Graphic3d_ClipPlane.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <PrsMgr_ListOfPresentableObjects.hxx>
@@ -73,9 +72,6 @@ public:
 
   //! Return view affinity mask.
   const Handle(Graphic3d_ViewAffinity)& ViewAffinity() const { return myViewAffinity; }
-  
-  //! Return view occlusion mask.
-  const Handle(Graphic3d_ViewOcclusionMask)& ViewOcclusionMask() const { return myViewOcclusionMask; }
 
   //! Returns true if the Interactive Object has display mode setting overriding global setting (within Interactive Context).
   Standard_Boolean HasDisplayMode() const { return myDrawer->DisplayMode() != -1; }
@@ -526,7 +522,6 @@ protected:
   PrsMgr_PresentableObject*              myParent;                  //!< pointer to the parent object
   PrsMgr_Presentations                   myPresentations;           //!< list of presentations
   Handle(Graphic3d_ViewAffinity)         myViewAffinity;            //!< view affinity mask
-  Handle(Graphic3d_ViewOcclusionMask)    myViewOcclusionMask;       //!< view occlusion mask
   Handle(Graphic3d_SequenceOfHClipPlane) myClipPlanes;              //!< sequence of object-specific clipping planes
   Handle(Prs3d_Drawer)                   myDrawer;                  //!< main presentation attributes
   Handle(Prs3d_Drawer)                   myHilightDrawer;           //!< (optional) custom presentation attributes for highlighting selected object

src/PrsMgr/PrsMgr_PresentationManager.cxx

@@ -395,7 +395,6 @@ void PrsMgr_PresentationManager::displayImmediate (const Handle(V3d_Viewer)& the
       {
         aShadowPrs->CStructure()->ViewAffinity = new Graphic3d_ViewAffinity();
         aShadowPrs->CStructure()->ViewAffinity->SetVisible (Standard_False);
-        aShadowPrs->CStructure()->OcclusionMask =new Graphic3d_ViewOcclusionMask();
         aShadowPrs->Display();
       }
 
@@ -523,10 +522,6 @@ Handle(PrsMgr_Presentation) PrsMgr_PresentationManager::Presentation (const Hand
   thePrsObj->Presentations().Append (aPrs);
   thePrsObj->Fill (this, aPrs, theMode);
 
-  // update object occlusion state by passing occlusion state handle to
-  // underlaying graphic strcutures
-  aPrs->CStructure()->OcclusionMask = thePrsObj->ViewOcclusionMask();
-
   // set layer index accordingly to object's presentations
   aPrs->SetUpdateStatus (Standard_False);
   return aPrs;

src/RWStepAP214/RWStepAP214_GeneralModule.cxx

@@ -98,8 +98,6 @@
 #include <RWStepBasic_RWExternalIdentificationAssignment.hxx>
 #include <RWStepBasic_RWExternallyDefinedItem.hxx>
 #include <RWStepBasic_RWGeneralProperty.hxx>
-#include <RWStepBasic_RWGeneralPropertyAssociation.hxx>
-#include <RWStepBasic_RWGeneralPropertyRelationship.hxx>
 #include <RWStepBasic_RWGroupRelationship.hxx>
 #include <RWStepBasic_RWIdentificationAssignment.hxx>
 #include <RWStepBasic_RWIdentificationRole.hxx>
@@ -572,8 +570,6 @@
 #include <StepBasic_ExternalIdentificationAssignment.hxx>
 #include <StepBasic_ExternalSource.hxx>
 #include <StepBasic_GeneralProperty.hxx>
-#include <StepBasic_GeneralPropertyAssociation.hxx>
-#include <StepBasic_GeneralPropertyRelationship.hxx>
 #include <StepBasic_Group.hxx>
 #include <StepBasic_GroupRelationship.hxx>
 #include <StepBasic_IdentificationAssignment.hxx>
@@ -1192,9 +1188,7 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_GeneralModule,StepData_GeneralModule)
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
 #include <StepRepr_CompShAspAndDatumFeatAndShAsp.hxx>
-#include <StepRepr_BooleanRepresentationItem.hxx>
 #include <StepRepr_IntegerRepresentationItem.hxx>
-#include <StepRepr_RealRepresentationItem.hxx>
 #include <StepRepr_ValueRepresentationItem.hxx>
 #include <StepAP242_DraughtingModelItemAssociation.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
@@ -5882,20 +5876,6 @@ void RWStepAP214_GeneralModule::FillSharedCase(const Standard_Integer CN,
     aTool.Share(anEnt, iter);
   }
   break;
-  case 820:
-  {
-    DeclareAndCast(StepBasic_GeneralPropertyAssociation, anEnt, ent);
-    RWStepBasic_RWGeneralPropertyAssociation aTool;
-    aTool.Share(anEnt, iter);
-  }
-  break;
-  case 821:
-  {
-    DeclareAndCast(StepBasic_GeneralPropertyRelationship, anEnt, ent);
-    RWStepBasic_RWGeneralPropertyRelationship aTool;
-    aTool.Share(anEnt, iter);
-  }
-  break;
   default : break;
   }
 }
@@ -8205,18 +8185,6 @@ Standard_Boolean RWStepAP214_GeneralModule::NewVoid
    case 819:
      ent = new StepVisual_TriangulatedSurfaceSet;
      break;
-   case 820:
-     ent = new StepBasic_GeneralPropertyAssociation;
-     break;
-   case 821:
-     ent = new StepBasic_GeneralPropertyRelationship;
-     break;
-   case 822:
-     ent = new StepRepr_BooleanRepresentationItem;
-     break;
-   case 823:
-     ent = new StepRepr_RealRepresentationItem;
-     break;
 
   default: 
     return Standard_False;

src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx

@@ -188,8 +188,6 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepShape_GeometricallyBoundedWireframeShapeRepresentation.hxx>
 #include <StepRepr_GlobalUncertaintyAssignedContext.hxx>
 #include <StepRepr_GlobalUnitAssignedContext.hxx>
-#include <StepBasic_GeneralPropertyAssociation.hxx>
-#include <StepBasic_GeneralPropertyRelationship.hxx>
 #include <StepBasic_Group.hxx>
 #include <StepBasic_GroupRelationship.hxx>
 #include <StepShape_HalfSpaceSolid.hxx>
@@ -624,8 +622,6 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.hxx>
 #include <RWStepRepr_RWGlobalUncertaintyAssignedContext.hxx>
 #include <RWStepRepr_RWGlobalUnitAssignedContext.hxx>
-#include <RWStepBasic_RWGeneralPropertyAssociation.hxx>
-#include <RWStepBasic_RWGeneralPropertyRelationship.hxx>
 #include <RWStepBasic_RWGroup.hxx>
 #include <RWStepBasic_RWGroupRelationship.hxx>
 #include <RWStepShape_RWHalfSpaceSolid.hxx>
@@ -1359,9 +1355,7 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <RWStepRepr_RWCompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
 #include <RWStepRepr_RWCompShAspAndDatumFeatAndShAsp.hxx>
-#include <RWStepRepr_RWBooleanRepresentationItem.hxx>
 #include <RWStepRepr_RWIntegerRepresentationItem.hxx>
-#include <RWStepRepr_RWRealRepresentationItem.hxx>
 #include <RWStepRepr_RWValueRepresentationItem.hxx>
 #include <RWStepRepr_RWValueRepresentationItem.hxx>
 #include <RWStepAP242_RWDraughtingModelItemAssociation.hxx>
@@ -1412,9 +1406,7 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
 #include <StepRepr_CompShAspAndDatumFeatAndShAsp.hxx>
-#include <StepRepr_BooleanRepresentationItem.hxx>
 #include <StepRepr_IntegerRepresentationItem.hxx>
-#include <StepRepr_RealRepresentationItem.hxx>
 #include <StepRepr_ValueRepresentationItem.hxx>
 #include <StepAP242_DraughtingModelItemAssociation.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
@@ -2360,10 +2352,6 @@ static TCollection_AsciiString Reco_ComplexTriangulatedSurfaceSet("COMPLEX_TRIAN
 static TCollection_AsciiString Reco_CubicBezierTessellatedEdge("CUBIC_BEZIER_TESSELLATED_EDGE");
 static TCollection_AsciiString Reco_CubicBezierTriangulatedFace("CUBIC_BEZIER_TRIANGULATED_FACE");
 static TCollection_AsciiString Reco_TriangulatedSurfaceSet("TRIANGULATED_SURFACE_SET");
-static TCollection_AsciiString Reco_GeneralPropertyAssociation("GENERAL_PROPERTY_ASSOCIATION");
-static TCollection_AsciiString Reco_GeneralPropertyRelationship("GENERAL_PROPERTY_RELATIONSHIP");
-static TCollection_AsciiString Reco_BooleanRepresentationItem("BOOLEAN_REPRESENTATION_ITEM");
-static TCollection_AsciiString Reco_RealRepresentationItem("REAL_REPRESENTATION_ITEM");
 
 // -- Definition of the libraries --
 
@@ -3121,10 +3109,6 @@ RWStepAP214_ReadWriteModule::RWStepAP214_ReadWriteModule ()
   typenums.Bind(Reco_CubicBezierTessellatedEdge, 817);
   typenums.Bind(Reco_CubicBezierTriangulatedFace, 818);
   typenums.Bind(Reco_TriangulatedSurfaceSet, 819);
-  typenums.Bind(Reco_GeneralPropertyAssociation, 820);
-  typenums.Bind(Reco_GeneralPropertyRelationship, 821);
-  typenums.Bind(Reco_BooleanRepresentationItem, 822);
-  typenums.Bind(Reco_RealRepresentationItem, 823);
 
   
 //    SHORT NAMES
@@ -5113,10 +5097,6 @@ const TCollection_AsciiString& RWStepAP214_ReadWriteModule::StepType
   case 817: return Reco_CubicBezierTessellatedEdge;
   case 818: return Reco_CubicBezierTriangulatedFace;
   case 819: return Reco_TriangulatedSurfaceSet;
-  case 820: return Reco_GeneralPropertyAssociation;
-  case 821: return Reco_GeneralPropertyRelationship;
-  case 822: return Reco_BooleanRepresentationItem;
-  case 823: return Reco_RealRepresentationItem;
   default : return PasReco;
   }
 }
@@ -10726,34 +10706,6 @@ void RWStepAP214_ReadWriteModule::ReadStep(const Standard_Integer CN,
     aTool.ReadStep(data, num, ach, anEnt);
   }
   break;
-  case 820:
-  {
-    DeclareAndCast(StepBasic_GeneralPropertyAssociation, anEnt, ent);
-    RWStepBasic_RWGeneralPropertyAssociation aTool;
-    aTool.ReadStep(data, num, ach, anEnt);
-  }
-  break;
-  case 821:
-  {
-    DeclareAndCast(StepBasic_GeneralPropertyRelationship, anEnt, ent);
-    RWStepBasic_RWGeneralPropertyRelationship aTool;
-    aTool.ReadStep(data, num, ach, anEnt);
-  }
-  break;
-  case 822:
-  {
-    DeclareAndCast(StepRepr_BooleanRepresentationItem, anent, ent);
-    RWStepRepr_RWBooleanRepresentationItem aTool;
-    aTool.ReadStep(data, num, ach, anent);
-  }
-  break;
-  case 823:
-  {
-    DeclareAndCast(StepRepr_RealRepresentationItem, anent, ent);
-    RWStepRepr_RWRealRepresentationItem aTool;
-    aTool.ReadStep(data, num, ach, anent);
-  }
-  break;
   default: 
     ach->AddFail("Type Mismatch when reading - Entity");
   }
@@ -16305,34 +16257,6 @@ void RWStepAP214_ReadWriteModule::WriteStep(const Standard_Integer CN,
     aTool.WriteStep(SW, anEnt);
   }
   break;
-  case 820:
-  {
-    DeclareAndCast(StepBasic_GeneralPropertyAssociation, anEnt, ent);
-    RWStepBasic_RWGeneralPropertyAssociation aTool;
-    aTool.WriteStep(SW, anEnt);
-  }
-  break;
-  case 821:
-  {
-    DeclareAndCast(StepBasic_GeneralPropertyRelationship, anEnt, ent);
-    RWStepBasic_RWGeneralPropertyRelationship aTool;
-    aTool.WriteStep(SW, anEnt);
-  }
-  break;
-  case 822:
-  {
-    DeclareAndCast(StepRepr_BooleanRepresentationItem, anent, ent);
-    RWStepRepr_RWBooleanRepresentationItem aTool;
-    aTool.WriteStep(SW, anent);
-  }
-  break;
-  case 823:
-  {
-    DeclareAndCast(StepRepr_RealRepresentationItem, anent, ent);
-    RWStepRepr_RWRealRepresentationItem aTool;
-    aTool.WriteStep(SW, anent);
-  }
-  break;
   default:
     return;
   }

src/RWStepBasic/FILES

@@ -108,10 +108,6 @@ RWStepBasic_RWExternalSource.cxx
 RWStepBasic_RWExternalSource.hxx
 RWStepBasic_RWGeneralProperty.cxx
 RWStepBasic_RWGeneralProperty.hxx
-RWStepBasic_RWGeneralPropertyAssociation.cxx
-RWStepBasic_RWGeneralPropertyAssociation.hxx
-RWStepBasic_RWGeneralPropertyRelationship.cxx
-RWStepBasic_RWGeneralPropertyRelationship.hxx
 RWStepBasic_RWGroup.cxx
 RWStepBasic_RWGroup.hxx
 RWStepBasic_RWGroupAssignment.cxx

src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.cxx

@@ -1,87 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWGeneralPropertyAssociation.hxx>
-#include <StepBasic_GeneralProperty.hxx>
-#include <StepBasic_GeneralPropertyAssociation.hxx>
-#include <StepData_StepReaderData.hxx>
-#include <StepData_StepWriter.hxx>
-#include <StepRepr_PropertyDefinition.hxx>
-
-//=======================================================================
-//function : RWStepBasic_RWGeneralPropertyAssociation
-//purpose  : 
-//=======================================================================
-RWStepBasic_RWGeneralPropertyAssociation::RWStepBasic_RWGeneralPropertyAssociation()
-{
-}
-
-//=======================================================================
-//function : ReadStep
-//purpose  : 
-//=======================================================================
-void RWStepBasic_RWGeneralPropertyAssociation::ReadStep(const Handle(StepData_StepReaderData)& theData,
-                                                        const Standard_Integer theNum,
-                                                        Handle(Interface_Check)& theAch,
-                                                        const Handle(StepBasic_GeneralPropertyAssociation)& theEnt) const
-{
-  // Check number of parameters
-  if (!theData->CheckNbParams(theNum, 4, theAch, "general_property_association")) return;
-
-  Handle(TCollection_HAsciiString) aName;
-  theData->ReadString(theNum, 1, "name", theAch, aName);
-
-  Handle(TCollection_HAsciiString) aDescription;
-  theData->ReadString(theNum, 2, "description", theAch, aDescription);
-
-  Handle(StepBasic_GeneralProperty) aGeneralProperty;
-  theData->ReadEntity(theNum, 3, "base_definition", theAch, STANDARD_TYPE(StepBasic_GeneralProperty), aGeneralProperty);
-
-  Handle(StepRepr_PropertyDefinition) aPropertyDefinition;
-  theData->ReadEntity(theNum, 4, "derived_definition", theAch, STANDARD_TYPE(StepRepr_PropertyDefinition), aPropertyDefinition);
-
-  // Initialize entity
-  theEnt->Init(aName,
-               aDescription,
-               aGeneralProperty,
-               aPropertyDefinition);
-}
-
-//=======================================================================
-//function : WriteStep
-//purpose  : 
-//=======================================================================
-void RWStepBasic_RWGeneralPropertyAssociation::WriteStep (StepData_StepWriter& theSW,
-                                                          const Handle(StepBasic_GeneralPropertyAssociation) &theEnt) const
-{
-  theSW.Send(theEnt->Name());
-
-  theSW.Send(theEnt->Description());
-
-  theSW.Send(theEnt->GeneralProperty());
-
-  theSW.Send(theEnt->PropertyDefinition());
-}
-
-//=======================================================================
-//function : Share
-//purpose  : 
-//=======================================================================
-void RWStepBasic_RWGeneralPropertyAssociation::Share(const Handle(StepBasic_GeneralPropertyAssociation)& theEnt,
-                                                     Interface_EntityIterator& theIter) const
-{
-  theIter.AddItem(theEnt->GeneralProperty());
-
-  theIter.AddItem(theEnt->PropertyDefinition());
-}

src/RWStepBasic/RWStepBasic_RWGeneralPropertyAssociation.hxx

@@ -1,60 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _RWStepBasic_RWGeneralPropertyAssociation_HeaderFile
-#define _RWStepBasic_RWGeneralPropertyAssociation_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
-
-#include <Standard_Integer.hxx>
-class StepData_StepReaderData;
-class Interface_Check;
-class StepBasic_GeneralProperty;
-class StepData_StepWriter;
-class Interface_EntityIterator;
-
-class StepBasic_GeneralPropertyAssociation;
-
-//! Read & Write tool for GeneralPropertyAssociation
-class RWStepBasic_RWGeneralPropertyAssociation
-{
-public:
-
-  DEFINE_STANDARD_ALLOC
-
-  //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWGeneralPropertyAssociation();
-  
-  //! Reads GeneralPropertyAssociation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
-                                 const Standard_Integer theNum,
-                                 Handle(Interface_Check)& theAch,
-                                 const Handle(StepBasic_GeneralPropertyAssociation)& theEnt) const;
-  
-  //! Writes GeneralPropertyAssociation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
-                                  const Handle(StepBasic_GeneralPropertyAssociation)& theEnt) const;
-  
-  //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_GeneralPropertyAssociation)& theEnt,
-                              Interface_EntityIterator& theIter) const;
-
-protected:
-
-private:
-
-};
-
-#endif // _RWStepBasic_RWGeneralPropertyAssociation_HeaderFile

src/RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.cxx

@@ -1,103 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <Interface_EntityIterator.hxx>
-#include <RWStepBasic_RWGeneralPropertyRelationship.hxx>
-#include <StepBasic_GeneralProperty.hxx>
-#include <StepBasic_GeneralPropertyRelationship.hxx>
-#include <StepData_StepReaderData.hxx>
-#include <StepData_StepWriter.hxx>
-#include <StepRepr_PropertyDefinition.hxx>
-
-//=======================================================================
-//function : RWStepBasic_RWGeneralPropertyRelationship
-//purpose  : 
-//=======================================================================
-RWStepBasic_RWGeneralPropertyRelationship::RWStepBasic_RWGeneralPropertyRelationship()
-{
-}
-
-//=======================================================================
-//function : ReadStep
-//purpose  : 
-//=======================================================================
-void RWStepBasic_RWGeneralPropertyRelationship::ReadStep(const Handle(StepData_StepReaderData)& theData,
-                                                         const Standard_Integer theNum,
-                                                         Handle(Interface_Check)& theAch,
-                                                         const Handle(StepBasic_GeneralPropertyRelationship)& theEnt) const
-{
-  // Check number of parameters
-  if (!theData->CheckNbParams(theNum, 4, theAch, "general_property_association")) return;
-
-  Handle(TCollection_HAsciiString) aName;
-  theData->ReadString(theNum, 1, "name", theAch, aName);
-
-  Handle(TCollection_HAsciiString) aDescription;
-  Standard_Boolean hasDescription = Standard_True;
-  if (theData->IsParamDefined(theNum, 2))
-  {
-    theData->ReadString(theNum, 2, "description", theAch, aDescription);
-  }
-  else
-  {
-    hasDescription = Standard_False;
-  }
-
-  Handle(StepBasic_GeneralProperty) aRelatingGeneralProperty;
-  theData->ReadEntity(theNum, 3, "relating_property", theAch, STANDARD_TYPE(StepBasic_GeneralProperty), aRelatingGeneralProperty);
-
-  Handle(StepBasic_GeneralProperty) aRelatedGeneralProperty;
-  theData->ReadEntity(theNum, 4, "related_property", theAch, STANDARD_TYPE(StepBasic_GeneralProperty), aRelatedGeneralProperty);
-
-  // Initialize entity
-  theEnt->Init(aName,
-               hasDescription,
-               aDescription,
-               aRelatingGeneralProperty,
-               aRelatedGeneralProperty);
-}
-
-//=======================================================================
-//function : WriteStep
-//purpose  : 
-//=======================================================================
-void RWStepBasic_RWGeneralPropertyRelationship::WriteStep(StepData_StepWriter& theSW,
-                                                          const Handle(StepBasic_GeneralPropertyRelationship)& theEnt) const
-{
-  theSW.Send(theEnt->Name());
-
-  if (theEnt->HasDescription())
-  {
-    theSW.Send(theEnt->Description());
-  }
-  else
-  {
-    theSW.SendUndef();
-  }
-
-  theSW.Send(theEnt->RelatingGeneralProperty());
-
-  theSW.Send(theEnt->RelatedGeneralProperty());
-}
-
-//=======================================================================
-//function : Share
-//purpose  : 
-//=======================================================================
-void RWStepBasic_RWGeneralPropertyRelationship::Share(const Handle(StepBasic_GeneralPropertyRelationship)& theEnt,
-                                                      Interface_EntityIterator& theIter) const
-{
-  theIter.AddItem(theEnt->RelatingGeneralProperty());
-
-  theIter.AddItem(theEnt->RelatedGeneralProperty());
-}

src/RWStepBasic/RWStepBasic_RWGeneralPropertyRelationship.hxx

@@ -1,60 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _RWStepBasic_RWGeneralPropertyRelationship_HeaderFile
-#define _RWStepBasic_RWGeneralPropertyAssociation_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
-
-#include <Standard_Integer.hxx>
-class StepData_StepReaderData;
-class Interface_Check;
-class StepBasic_GeneralProperty;
-class StepData_StepWriter;
-class Interface_EntityIterator;
-
-class StepBasic_GeneralPropertyRelationship;
-
-//! Read & Write tool for GeneralPropertyRelationship
-class RWStepBasic_RWGeneralPropertyRelationship
-{
-public:
-
-  DEFINE_STANDARD_ALLOC
-
-  //! Empty constructor
-  Standard_EXPORT RWStepBasic_RWGeneralPropertyRelationship();
-
-  //! Reads GeneralPropertyAssociation
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
-                                 const Standard_Integer theNum,
-                                 Handle(Interface_Check)& theAch,
-                                 const Handle(StepBasic_GeneralPropertyRelationship)& theEnt) const;
-
-  //! Writes GeneralPropertyAssociation
-  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
-                                  const Handle(StepBasic_GeneralPropertyRelationship)& theEnt) const;
-
-  //! Fills data for graph (shared items)
-  Standard_EXPORT void Share (const Handle(StepBasic_GeneralPropertyRelationship)& theEnt,
-                              Interface_EntityIterator& theIter) const;
-
-protected:
-
-private:
-
-};
-
-#endif // _RWStepBasic_RWGeneralPropertyRelationship_HeaderFile

src/RWStepBasic/RWStepBasic_RWProduct.cxx

@@ -91,14 +91,7 @@ void RWStepBasic_RWProduct::WriteStep
 
 	// --- own field : description ---
 
-	if (!ent->Description().IsNull())
-	{
-		SW.Send(ent->Description());
-	}
-	else
-	{
-		SW.SendUndef();
-	}
+	SW.Send(ent->Description());
 
 	// --- own field : frameOfReference ---
 

src/RWStepBasic/RWStepBasic_RWProductDefinition.cxx

@@ -78,14 +78,7 @@ void RWStepBasic_RWProductDefinition::WriteStep
 
 	// --- own field : description ---
 
-	if (!ent->Description().IsNull())
-	{
-		SW.Send(ent->Description());
-	}
-	else
-	{
-		SW.SendUndef();
-	}
+	SW.Send(ent->Description());
 
 	// --- own field : formation ---
 

src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.cxx

@@ -71,14 +71,7 @@ void RWStepBasic_RWProductDefinitionFormation::WriteStep
 
 	// --- own field : description ---
 
-	if (!ent->Description().IsNull())
-	{
-		SW.Send(ent->Description());
-	}
-	else
-	{
-		SW.SendUndef();
-	}
+	SW.Send(ent->Description());
 
 	// --- own field : ofProduct ---
 

src/RWStepRepr/FILES

@@ -8,8 +8,6 @@ RWStepRepr_RWAssemblyComponentUsageSubstitute.cxx
 RWStepRepr_RWAssemblyComponentUsageSubstitute.hxx
 RWStepRepr_RWBetweenShapeAspect.cxx
 RWStepRepr_RWBetweenShapeAspect.hxx
-RWStepRepr_RWBooleanRepresentationItem.cxx
-RWStepRepr_RWBooleanRepresentationItem.hxx
 RWStepRepr_RWCentreOfSymmetry.cxx
 RWStepRepr_RWCentreOfSymmetry.hxx
 RWStepRepr_RWCharacterizedRepresentation.cxx
@@ -90,8 +88,6 @@ RWStepRepr_RWPropertyDefinitionRepresentation.cxx
 RWStepRepr_RWPropertyDefinitionRepresentation.hxx
 RWStepRepr_RWQuantifiedAssemblyComponentUsage.cxx
 RWStepRepr_RWQuantifiedAssemblyComponentUsage.hxx
-RWStepRepr_RWRealRepresentationItem.cxx
-RWStepRepr_RWRealRepresentationItem.hxx
 RWStepRepr_RWRepresentation.cxx
 RWStepRepr_RWRepresentation.hxx
 RWStepRepr_RWRepresentationContext.cxx

src/RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.cxx

@@ -1,50 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-
-#include <RWStepRepr_RWBooleanRepresentationItem.hxx>
-#include <StepData_StepReaderData.hxx>
-#include <StepData_StepWriter.hxx>
-#include <StepRepr_BooleanRepresentationItem.hxx>
-#include <TCollection_HAsciiString.hxx>
-
-RWStepRepr_RWBooleanRepresentationItem::RWStepRepr_RWBooleanRepresentationItem()
-{
-}
-
-void RWStepRepr_RWBooleanRepresentationItem::ReadStep(const Handle(StepData_StepReaderData)& theData,
-                                                      const Standard_Integer theNum,
-                                                      Handle(Interface_Check)& theAch,
-                                                      const Handle(StepRepr_BooleanRepresentationItem)& theEnt) const
-{
-  // Check number of parameters
-  if (!theData->CheckNbParams(theNum, 2, theAch, "boolean_representation_item") ) return;
-
-  // --- inherited field : name ---
-  Handle(TCollection_HAsciiString) aName;
-  theData->ReadString (theNum, 1, "name", theAch, aName);
-
-  // --- own field : value ---
-  Standard_Boolean aValue;
-  theData->ReadBoolean (theNum, 2, "value", theAch, aValue);
-
-  //--- Initialisation of the read entity ---
-  theEnt->Init(aName, aValue);
-}
-
-void RWStepRepr_RWBooleanRepresentationItem::WriteStep(StepData_StepWriter& theSW,
-                                                       const Handle(StepRepr_BooleanRepresentationItem)& theEnt) const
-{
-  theSW.Send(theEnt->Name());
-  theSW.Send(theEnt->Value());
-}

src/RWStepRepr/RWStepRepr_RWBooleanRepresentationItem.hxx

@@ -1,45 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _RWStepRepr_RWBooleanRepresentationItem_HeaderFile
-#define _RWStepRepr_RWBooleanRepresentationItem_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
-
-#include <Standard_Boolean.hxx>
-class StepData_StepReaderData;
-class Interface_Check;
-class StepRepr_BooleanRepresentationItem;
-class StepData_StepWriter;
-
-
-//! Read & Write Module for BooleanRepresentationItem
-class RWStepRepr_RWBooleanRepresentationItem 
-{
-public:
-
-  DEFINE_STANDARD_ALLOC
-
-  Standard_EXPORT RWStepRepr_RWBooleanRepresentationItem();
-  
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
-                                 const Standard_Integer theNum,
-                                 Handle(Interface_Check)& theAch,
-                                 const Handle(StepRepr_BooleanRepresentationItem)& theEnt) const;
-  
-  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
-                                  const Handle(StepRepr_BooleanRepresentationItem)& theEnt) const;
-};
-#endif // _RWStepRepr_RWBooleanRepresentationItem_HeaderFile

src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.cxx

@@ -1,50 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-
-#include <RWStepRepr_RWRealRepresentationItem.hxx>
-#include <StepData_StepReaderData.hxx>
-#include <StepData_StepWriter.hxx>
-#include <StepRepr_RealRepresentationItem.hxx>
-#include <TCollection_HAsciiString.hxx>
-
-RWStepRepr_RWRealRepresentationItem::RWStepRepr_RWRealRepresentationItem()
-{
-}
-
-void RWStepRepr_RWRealRepresentationItem::ReadStep(const Handle(StepData_StepReaderData)& theData,
-                                                   const Standard_Integer theNum,
-                                                   Handle(Interface_Check)& theAch,
-                                                   const Handle(StepRepr_RealRepresentationItem)& theEnt) const
-{
-  // Check number of parameters
-  if (!theData->CheckNbParams (theNum, 2, theAch, "real_representation_item")) return;
-
-  // --- inherited field : name ---
-  Handle(TCollection_HAsciiString) aName;
-  theData->ReadString (theNum, 1, "name", theAch, aName);
-
-  // --- own field : value ---
-  Standard_Real aValue;
-  theData->ReadReal (theNum, 2, "value", theAch, aValue);
-
-  //--- Initialisation of the read entity ---
-  theEnt->Init(aName, aValue);
-}
-
-void RWStepRepr_RWRealRepresentationItem::WriteStep(StepData_StepWriter& theSW,
-                                                    const Handle(StepRepr_RealRepresentationItem)& theEnt) const
-{
-  theSW.Send(theEnt->Name());
-  theSW.Send(theEnt->Value());
-}

src/RWStepRepr/RWStepRepr_RWRealRepresentationItem.hxx

@@ -1,46 +0,0 @@
-// Copyright (c) 2024 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _RWStepRepr_RWRealRepresentationItem_HeaderFile
-#define _RWStepRepr_RWRealRepresentationItem_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
-
-#include <Standard_Real.hxx>
-class StepData_StepReaderData;
-class Interface_Check;
-class StepRepr_RealRepresentationItem;
-class StepData_StepWriter;
-
-
-//! Read & Write Module for RealRepresentationItem
-class RWStepRepr_RWRealRepresentationItem 
-{
-public:
-
-  DEFINE_STANDARD_ALLOC
-
-  
-  Standard_EXPORT RWStepRepr_RWRealRepresentationItem();
-  
-  Standard_EXPORT void ReadStep (const Handle(StepData_StepReaderData)& theData,
-                                 const Standard_Integer theNum,
-                                 Handle(Interface_Check)& theAch,
-                                 const Handle(StepRepr_RealRepresentationItem)& theEnt) const;
-  
-  Standard_EXPORT void WriteStep (StepData_StepWriter& theSW,
-                                  const Handle(StepRepr_RealRepresentationItem)& theEnt) const;
-};
-#endif // _RWStepRepr_RWRealRepresentationItem_HeaderFile

src/STEPCAFControl/STEPCAFControl_ConfigurationNode.cxx

@@ -116,8 +116,6 @@ bool STEPCAFControl_ConfigurationNode::Load(const Handle(DE_ConfigurationContext
     theResource->BooleanVal("read.layer", InternalParameters.ReadLayer, aScope);
   InternalParameters.ReadProps =
     theResource->BooleanVal("read.props", InternalParameters.ReadProps, aScope);
-  InternalParameters.ReadMetadata =
-    theResource->BooleanVal("read.metadata", InternalParameters.ReadMetadata, aScope);
 
   InternalParameters.WritePrecisionMode = (StepData_ConfParameters::WriteMode_PrecisionMode)
     theResource->IntegerVal("write.precision.mode", InternalParameters.WritePrecisionMode, aScope);
@@ -372,12 +370,6 @@ TCollection_AsciiString STEPCAFControl_ConfigurationNode::Save() const
   aResult += aScope + "read.props :\t " + InternalParameters.ReadProps + "\n";
   aResult += "!\n";
 
-  aResult += "!\n";
-  aResult += "!Setting up the read.metadata parameter which is used to indicate read Metadata or not\n";
-  aResult += "!Default value: 0(\"OFF\"). Available values: 0(\"OFF\"), 1(\"ON\")\n";
-  aResult += aScope + "read.metadata :\t " + InternalParameters.ReadMetadata + "\n";
-  aResult += "!\n";
-
   aResult += "!\n";
   aResult += "!Write Parameters:\n";
   aResult += "!\n";

src/STEPCAFControl/STEPCAFControl_Provider.cxx

@@ -73,8 +73,6 @@ bool STEPCAFControl_Provider::Read(const TCollection_AsciiString& thePath,
   aReader.SetNameMode(aNode->InternalParameters.ReadName);
   aReader.SetLayerMode(aNode->InternalParameters.ReadLayer);
   aReader.SetPropsMode(aNode->InternalParameters.ReadProps);
-  aReader.SetMetaMode(aNode->InternalParameters.ReadMetadata);
-
   IFSelect_ReturnStatus aReadStat = IFSelect_RetVoid;
   StepData_ConfParameters aParams;
   aReadStat = aReader.ReadFile(thePath.ToCString(), aParams);

src/STEPCAFControl/STEPCAFControl_Reader.cxx

@@ -30,12 +30,9 @@
 #include <StepBasic_ConversionBasedUnitAndLengthUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndMassUnit.hxx>
-#include <StepBasic_ConversionBasedUnitAndTimeUnit.hxx>
 #include <StepBasic_DerivedUnit.hxx>
 #include <StepBasic_DerivedUnitElement.hxx>
 #include <StepBasic_DocumentFile.hxx>
-#include <StepBasic_GeneralProperty.hxx>
-#include <StepBasic_GeneralPropertyAssociation.hxx>
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_NamedUnit.hxx>
 #include <StepBasic_Product.hxx>
@@ -43,9 +40,6 @@
 #include <StepBasic_ProductDefinitionFormation.hxx>
 #include <StepBasic_ProductDefinitionWithAssociatedDocuments.hxx>
 #include <StepBasic_SiUnitAndLengthUnit.hxx>
-#include <StepBasic_SiUnitAndMassUnit.hxx>
-#include <StepBasic_SiUnitAndThermodynamicTemperatureUnit.hxx>
-#include <StepBasic_SiUnitAndTimeUnit.hxx>
 #include <STEPCAFControl_Controller.hxx>
 #include <STEPCAFControl_DataMapOfPDExternFile.hxx>
 #include <STEPCAFControl_DataMapOfShapePD.hxx>
@@ -135,7 +129,6 @@
 #include <StepShape_DimensionalLocation.hxx>
 #include <StepShape_EdgeCurve.hxx>
 #include <StepShape_EdgeLoop.hxx>
-#include <StepShape_GeometricCurveSet.hxx>
 #include <StepShape_GeometricSet.hxx>
 #include <StepShape_HArray1OfFace.hxx>
 #include <StepShape_HArray1OfFaceBound.hxx>
@@ -221,7 +214,6 @@
 #include <XSControl_WorkSession.hxx>
 #include <StepAP242_DraughtingModelItemAssociation.hxx>
 #include <StepAP242_GeometricItemSpecificUsage.hxx>
-#include <StepAP242_IdAttribute.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <STEPCAFControl_GDTProperty.hxx>
 #include <StepVisual_TessellatedAnnotationOccurrence.hxx>
@@ -233,15 +225,7 @@
 #include <StepVisual_OverRidingStyledItem.hxx>
 #include <StepVisual_ContextDependentOverRidingStyledItem.hxx>
 #include <StepRepr_ShapeRepresentationRelationshipWithTransformation.hxx>
-#include <StepRepr_BooleanRepresentationItem.hxx>
-#include <StepRepr_IntegerRepresentationItem.hxx>
 #include <StepRepr_ItemDefinedTransformation.hxx>
-#include <StepRepr_PropertyDefinitionRelationship.hxx>
-#include <StepRepr_RealRepresentationItem.hxx>
-#include <StepRepr_ValueRepresentationItem.hxx>
-
-#include <StepRepr_ShapeAspectRelationship.hxx>
-
 
 #include <TColgp_HArray1OfXYZ.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
@@ -291,7 +275,6 @@ STEPCAFControl_Reader::STEPCAFControl_Reader()
   myNameMode(Standard_True),
   myLayerMode(Standard_True),
   myPropsMode(Standard_True),
-  myMetaMode(Standard_False),
   mySHUOMode(Standard_False),
   myGDTMode(Standard_True),
   myMatMode(Standard_True),
@@ -316,7 +299,6 @@ STEPCAFControl_Reader::STEPCAFControl_Reader(const Handle(XSControl_WorkSession)
   myNameMode(Standard_True),
   myLayerMode(Standard_True),
   myPropsMode(Standard_True),
-  myMetaMode(Standard_False),
   mySHUOMode(Standard_False),
   myGDTMode(Standard_True),
   myMatMode(Standard_True),
@@ -788,10 +770,6 @@ Standard_Boolean STEPCAFControl_Reader::Transfer (STEPControl_Reader &reader,
   if (GetViewMode())
     ReadViews(reader.WS(), doc, aLocalFactors);
 
-  // read metadata
-  if (GetMetaMode())
-    ReadMetadata(reader.WS(), doc, aLocalFactors);
-
   // Expand resulting CAF structure for sub-shapes (optionally with their
   // names) if requested
   ExpandSubShapes(STool, ShapePDMap);
@@ -1979,7 +1957,7 @@ Standard_Boolean STEPCAFControl_Reader::ReadSHUOs(const Handle(XSControl_WorkSes
 //function : GetMassConversionFactor
 //purpose  : 
 //=======================================================================
-static Standard_Boolean GetMassConversionFactor(const Handle(StepBasic_NamedUnit)& NU,
+static Standard_Boolean GetMassConversionFactor(Handle(StepBasic_NamedUnit)& NU,
   Standard_Real& afact)
 {
   afact = 1.;
@@ -2575,36 +2553,11 @@ static Standard_Boolean ReadDatums(const Handle(XCAFDoc_ShapeTool) &STool,
   const Handle(StepDimTol_GeometricToleranceWithDatumReference)& GTWDR)
 {
   if (GTWDR.IsNull()) return Standard_False;
-  Handle(StepDimTol_HArray1OfDatumSystemOrReference) aHADSOR = GTWDR->DatumSystemAP242();
-  if (aHADSOR.IsNull())
-  {
-    return Standard_False;
-  }
-  NCollection_List<Handle(StepDimTol_Datum)> aDatumList;
-  for (Standard_Integer idr = 1; idr <= aHADSOR->Length(); idr++)
-  {
-    const StepDimTol_DatumSystemOrReference aDSOR = aHADSOR->Value(idr);
-    if (aDSOR.IsNull()) continue;
-    Handle(StepDimTol_DatumSystem) aDS = aDSOR.DatumSystem();
-    Handle(StepDimTol_DatumReference) aDR = aDSOR.DatumReference();
-    Handle(StepDimTol_Datum) aDatum;
-    if (!aDS.IsNull())
-    {
-      auto aDatumConList = aDS->Constituents();
-      for (Standard_Integer anInd = 1; anInd <= aDatumConList->Length(); anInd++)
-      {
-        Handle(StepDimTol_DatumReferenceCompartment) aDatRefC = aDatumConList->Value(anInd);
-        aDatumList.Append(aDatRefC->Base().Datum());
-      }
-    }
-    else if (!aDR.IsNull())
-    {
-      aDatumList.Append(aDR->ReferencedDatum());
-    }
-  }
-  for(NCollection_List<Handle(StepDimTol_Datum)>::Iterator anIt(aDatumList); anIt.More(); anIt.Next())
-  {
-    Handle(StepDimTol_Datum) aDatum = anIt.Value();
+  Handle(StepDimTol_HArray1OfDatumReference) HADR = GTWDR->DatumSystem();
+  if (HADR.IsNull()) return Standard_False;
+  for (Standard_Integer idr = 1; idr <= HADR->Length(); idr++) {
+    Handle(StepDimTol_DatumReference) DR = HADR->Value(idr);
+    Handle(StepDimTol_Datum) aDatum = DR->ReferencedDatum();
     if (aDatum.IsNull()) continue;
     Interface_EntityIterator subs4 = graph.Sharings(aDatum);
     for (subs4.Start(); subs4.More(); subs4.Next()) {
@@ -5265,26 +5218,6 @@ Standard_Boolean STEPCAFControl_Reader::GetPropsMode() const
   return myPropsMode;
 }
 
-//=======================================================================
-//function : SetMetaMode
-//purpose  : 
-//=======================================================================
-
-void STEPCAFControl_Reader::SetMetaMode(const Standard_Boolean theMetaMode)
-{
-  myMetaMode = theMetaMode;
-}
-
-//=======================================================================
-//function : GetMetaMode
-//purpose  : 
-//=======================================================================
-
-Standard_Boolean STEPCAFControl_Reader::GetMetaMode() const
-{
-  return myMetaMode;
-}
-
 //=======================================================================
 //function : SetSHUOMode
 //purpose  : 
@@ -5365,427 +5298,3 @@ Standard_Boolean STEPCAFControl_Reader::GetViewMode() const
 {
   return myViewMode;
 }
-
-//=======================================================================
-//function : ReadMetadata
-//purpose  : 
-//=======================================================================
-Standard_Boolean STEPCAFControl_Reader::ReadMetadata(const Handle(XSControl_WorkSession)& theWS,
-                                                     const Handle(TDocStd_Document)& theDoc,
-                                                     const StepData_Factors& theLocalFactors) const
-{
-  const Handle(Interface_InterfaceModel)& aModel = theWS->Model();
-  const Handle(XSControl_TransferReader)& aTR = theWS->TransferReader();
-  const Handle(Transfer_TransientProcess)& aTP = aTR->TransientProcess();
-  Handle(XCAFDoc_ShapeTool) aSTool = XCAFDoc_DocumentTool::ShapeTool(theDoc->Main());
-  if (aSTool.IsNull())
-  {
-    return Standard_False;
-  }
-
-  Standard_Integer aNb = aModel->NbEntities();
-  STEPConstruct_Tool aTool(theWS);
-
-  for (Standard_Integer anEntityInd = 1; anEntityInd <= aNb; ++anEntityInd)
-  {
-    Handle(Standard_Transient) anEntity = aModel->Value(anEntityInd);
-    Handle(StepBasic_GeneralProperty) aGeneralProp = Handle(StepBasic_GeneralProperty)::DownCast(anEntity);
-    if (aGeneralProp.IsNull())
-      continue;
-
-    Handle(StepBasic_GeneralPropertyAssociation) aPropAssociation;
-    NCollection_List< Handle(StepRepr_PropertyDefinition)> aPropDefinitionList;
-    Interface_EntityIterator aSharingListOfGP = theWS->Graph().Sharings(aGeneralProp);
-    for (aSharingListOfGP.Start(); aSharingListOfGP.More(); aSharingListOfGP.Next())
-    {
-      aPropAssociation = Handle(StepBasic_GeneralPropertyAssociation)::DownCast(aSharingListOfGP.Value());
-      if (aPropAssociation.IsNull())
-        continue;
-
-      aPropDefinitionList.Append(aPropAssociation->PropertyDefinition());
-    }
-
-    if (aPropDefinitionList.IsEmpty())
-      continue;
-
-    NCollection_List< Handle(StepRepr_PropertyDefinition)>::Iterator aPropDefIter(aPropDefinitionList);
-    for ( ; aPropDefIter.More(); aPropDefIter.Next())
-    {
-      Handle(StepRepr_PropertyDefinition) aPropDefinition = aPropDefIter.Value();
-
-      // check group of PropertyDefinition
-      NCollection_List<Handle(StepRepr_PropertyDefinition)> aGroupedProperties;
-      Interface_EntityIterator aSharingsListOfPD = theWS->Graph().Sharings(aPropDefinition);
-      for (aSharingsListOfPD.Start(); aSharingsListOfPD.More(); aSharingsListOfPD.Next())
-      {
-        Handle(StepRepr_PropertyDefinitionRelationship) aRel =
-          Handle(StepRepr_PropertyDefinitionRelationship)::DownCast(aSharingsListOfPD.Value());
-        if (aRel.IsNull())
-        {
-          continue;
-        }
-
-        Handle(StepRepr_PropertyDefinition) aGroupedProp = aRel->RelatedPropertyDefinition();
-        if (!aGroupedProp.IsNull())
-        {
-          aGroupedProperties.Append(aGroupedProp);
-        }
-      }
-
-      NCollection_List<Handle(Transfer_Binder)> aBinders;
-      Interface_EntityIterator aSharedListOfPD = theWS->Graph().Shareds(aPropDefinition);
-      for (aSharedListOfPD.Start(); aSharedListOfPD.More(); aSharedListOfPD.Next())
-      {
-        Handle(Transfer_Binder) aBinder;
-        Handle(StepBasic_ProductDefinition) aProductDefinition =
-          Handle(StepBasic_ProductDefinition)::DownCast(aSharedListOfPD.Value());
-        if (!aProductDefinition.IsNull())
-        {
-          aBinder = aTP->Find(aProductDefinition);
-          if (!aBinder.IsNull())
-          {
-            aBinders.Append(aBinder);
-          }
-          continue;
-        }
-
-        Handle(StepRepr_ProductDefinitionShape) aProductDefinitionShape =
-          Handle(StepRepr_ProductDefinitionShape)::DownCast(aSharedListOfPD.Value());
-        if (!aProductDefinitionShape.IsNull())
-        {
-          Handle(StepBasic_ProductDefinition) aProductDef =
-            aProductDefinitionShape->Definition().ProductDefinition();
-          aBinder = aTP->Find(aProductDef);
-          if (!aBinder.IsNull())
-          {
-            aBinders.Append(aBinder);
-          }
-          continue;
-        }
-
-        Handle(StepRepr_NextAssemblyUsageOccurrence) aNextAssembUsOcc =
-          Handle(StepRepr_NextAssemblyUsageOccurrence)::DownCast(aSharedListOfPD.Value());
-        if (!aNextAssembUsOcc.IsNull())
-        {
-          aBinder = aTP->Find(aNextAssembUsOcc);
-          if (!aBinder.IsNull())
-          {
-            aBinders.Append(aBinder);
-          }
-          continue;
-        }
-
-        Handle(StepRepr_ShapeAspect) aShapeAspect =
-          Handle(StepRepr_ShapeAspect)::DownCast(aSharedListOfPD.Value());
-        if (!aShapeAspect.IsNull())
-        {
-          TDF_Label aLabel;
-          if (!aBinder.IsNull())
-          {
-            TopoDS_Shape aShape = TransferBRep::ShapeResult(aTP, aBinder);
-            if (aShape.IsNull())
-              continue;
-
-            if (myMap.IsBound(aShape))
-            {
-              aLabel = myMap.Find(aShape);
-            }
-          }
-          Interface_EntityIterator aSharedListOfSA = theWS->Graph().Sharings(aShapeAspect);
-          for (aSharedListOfSA.Start(); aSharedListOfSA.More(); aSharedListOfSA.Next())
-          {
-            Handle(StepAP242_DraughtingModelItemAssociation) aDMIA =
-              Handle(StepAP242_DraughtingModelItemAssociation)::DownCast(aSharedListOfSA.Value());
-            if (!aDMIA.IsNull())
-              break;
-
-            Handle(StepAP242_ItemIdentifiedRepresentationUsage) anItemIdentUsage =
-              Handle(StepAP242_ItemIdentifiedRepresentationUsage)::DownCast(aSharedListOfSA.Value());
-            if (!anItemIdentUsage.IsNull())
-            {
-              for (Standard_Integer anIndex = 1; anIndex <= anItemIdentUsage->NbIdentifiedItem(); ++anIndex)
-              {
-                Handle(StepRepr_RepresentationItem) aReprItem = anItemIdentUsage->IdentifiedItemValue(anIndex);
-                if (aReprItem.IsNull())
-                  continue;
-                aBinder = aTP->Find(aReprItem);
-                if (!aBinder.IsNull())
-                {
-                  aBinders.Append(aBinder);
-                }
-              }
-              continue;
-            }
-
-            Handle(StepRepr_PropertyDefinition) aPropDef =
-              Handle(StepRepr_PropertyDefinition)::DownCast(aSharedListOfSA.Value());
-            if (!aPropDef.IsNull() && aPropDef != aPropDefinition)
-            {
-              Interface_EntityIterator aSharingListOfPD = theWS->Graph().Sharings(aPropDef);
-              for (aSharingListOfPD.Start(); aSharingListOfPD.More(); aSharingListOfPD.Next())
-              {
-                Handle(StepShape_ShapeDefinitionRepresentation) aShDef =
-                  Handle(StepShape_ShapeDefinitionRepresentation)::DownCast(aSharingListOfPD.Value());
-                if (aShDef.IsNull())
-                  continue;
-
-                findReprItems(theWS, aShDef, aBinders);
-              }
-              continue;
-            }
-
-            Handle(StepShape_ShapeDefinitionRepresentation) aShapeDefRepr =
-              Handle(StepShape_ShapeDefinitionRepresentation)::DownCast(aSharedListOfSA.Value());
-            if (!aShapeDefRepr.IsNull())
-            {
-              findReprItems(theWS, aShapeDefRepr, aBinders);
-            }
-          }
-        }
-      }
-
-      if (aBinders.IsEmpty())
-        continue;
-
-      TDF_LabelSequence aLabelSeq;
-      NCollection_List<Handle(Transfer_Binder)>::Iterator aBindIt(aBinders);
-      for (; aBindIt.More(); aBindIt.Next())
-      {
-        TopoDS_Shape aShape = TransferBRep::ShapeResult(aTP, aBindIt.Value());
-        if (aShape.IsNull())
-          continue;
-
-        TDF_Label aShapeLabel;
-        if (myMap.IsBound(aShape))
-        {
-          aShapeLabel = myMap.Find(aShape);
-        }
-        if (!aShapeLabel.IsNull())
-        {
-          aLabelSeq.Append(aShapeLabel);
-        }
-      }
-
-      //create metadata
-      for (TDF_LabelSequence::Iterator aLabelIt(aLabelSeq); aLabelIt.More(); aLabelIt.Next())
-      {
-        TDF_Label aLabel = aLabelIt.Value();
-        Handle(TDataStd_NamedData) anAttr;
-        if (!aLabel.FindAttribute(TDataStd_NamedData::GetID(), anAttr))
-        {
-          anAttr = new TDataStd_NamedData;
-          aLabel.AddAttribute(anAttr);
-        }
-
-        fillAttributes(theWS, aPropDefinition, theLocalFactors, anAttr);
-        if (!aGroupedProperties.IsEmpty())
-        {
-          NCollection_List<Handle(StepRepr_PropertyDefinition)>::Iterator aPropIt(aGroupedProperties);
-          for ( ; aPropIt.More(); aPropIt.Next())
-          {
-            fillAttributes(theWS, aPropIt.Value(), theLocalFactors, anAttr);
-          }
-        }
-      }
-    }
-  }
-
-  return Standard_True;
-}
-
-//=======================================================================
-//function : findReprItems
-//purpose  : 
-//=======================================================================
-Standard_Boolean STEPCAFControl_Reader::findReprItems(const Handle(XSControl_WorkSession)& theWS,
-                                                      const Handle(StepShape_ShapeDefinitionRepresentation)& theShDefRepr,
-                                                      NCollection_List<Handle(Transfer_Binder)>& theBinders) const
-{
-  Handle(StepRepr_Representation) aRepr = theShDefRepr->UsedRepresentation();
-  if (aRepr.IsNull())
-  {
-    return Standard_False;
-  }
-
-  Handle(Transfer_Binder) aBinder;
-  const Handle(Transfer_TransientProcess)& aTP = theWS->TransferReader()->TransientProcess();
-  Handle(StepRepr_HArray1OfRepresentationItem) aReprItems = aRepr->Items();
-  if (!aReprItems->IsEmpty())
-  {
-    for (Standard_Integer anInd = aReprItems->Lower(); anInd <= aReprItems->Upper(); anInd++)
-    {
-      Handle(StepRepr_RepresentationItem) aReprItem = aReprItems->Value(anInd);
-      aBinder = aTP->Find(aReprItem);
-      if (!aBinder.IsNull())
-      {
-        theBinders.Append(aBinder);
-      }
-    }
-  }
-
-  return Standard_True;
-}
-
-//=======================================================================
-//function : fillAttributes
-//purpose  : 
-//=======================================================================
-Standard_Boolean STEPCAFControl_Reader::fillAttributes(const Handle(XSControl_WorkSession)& theWS,
-                                                       const Handle(StepRepr_PropertyDefinition)& thePropDef,
-                                                       const StepData_Factors& theLocalFactors,
-                                                       Handle(TDataStd_NamedData)& theAttr) const
-{
-  // skip if key is null
-  if (thePropDef->Name().IsNull())
-  {
-    return Standard_False;
-  }
-
-  Handle(StepRepr_PropertyDefinitionRepresentation) aPropDefRepr;
-  Interface_EntityIterator aSharingListOfPD = theWS->Graph().Sharings(thePropDef);
-  for (aSharingListOfPD.Start(); aSharingListOfPD.More(); aSharingListOfPD.Next())
-  {
-    aPropDefRepr = Handle(StepRepr_PropertyDefinitionRepresentation)::DownCast(aSharingListOfPD.Value());
-    if (aPropDefRepr.IsNull())
-      continue;
-
-    Handle(StepRepr_Representation) aUsedRepr = aPropDefRepr->UsedRepresentation();
-    if (aUsedRepr.IsNull())
-      continue;
-
-    Handle(StepRepr_HArray1OfRepresentationItem) aReprItems = aUsedRepr->Items();
-    if (!aReprItems.IsNull())
-    {
-      for (Standard_Integer anIndex = aReprItems->Lower(); anIndex <= aReprItems->Upper(); anIndex++)
-      {
-        Handle(StepRepr_RepresentationItem) anItem = aReprItems->Value(anIndex);
-        if (anItem.IsNull())
-          continue;
-
-        if (anItem->IsKind(STANDARD_TYPE(StepRepr_DescriptiveRepresentationItem)))
-        {
-          Handle(StepRepr_DescriptiveRepresentationItem) aDescrItem = Handle(StepRepr_DescriptiveRepresentationItem)::DownCast(anItem);
-          Handle(TCollection_HAsciiString) aDescription = aDescrItem->Description();
-          theAttr->SetString(thePropDef->Name()->ToCString(), aDescription->ToCString());
-        }
-        else if (anItem->IsKind(STANDARD_TYPE(StepRepr_MeasureRepresentationItem)))
-        {
-          Handle(StepRepr_MeasureRepresentationItem) aMeasureItem = Handle(StepRepr_MeasureRepresentationItem)::DownCast(anItem);
-          Standard_Real aValue = aMeasureItem->Measure()->ValueComponent();
-          TCollection_AsciiString aValType = aMeasureItem->Measure()->ValueComponentMember()->Name();
-          StepBasic_Unit anUnit = aMeasureItem->Measure()->UnitComponent();
-          if (!anUnit.IsNull())
-          {
-            Standard_Real aParam = 1.;
-            if (anUnit.Type() == STANDARD_TYPE(StepBasic_DerivedUnit))
-            {
-              Handle(StepBasic_DerivedUnit) aDUnit = anUnit.DerivedUnit();
-              for (Standard_Integer anInd = 1; anInd <= aDUnit->NbElements(); ++anInd)
-              {
-                Handle(StepBasic_DerivedUnitElement) aDUElem = aDUnit->ElementsValue(anInd);
-                Standard_Real anExp = aDUElem->Exponent();
-                Handle(StepBasic_NamedUnit) aNUnit = aDUElem->Unit();
-                if (!aNUnit.IsNull())
-                {
-                  if (aNUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndLengthUnit)) ||
-                    aNUnit->IsKind(STANDARD_TYPE(StepBasic_SiUnitAndLengthUnit)))
-                  {
-                    STEPConstruct_UnitContext anUnitCtx;
-                    anUnitCtx.ComputeFactors(aNUnit, theLocalFactors);
-                    if (aValType == "VOLUME_MEASURE")
-                    {
-                      aParam = pow(theLocalFactors.LengthFactor(), anExp);
-                    }
-                    else
-                    {
-                      aParam = aParam / pow(theLocalFactors.LengthFactor(), anExp);
-                    }
-                  }
-                  else if (aNUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndMassUnit))) {
-                    Standard_Real aFact = 1.;
-                    if (GetMassConversionFactor(aNUnit, aFact))
-                    {
-                      aParam = aParam * aFact;
-                    }
-                  }
-                  else
-                  {
-                    STEPConstruct_UnitContext anUnitCtx;
-                    anUnitCtx.ComputeFactors(aNUnit, theLocalFactors);
-                    if (anUnitCtx.AreaDone())
-                      aParam = anUnitCtx.AreaFactor();
-                    if (anUnitCtx.LengthDone())
-                    {
-                      Standard_Real aLengthFactor = anUnitCtx.LengthFactor();
-                      aParam *= pow(aLengthFactor, anExp);
-                    }
-                  }
-                }
-              }
-              aValue = aValue * aParam;
-            }
-            else
-            {
-              Handle(StepBasic_NamedUnit) aNUnit = anUnit.NamedUnit();
-              if (!aNUnit.IsNull())
-              {
-                if (aNUnit->IsKind(STANDARD_TYPE(StepBasic_ConversionBasedUnitAndMassUnit)))
-                {
-                  Standard_Real aFact = 1.;
-                  if (GetMassConversionFactor(aNUnit, aFact))
-                  {
-                    aValue *= aFact;
-                  }
-                }
-                else
-                {
-                  STEPConstruct_UnitContext anUnitCtx;
-                  anUnitCtx.ComputeFactors(aNUnit, theLocalFactors);
-                  if (anUnitCtx.AreaDone())
-                    aParam = anUnitCtx.AreaFactor();
-                  if (anUnitCtx.VolumeDone())
-                    aParam = anUnitCtx.VolumeFactor();
-                  if (anUnitCtx.LengthDone())
-                    aParam = anUnitCtx.LengthFactor();
-
-                  aValue *= aParam;
-                }
-              }
-            }
-          }
-          theAttr->SetReal(thePropDef->Name()->ToCString(), aValue);
-        }
-        else if (anItem->IsKind(STANDARD_TYPE(StepRepr_ValueRepresentationItem)))
-        {
-          Handle(StepRepr_ValueRepresentationItem) aValueItem = Handle(StepRepr_ValueRepresentationItem)::DownCast(anItem);
-          Handle(StepBasic_MeasureValueMember) aMeasureValueMem = aValueItem->ValueComponentMember();
-          Interface_ParamType aParamType = aMeasureValueMem->ParamType();
-          if (aParamType == Interface_ParamInteger)
-          {
-            theAttr->SetInteger(thePropDef->Name()->ToCString(), aMeasureValueMem->Integer());
-          }
-          else if (aParamType == Interface_ParamReal)
-          {
-            theAttr->SetReal(thePropDef->Name()->ToCString(), aMeasureValueMem->Real());
-          }
-        }
-        else if (anItem->IsKind(STANDARD_TYPE(StepRepr_IntegerRepresentationItem)))
-        {
-          Handle(StepRepr_IntegerRepresentationItem) anIntegerItem = Handle(StepRepr_IntegerRepresentationItem)::DownCast(anItem);
-          theAttr->SetInteger(thePropDef->Name()->ToCString(), anIntegerItem->Value());
-        }
-        else if (anItem->IsKind(STANDARD_TYPE(StepRepr_RealRepresentationItem)))
-        {
-          Handle(StepRepr_RealRepresentationItem) aRealItem = Handle(StepRepr_RealRepresentationItem)::DownCast(anItem);
-          theAttr->SetReal(thePropDef->Name()->ToCString(), aRealItem->Value());
-        }
-        else if (anItem->IsKind(STANDARD_TYPE(StepRepr_BooleanRepresentationItem)))
-        {
-          Handle(StepRepr_BooleanRepresentationItem) aBoolItem = Handle(StepRepr_BooleanRepresentationItem)::DownCast(anItem);
-          theAttr->SetInteger(thePropDef->Name()->ToCString(), aBoolItem->Value());
-        }
-      }
-    }
-  }
-  return Standard_True;
-}

src/STEPCAFControl/STEPCAFControl_Reader.hxx

@@ -17,7 +17,6 @@
 #define _STEPCAFControl_Reader_HeaderFile
 
 #include <STEPControl_Reader.hxx>
-#include <StepData_Factors.hxx>
 #include <IFSelect_ReturnStatus.hxx>
 #include <TDF_LabelSequence.hxx>
 #include <TopTools_MapOfShape.hxx>
@@ -29,21 +28,18 @@
 #include <XCAFDimTolObjects_DatumModifWithValue.hxx>
 
 class XSControl_WorkSession;
-class TDataStd_NamedData;
 class TDocStd_Document;
 class STEPCAFControl_ExternFile;
 class TopoDS_Shape;
 class XCAFDoc_ShapeTool;
 class StepRepr_RepresentationItem;
 class Transfer_TransientProcess;
-class StepBasic_NamedUnit;
 class StepShape_ConnectedFaceSet;
-class StepShape_ShapeDefinitionRepresentation;
 class StepRepr_NextAssemblyUsageOccurrence;
-class StepRepr_PropertyDefinition;
 class STEPConstruct_Tool;
 class StepDimTol_Datum;
-class Transfer_Binder;
+class StepData_Factors;
+
 
 //! Provides a tool to read STEP file and put it into
 //! DECAF document. Besides transfer of shapes (including
@@ -180,11 +176,6 @@ public:
   Standard_EXPORT void SetPropsMode (const Standard_Boolean propsmode);
   
   Standard_EXPORT Standard_Boolean GetPropsMode() const;
-
-  //! MetaMode for indicate read Metadata or not.
-  Standard_EXPORT void SetMetaMode(const Standard_Boolean theMetaMode);
-
-  Standard_EXPORT Standard_Boolean GetMetaMode() const;
   
   //! Set SHUO mode for indicate write SHUO or not.
   Standard_EXPORT void SetSHUOMode (const Standard_Boolean shuomode);
@@ -243,7 +234,7 @@ protected:
   Standard_EXPORT Standard_Boolean ReadColors
                 (const Handle(XSControl_WorkSession)& WS,
                  const Handle(TDocStd_Document)& doc,
-                 const StepData_Factors& theLocalFactors = StepData_Factors()) const;
+                 const StepData_Factors& theLocalFactors) const;
   
   //! Reads names of parts defined in the STEP model and
   //! assigns them to corresponding labels in the DECAF document
@@ -255,13 +246,7 @@ protected:
   Standard_EXPORT Standard_Boolean ReadValProps (const Handle(XSControl_WorkSession)& WS,
                                                  const Handle(TDocStd_Document)& doc,
                                                  const STEPCAFControl_DataMapOfPDExternFile& PDFileMap,
-                                                 const StepData_Factors& theLocalFactors = StepData_Factors()) const;
-
-  //! Reads metadata assigned to shapes in the STEP model and
-  //! assigns them to corresponding labels in the DECAF document
-  Standard_EXPORT Standard_Boolean ReadMetadata(const Handle(XSControl_WorkSession)& theWS,
-                                                const Handle(TDocStd_Document)& theDoc,
-                                                const StepData_Factors& theLocalFactors = StepData_Factors()) const;
+                                                 const StepData_Factors& theLocalFactors) const;
   
   //! Reads layers of parts defined in the STEP model and
   //! set reference between shape and layers in the DECAF document
@@ -275,19 +260,19 @@ protected:
   //! set reference between shape instances from different assemblyes
   Standard_EXPORT Standard_Boolean ReadGDTs (const Handle(XSControl_WorkSession)& WS,
                                              const Handle(TDocStd_Document)& doc,
-                                             const StepData_Factors& theLocalFactors = StepData_Factors());
+                                             const StepData_Factors& theLocalFactors);
   
   //! Reads materials for instances defined in the STEP model and
   //! set reference between shape instances from different assemblyes
   Standard_EXPORT Standard_Boolean ReadMaterials (const Handle(XSControl_WorkSession)& WS,
                                                   const Handle(TDocStd_Document)& doc,
                                                   const Handle(TColStd_HSequenceOfTransient)& SeqPDS,
-                                                  const StepData_Factors& theLocalFactors = StepData_Factors()) const;
+                                                  const StepData_Factors& theLocalFactors) const;
   
   //! Reads Views for instances defined in the STEP model
   Standard_EXPORT Standard_Boolean ReadViews(const Handle(XSControl_WorkSession)& theWS,
                                              const Handle(TDocStd_Document)& theDoc,
-                                             const StepData_Factors& theLocalFactors = StepData_Factors()) const;
+                                             const StepData_Factors& theLocalFactors) const;
 
   //! Populates the sub-Label of the passed TDF Label with shape
   //! data associated with the given STEP Representation Item,
@@ -329,37 +314,26 @@ private:
     const Standard_Real theModifValue,
     const Handle(TDocStd_Document)& theDoc,
     const Handle(XSControl_WorkSession)& theWS,
-    const StepData_Factors& theLocalFactors = StepData_Factors());
+    const StepData_Factors& theLocalFactors);
   
   //! Internal method. Read Datums, connected to GeomTolerance theGDTL.
   Standard_Boolean readDatumsAP242(const Handle(Standard_Transient)& theEnt,
     const TDF_Label theGDTL,
     const Handle(TDocStd_Document)& theDoc,
     const Handle(XSControl_WorkSession)& theWS,
-    const StepData_Factors& theLocalFactors = StepData_Factors());
+    const StepData_Factors& theLocalFactors);
 
   //! Internal method. Read Dimension or GeomTolerance.
   TDF_Label createGDTObjectInXCAF(const Handle(Standard_Transient)& theEnt,
     const Handle(TDocStd_Document)& theDoc,
     const Handle(XSControl_WorkSession)& theWS,
-    const StepData_Factors& theLocalFactors = StepData_Factors());
+    const StepData_Factors& theLocalFactors);
 
   //! Prepares units for transfer
   void prepareUnits(const Handle(StepData_StepModel)& theModel,
                     const Handle(TDocStd_Document)& theDoc,
                     StepData_Factors& theLocalFactors) const;
 
-  //! Find RepresentationItems
-  Standard_Boolean findReprItems(const Handle(XSControl_WorkSession) & theWS,
-                                 const Handle(StepShape_ShapeDefinitionRepresentation) & theShDefRepr,
-                                 NCollection_List<Handle(Transfer_Binder)>& theBinders) const;
-
-  //! Fill metadata
-  Standard_Boolean fillAttributes(const Handle(XSControl_WorkSession)& theWS,
-                                  const Handle(StepRepr_PropertyDefinition)& thePropDef,
-                                  const StepData_Factors& theLocalFactors,
-                                  Handle(TDataStd_NamedData)& theAttr) const;
-
 private:
 
   STEPControl_Reader myReader;
@@ -369,7 +343,6 @@ private:
   Standard_Boolean myNameMode;
   Standard_Boolean myLayerMode;
   Standard_Boolean myPropsMode;
-  Standard_Boolean myMetaMode;
   Standard_Boolean mySHUOMode;
   Standard_Boolean myGDTMode;
   Standard_Boolean myMatMode;

src/STEPCAFControl/STEPCAFControl_Writer.hxx

@@ -25,7 +25,6 @@
 #include <STEPControl_Writer.hxx>
 #include <StepAP242_GeometricItemSpecificUsage.hxx>
 #include <StepData_ConfParameters.hxx>
-#include <StepData_Factors.hxx>
 #include <StepDimTol_Datum.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
@@ -40,6 +39,7 @@ class XSControl_WorkSession;
 class TDocStd_Document;
 class STEPCAFControl_ExternFile;
 class TopoDS_Shape;
+class StepData_Factors;
 
 //! Provides a tool to write DECAF document to the
 //! STEP file. Besides transfer of shapes (including
@@ -233,7 +233,7 @@ protected:
   TopoDS_Shape transferExternFiles(const TDF_Label& theLabel,
                                    const STEPControl_StepModelType theMode,
                                    TDF_LabelSequence& theLabelSeq,
-                                   const StepData_Factors& theLocalFactors = StepData_Factors(),
+                                   const StepData_Factors& theLocalFactors,
                                    const Standard_CString thePrefix = "",
                                    const Message_ProgressRange& theProgress = Message_ProgressRange());
 
@@ -256,7 +256,7 @@ protected:
   //! Write D&GTs assigned to specified labels, to STEP model, according AP242
   Standard_Boolean writeDGTsAP242(const Handle(XSControl_WorkSession)& theWS,
                                   const TDF_LabelSequence& theLabels,
-                                  const StepData_Factors& theLocalFactors = StepData_Factors());
+                                  const StepData_Factors& theLocalFactors);
 
   //! Write materials assigned to specified labels, to STEP model
   Standard_Boolean writeMaterials(const Handle(XSControl_WorkSession)& theWS,
@@ -297,14 +297,14 @@ protected:
                          const gp_Ax2& theAnnotationPlane,
                          const gp_Pnt& theTextPosition,
                          const Handle(Standard_Transient)& theDimension,
-                         const StepData_Factors& theLocalFactors = StepData_Factors());
+                         const StepData_Factors& theLocalFactors);
 
   Handle(StepDimTol_Datum) writeDatumAP242(const Handle(XSControl_WorkSession)& theWS,
                                            const TDF_LabelSequence& theShapeL,
                                            const TDF_Label& theDatumL,
                                            const Standard_Boolean isFirstDTarget,
                                            const Handle(StepDimTol_Datum)& theWrittenDatum,
-                                           const StepData_Factors& theLocalFactors = StepData_Factors());
+                                           const StepData_Factors& theLocalFactors);
 
   void writeToleranceZone(const Handle(XSControl_WorkSession)& theWS,
                           const Handle(XCAFDimTolObjects_GeomToleranceObject)& theObject,
@@ -316,7 +316,7 @@ protected:
                           const TDF_Label& theGeomTolL,
                           const Handle(StepDimTol_HArray1OfDatumSystemOrReference)& theDatumSystem,
                           const Handle(StepRepr_RepresentationContext)& theRC,
-                          const StepData_Factors& theLocalFactors = StepData_Factors());
+                          const StepData_Factors& theLocalFactors);
 
 private:
 

src/STEPConstruct/STEPConstruct_UnitContext.hxx

@@ -23,8 +23,8 @@
 
 #include <Standard_Integer.hxx>
 #include <Standard_CString.hxx>
-#include <StepData_Factors.hxx>
 #include <StepBasic_SiPrefix.hxx>
+class StepData_Factors;
 class StepData_StepModel;
 class StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx;
 class StepRepr_GlobalUnitAssignedContext;
@@ -49,7 +49,7 @@ public:
   //! uncertainty equal to Tol3d)
   Standard_EXPORT void Init (const Standard_Real Tol3d,
                              const Handle(StepData_StepModel)& theModel,
-                             const StepData_Factors& theLocalFactors = StepData_Factors());
+                             const StepData_Factors& theLocalFactors);
   
   //! Returns True if Init was called successfully
   Standard_EXPORT Standard_Boolean IsDone() const;
@@ -60,10 +60,10 @@ public:
   //! Computes the length, plane angle and solid angle conversion
   //! factor  .  Returns a status, 0 if OK
   Standard_EXPORT Standard_Integer ComputeFactors (const Handle(StepRepr_GlobalUnitAssignedContext)& aContext,
-                                                   const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                   const StepData_Factors& theLocalFactors);
   
   Standard_EXPORT Standard_Integer ComputeFactors (const Handle(StepBasic_NamedUnit)& aUnit,
-                                                   const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                   const StepData_Factors& theLocalFactors);
   
   //! Computes the uncertainty value (for length)
   Standard_EXPORT Standard_Integer ComputeTolerance (const Handle(StepRepr_GlobalUncertaintyAssignedContext)& aContext);

src/STEPConstruct/STEPConstruct_ValidationProps.hxx

@@ -26,6 +26,7 @@
 #include <Standard_CString.hxx>
 #include <TColStd_SequenceOfTransient.hxx>
 class StepBasic_ProductDefinition;
+class StepData_Factors;
 class XSControl_WorkSession;
 class TopoDS_Shape;
 class StepRepr_RepresentationItem;
@@ -114,13 +115,13 @@ public:
   Standard_EXPORT Standard_Boolean GetPropReal (const Handle(StepRepr_RepresentationItem)& item,
                                                 Standard_Real& Val,
                                                 Standard_Boolean& isArea,
-                                                const StepData_Factors& theLocalFactors = StepData_Factors()) const;
+                                                const StepData_Factors& theLocalFactors) const;
   
   //! Returns value of Centriod property (or False if it is not)
   Standard_EXPORT Standard_Boolean GetPropPnt (const Handle(StepRepr_RepresentationItem)& item,
                                                const Handle(StepRepr_RepresentationContext)& Context,
                                                gp_Pnt& Pnt,
-                                               const StepData_Factors& theLocalFactors = StepData_Factors()) const;
+                                               const StepData_Factors& theLocalFactors) const;
   
   //! Sets current assembly shape SDR (for FindCDSR calls)
   Standard_EXPORT void SetAssemblyShape (const TopoDS_Shape& shape);

src/STEPControl/STEPControl_ActorRead.cxx

@@ -580,7 +580,7 @@ static void getSDR(const Handle(StepRepr_ProductDefinitionShape)& PDS,
 
   // common progress indicator for translation of own shapes and sub-assemblies
   Message_ProgressScope PS(theProgress, "Part", nbEnt);
-  Standard_Integer nbComponents=0;
+  Standard_Integer nbComponents=0, nbShapes=0;
 
   // translate sub-assemblies
   for ( Standard_Integer nbNauo =1; nbNauo <= listNAUO->Length() && PS.More(); nbNauo++) {
@@ -662,6 +662,7 @@ static void getSDR(const Handle(StepRepr_ProductDefinitionShape)& PDS,
         else
           B.Add(Cund, theResult);
         // [END] ssv: OCCT#22436: extra compound in NMSSR case
+        nbShapes++;
       }
     }
     
@@ -669,20 +670,50 @@ static void getSDR(const Handle(StepRepr_ProductDefinitionShape)& PDS,
     // way of writing hybrid models in AP203 since 1998, and AP209
     // Note that both AP203 and AP209 allow main representation to be non-empty
     if ( readSRR && /*theResult.IsNull() &&*/ i <= nbNotAspect) {
-      TopoDS_Shape aNewResult = TransferRelatedSRR(TP, rep, useTrsf, readConstructiveGeomRR, theLocalFactors, Cund, aPS1);
-      if (!aNewResult.IsNull())
-      {
-        Result1 = aNewResult;
+      Interface_EntityIterator subs1 = graph.Sharings(rep);
+      Handle(Standard_Type) tSRR = STANDARD_TYPE(StepRepr_ShapeRepresentationRelationship);
+      for (subs1.Start(); subs1.More(); subs1.Next()) {
+        const Handle(Standard_Transient)& anitem = subs1.Value();
+        if( !anitem->IsKind(STANDARD_TYPE(StepRepr_RepresentationRelationship)))
+          continue;
+        if (anitem->DynamicType() == tSRR)
+        {
+          Handle(StepRepr_ShapeRepresentationRelationship) SRR =
+            Handle(StepRepr_ShapeRepresentationRelationship)::DownCast(anitem);
+          Standard_Integer nbrep = (rep == SRR->Rep1() ? 2 : 1);
+          // SKL for bug 29068: parameter useTrsf is used because if root entity has connection with other
+          // by ShapeRepresentationRelationship then result after such transferring need to transform also.
+          // This case is from test "bugs modalg_7 bug30196"
+          binder = TransferEntity(SRR, TP, theLocalFactors, nbrep, useTrsf, aPS1.Next());
+          if (! binder.IsNull()) {
+            theResult = TransferBRep::ShapeResult (binder);
+            Result1 = theResult;
+            B.Add(Cund, theResult);
+            nbShapes++;
+          }
+        }
+        else if(readConstructiveGeomRR && anitem->IsKind(STANDARD_TYPE(StepRepr_ConstructiveGeometryRepresentationRelationship)))
+        {
+          Handle(StepRepr_ConstructiveGeometryRepresentationRelationship) aCSRR =
+            Handle(StepRepr_ConstructiveGeometryRepresentationRelationship)::DownCast(anitem);
+           binder = TransferEntity(aCSRR, TP, theLocalFactors);
+           if (! binder.IsNull())
+           {
+             Result1 = TransferBRep::ShapeResult (binder);
+             B.Add(Cund, Result1);
+             nbShapes++;
+           }
+        }
       }
     }
   }
 
   // make a warning if both own shape and sub-assemblies are present
-  if ( (Cund.NbChildren() - nbComponents) > 0 && nbComponents > 0 )
+  if ( nbShapes >0 && nbComponents > 0 )
     TP->AddWarning ( PD, "Product has both sub-assemblies and directly assigned shape" );
 
   // if only single shape is read, add it as it is; otherwise add compound
-  if( (Cund.NbChildren() - nbComponents) == 1 && nbComponents == 0 )
+  if( nbShapes == 1 && nbComponents == 0 )
     shbinder = new TransferBRep_ShapeBinder (Result1);
   else
     shbinder = new TransferBRep_ShapeBinder (Cund);
@@ -1469,7 +1500,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity
     }
     else if (start->IsKind(STANDARD_TYPE(StepVisual_TessellatedSurfaceSet)))
     {
-      myShapeBuilder.Init(GetCasted(StepVisual_TessellatedSurfaceSet, start), TP, aHasGeom, aLocalFactors);
+      myShapeBuilder.Init(GetCasted(StepVisual_TessellatedSurfaceSet, start), TP, aLocalFactors, aHasGeom);
       found = Standard_True;
     }
   }
@@ -1524,8 +1555,8 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity
                     const Message_ProgressRange& theProgress)
 {
   Handle(TransferBRep_ShapeBinder) shbinder;
-
-  // --------------------------------------------------------------
+  
+    // --------------------------------------------------------------
   // On se trouve ici dans un contexte " d'assemblage geometrique "
   //    - MappedItem
   // --------------------------------------------------------------
@@ -1536,8 +1567,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity
   //  La Shape, et la mise en position
   Handle(StepShape_ShapeRepresentation) maprep =  Handle(StepShape_ShapeRepresentation)::
     DownCast(mapit->MappingSource()->MappedRepresentation());
-  Standard_Boolean isBound = Standard_False;
-  Message_ProgressScope aPSRoot(theProgress, NULL, 2);
+  Standard_Boolean isBound = Standard_False; 
   Handle(Transfer_Binder) binder = TP->Find(maprep);
   if (binder.IsNull())    binder = TransferEntity(maprep, TP, theLocalFactors, isBound, Standard_False, theProgress);
   shbinder = Handle(TransferBRep_ShapeBinder)::DownCast(binder);
@@ -1545,6 +1575,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity
   else {
     TopoDS_Shape mappedShape = shbinder->Result();
     if ( ! mappedShape.IsNull() ) {
+      
       //  Positionnement : 2 formules
       //  1/ Ax2 dans Source et comme Target  : passage de Source a Target
       //  2/ CartesianOperator3d comme Target : on applique
@@ -1576,39 +1607,6 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity
       shbinder = new TransferBRep_ShapeBinder (mappedShape);
     }
   }
-  TopoDS_Compound aCund;
-  TopoDS_Shape aResult;
-  BRep_Builder aBuilder;
-  aBuilder.MakeCompound(aCund);
-  if (!shbinder.IsNull())
-  {
-    aResult = TransferBRep::ShapeResult(shbinder);
-    aBuilder.Add(aCund, aResult);
-  }
-  // translate possible shapes related by SRRs, which corresponds to
-  // way of writing hybrid models in AP203 since 1998, and AP209
-  Standard_Integer aReadSRR = Interface_Static::IVal("read.step.shape.relationship");
-  Standard_Integer aReadConstructiveGeomRR = Interface_Static::IVal("read.step.constructivegeom.relationship");
-  if (aReadSRR)
-  {
-    const Interface_Graph& aGraph = TP->Graph();
-    Standard_Integer aSRRnum = 0;
-    for (Interface_EntityIterator aSubsIt(aGraph.Sharings(maprep)); aSubsIt.More(); aSubsIt.Next())
-      ++aSRRnum;
-    Message_ProgressScope aPS(aPSRoot.Next(), "Part", aSRRnum);
-    TopoDS_Shape aNewResult = TransferRelatedSRR(TP, maprep, Standard_False, aReadConstructiveGeomRR, theLocalFactors, aCund, aPS);
-    if (!aNewResult.IsNull())
-    {
-      aResult = aNewResult;
-    }
-    // if only single shape is read, add it as it is; otherwise add compound
-    if (aCund.NbChildren() == 1)
-      shbinder = new TransferBRep_ShapeBinder(aResult);
-    else if (aCund.NbChildren() > 1)
-    {
-      shbinder = new TransferBRep_ShapeBinder(aCund);
-    }
-  }
   TP->Bind(mapit, shbinder);
   return shbinder;
 }
@@ -2093,47 +2091,3 @@ void STEPControl_ActorRead::SetModel(const Handle(Interface_InterfaceModel)& the
 {
   myModel = theModel;
 }
-
-//=======================================================================
-// Method  : TransferRelatedSRR
-// Purpose : Helper method to transfer SRR related to the representation
-//=======================================================================
-TopoDS_Shape STEPControl_ActorRead::TransferRelatedSRR(const Handle(Transfer_TransientProcess)& theTP,
-                                                       const Handle(StepShape_ShapeRepresentation)& theRep,
-                                                       const Standard_Boolean theUseTrsf,
-                                                       const Standard_Integer theReadConstructiveGeomRR,
-                                                       const StepData_Factors& theLocalFactors,
-                                                       TopoDS_Compound& theCund,
-                                                       Message_ProgressScope& thePS)
-{
-  BRep_Builder aBuilder;
-  TopoDS_Shape aResult;
-  const Interface_Graph& aGraph = theTP->Graph();
-  for (Interface_EntityIterator aSubsIt(aGraph.Sharings(theRep)); aSubsIt.More() && thePS.More(); aSubsIt.Next())
-  {
-    Handle(Standard_Transient) anItem = aSubsIt.Value();
-    if (!anItem->IsKind(STANDARD_TYPE(StepRepr_RepresentationRelationship)))
-      continue;
-    Handle(Transfer_Binder) aBinder;
-    if (anItem->DynamicType() == STANDARD_TYPE(StepRepr_ShapeRepresentationRelationship))
-    {
-      Handle(StepRepr_ShapeRepresentationRelationship) aSRR =
-        Handle(StepRepr_ShapeRepresentationRelationship)::DownCast(anItem);
-      Standard_Integer aNbRep = (theRep == aSRR->Rep1() ? 2 : 1);
-      aBinder = TransferEntity(aSRR, theTP, theLocalFactors, aNbRep, theUseTrsf, thePS.Next());
-    }
-    else if (theReadConstructiveGeomRR &&
-             anItem->DynamicType() == STANDARD_TYPE(StepRepr_ConstructiveGeometryRepresentationRelationship))
-    {
-      Handle(StepRepr_ConstructiveGeometryRepresentationRelationship) aCGRR =
-        Handle(StepRepr_ConstructiveGeometryRepresentationRelationship)::DownCast(anItem);
-      aBinder = TransferEntity(aCGRR, theTP, theLocalFactors);
-    }
-    if (!aBinder.IsNull())
-    {
-      aResult = TransferBRep::ShapeResult(aBinder);
-      aBuilder.Add(theCund, aResult);
-    }
-  }
-  return aResult;
-}

src/STEPControl/STEPControl_ActorRead.hxx

@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <StepData_Factors.hxx>
 #include <StepToTopoDS_NMTool.hxx>
 #include <Transfer_ActorOfTransientProcess.hxx>
 #include <Standard_Integer.hxx>
@@ -48,6 +47,7 @@ class StepShape_FaceSurface;
 class TopoDS_Shell;
 class TopoDS_Compound;
 class StepRepr_ConstructiveGeometryRepresentationRelationship;
+class StepData_Factors;
 class StepData_StepModel;
 
 
@@ -77,7 +77,7 @@ public:
   Standard_EXPORT Handle(Transfer_Binder) TransferShape (
       const Handle(Standard_Transient)& start,
       const Handle(Transfer_TransientProcess)& TP,
-      const StepData_Factors& theLocalFactors = StepData_Factors(),
+      const StepData_Factors& theLocalFactors,
       const Standard_Boolean isManifold = Standard_True,
       const Standard_Boolean theUseTrsf = Standard_False,
       const Message_ProgressRange& theProgress = Message_ProgressRange());
@@ -105,14 +105,14 @@ public:
                                                           const Handle(StepRepr_Representation)& TargContext,
                                                           const Handle(Transfer_TransientProcess)& TP,
                                                           gp_Trsf& Trsf,
-                                                          const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                          const StepData_Factors& theLocalFactors);
 
   //! Computes transformation defined by given
   //! REPRESENTATION_RELATIONSHIP_WITH_TRANSFORMATION
   Standard_EXPORT Standard_Boolean ComputeSRRWT (const Handle(StepRepr_RepresentationRelationship)& SRR,
                                                  const Handle(Transfer_TransientProcess)& TP,
                                                  gp_Trsf& Trsf,
-                                                 const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                 const StepData_Factors& theLocalFactors);
 
 
 
@@ -127,7 +127,7 @@ protected:
     Standard_EXPORT Handle(TransferBRep_ShapeBinder) TransferEntity (
       const Handle(StepBasic_ProductDefinition)& PD,
       const Handle(Transfer_TransientProcess)& TP,
-      const StepData_Factors& theLocalFactors = StepData_Factors(),
+      const StepData_Factors& theLocalFactors,
       const Standard_Boolean theUseTrsf = Standard_False,
       const Message_ProgressRange& theProgress = Message_ProgressRange());
 
@@ -135,7 +135,7 @@ protected:
   Standard_EXPORT Handle(TransferBRep_ShapeBinder) TransferEntity
                    (const Handle(StepRepr_NextAssemblyUsageOccurrence)& NAUO,
                     const Handle(Transfer_TransientProcess)& TP,
-                    const StepData_Factors& theLocalFactors = StepData_Factors(),
+                    const StepData_Factors& theLocalFactors,
                     const Message_ProgressRange& theProgress = Message_ProgressRange());
 
   //! Transfers shape representation entity
@@ -152,7 +152,7 @@ protected:
   Standard_EXPORT Handle(TransferBRep_ShapeBinder) TransferEntity
                    (const Handle(StepShape_ContextDependentShapeRepresentation)& CDSR,
                     const Handle(Transfer_TransientProcess)& TP,
-                    const StepData_Factors& theLocalFactors = StepData_Factors(),
+                    const StepData_Factors& theLocalFactors,
                     const Message_ProgressRange& theProgress = Message_ProgressRange());
 
   //! Transfers  shape representation relationship entity
@@ -189,7 +189,7 @@ protected:
 
   Handle(TransferBRep_ShapeBinder) TransferEntity( const Handle(StepRepr_ConstructiveGeometryRepresentationRelationship)& theCGRR,
                                                    const Handle(Transfer_TransientProcess)& theTP,
-                                                   const StepData_Factors& theLocalFactors = StepData_Factors());
+                                                   const StepData_Factors& theLocalFactors);
 
   //! Translates file by old way when CDSR are roots . Acts only if "read.step.product_mode" is equal Off.
   Standard_EXPORT Handle(TransferBRep_ShapeBinder) OldWay
@@ -206,14 +206,6 @@ private:
 
   Standard_EXPORT void computeIDEASClosings (const TopoDS_Compound& comp, TopTools_IndexedDataMapOfShapeListOfShape& shellClosingMap);
 
-  Standard_EXPORT TopoDS_Shape TransferRelatedSRR(const Handle(Transfer_TransientProcess)& theTP,
-                                                  const Handle(StepShape_ShapeRepresentation)& theRep,
-                                                  const Standard_Boolean theUseTrsf,
-                                                  const Standard_Integer theReadConstructiveGeomRR,
-                                                  const StepData_Factors& theLocalFactors,
-                                                  TopoDS_Compound& theCund,
-                                                  Message_ProgressScope& thePS);
-
   StepToTopoDS_NMTool myNMTool;
   Standard_Real myPrecision;
   Standard_Real myMaxTol;

src/STEPControl/STEPControl_ActorWrite.hxx

@@ -28,6 +28,7 @@
 class Transfer_Finder;
 class Transfer_Binder;
 class Transfer_FinderProcess;
+class StepData_Factors;
 class StepShape_ShapeDefinitionRepresentation;
 class StepGeom_Axis2Placement3d;
 class TopoDS_Shape;
@@ -59,7 +60,7 @@ public:
                     const Handle(StepShape_ShapeDefinitionRepresentation)& SDR,
                     Handle(StepGeom_Axis2Placement3d)& AX1, 
                     const Handle(Transfer_FinderProcess)& FP,
-                    const StepData_Factors& theLocalFactors = StepData_Factors(),
+                    const StepData_Factors& theLocalFactors,
                     const Handle(TopTools_HSequenceOfShape)& shapeGroup = NULL, 
                     const Standard_Boolean isManifold = Standard_True,
                     const Message_ProgressRange& theProgress = Message_ProgressRange());
@@ -68,7 +69,7 @@ public:
                    (const Handle(Transfer_Finder)& start,
                     const Handle(StepShape_ShapeDefinitionRepresentation)& SDR,
                     const Handle(Transfer_FinderProcess)& FP,
-                    const StepData_Factors& theLocalFactors = StepData_Factors(),
+                    const StepData_Factors& theLocalFactors,
                     const Handle(TopTools_HSequenceOfShape)& shapeGroup = NULL,
                     const Standard_Boolean isManifold = Standard_True,
                     const Message_ProgressRange& theProgress = Message_ProgressRange());
@@ -77,7 +78,7 @@ public:
                    (const Handle(Transfer_Finder)& start,
                     const Handle(StepShape_ShapeDefinitionRepresentation)& SDR,
                     const Handle(Transfer_FinderProcess)& FP,
-                    const StepData_Factors& theLocalFactors = StepData_Factors(),
+                    const StepData_Factors& theLocalFactors,
                     const Message_ProgressRange& theProgress = Message_ProgressRange());
   
   Standard_EXPORT void SetMode (const STEPControl_StepModelType M);

src/SelectMgr/SelectMgr_AxisIntersector.cxx

@@ -93,24 +93,6 @@ Handle(SelectMgr_BaseIntersector) SelectMgr_AxisIntersector::ScaleAndTransform (
   return aRes;
 }
 
-//=======================================================================
-// function : CopyWithBuilder
-// purpose  : Returns a copy of the frustum using the given frustum builder configuration.
-//            Returned frustum should be re-constructed before being used.
-//=======================================================================
-Handle(SelectMgr_BaseIntersector) SelectMgr_AxisIntersector::CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const
-{
-  (void )theBuilder;
-  Standard_ASSERT_RAISE(mySelectionType == SelectMgr_SelectionType_Point,
-    "Error! SelectMgr_AxisIntersector::CopyWithBuilder() should be called after selection axis initialization");
-
-  Handle(SelectMgr_AxisIntersector) aRes = new SelectMgr_AxisIntersector();
-  aRes->myAxis = myAxis;
-  aRes->mySelectionType = mySelectionType;
-
-  return aRes;
-}
-
 // =======================================================================
 // function : hasIntersection
 // purpose  :

src/SelectMgr/SelectMgr_AxisIntersector.hxx

@@ -52,11 +52,6 @@ public:
                                                                                const gp_GTrsf& theTrsf,
                                                                                const Handle(SelectMgr_FrustumBuilder)& theBuilder) const Standard_OVERRIDE;
 
-  //! Returns a copy of the intersector transformed using the builder configuration given.
-  //! Builder is an argument that represents corresponding settings for re-constructing transformed frustum from scratch.
-  //! In this class, builder is not used and theBuilder parameter is ignored.
-  Standard_EXPORT virtual Handle(SelectMgr_BaseIntersector) CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const Standard_OVERRIDE;
-
 public:
 
   //! Intersection test between defined axis and given axis-aligned box

src/SelectMgr/SelectMgr_BaseIntersector.hxx

@@ -71,11 +71,6 @@ public:
                                                                const gp_GTrsf& theTrsf,
                                                                const Handle(SelectMgr_FrustumBuilder)& theBuilder) const = 0;
 
-  //! @param theBuilder [in] argument that represents corresponding settings for re-constructing transformed frustum from scratch;
-  //!                        should NOT be NULL.
-  //! @return a copy of the frustum with the input builder assigned
-  virtual Handle(SelectMgr_BaseIntersector) CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const = 0;
-
 public:
 
   //! Return camera definition.

src/SelectMgr/SelectMgr_RectangularFrustum.cxx

@@ -449,28 +449,6 @@ Handle(SelectMgr_BaseIntersector) SelectMgr_RectangularFrustum::ScaleAndTransfor
   return aRes;
 }
 
-// =======================================================================
-// function : CopyWithBuilder
-// purpose  : Returns a copy of the frustum using the given frustum builder configuration.
-//            Returned frustum should be re-constructed before being used.
-// =======================================================================
-Handle(SelectMgr_BaseIntersector) SelectMgr_RectangularFrustum::CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const
-{
-  Standard_ASSERT_RAISE (mySelectionType == SelectMgr_SelectionType_Point || mySelectionType == SelectMgr_SelectionType_Box,
-    "Error! SelectMgr_RectangularFrustum::CopyWithBuilder() should be called after selection frustum initialization");
-
-  Standard_ASSERT_RAISE (!theBuilder.IsNull(), 
-    "Error! SelectMgr_RectangularFrustum::CopyWithBuilder() should be called with valid builder");
-
-  Handle(SelectMgr_RectangularFrustum) aRes = new SelectMgr_RectangularFrustum();
-  aRes->mySelectionType = mySelectionType;
-  aRes->mySelRectangle = mySelRectangle;
-  aRes->myPixelTolerance = myPixelTolerance;
-  aRes->SetBuilder (theBuilder);
-
-  return aRes;
-}
-
 // =======================================================================
 // function : IsScalable
 // purpose  :

src/SelectMgr/SelectMgr_RectangularFrustum.hxx

@@ -99,13 +99,6 @@ public:
                                                                                const gp_GTrsf& theTrsf,
                                                                                const Handle(SelectMgr_FrustumBuilder)& theBuilder) const Standard_OVERRIDE;
 
-  //! Returns a copy of the frustum using the given frustum builder configuration.
-  //! Returned frustum should be re-constructed before being used.
-  //! @param theBuilder [in] argument that represents corresponding settings for re-constructing transformed frustum from scratch;
-  //!                        should NOT be NULL.
-  //! @return a copy of the frustum with the input builder assigned
-  Standard_EXPORT virtual Handle(SelectMgr_BaseIntersector) CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const Standard_OVERRIDE;
-
   // SAT Tests for different objects
 
   //! SAT intersection test between defined volume and given axis-aligned box

src/SelectMgr/SelectMgr_SelectableObjectSet.cxx

@@ -241,23 +241,17 @@ namespace
 //=============================================================================
 SelectMgr_SelectableObjectSet::SelectMgr_SelectableObjectSet()
 {
-  myBVH[BVHSubset_ortho2dPersistent] = new BVH_Tree<Standard_Real, 3>();
-  myBVH[BVHSubset_ortho3dPersistent] = new BVH_Tree<Standard_Real, 3>();
-  myBVH[BVHSubset_2dPersistent]      = new BVH_Tree<Standard_Real, 3>();
-  myBVH[BVHSubset_3dPersistent]      = new BVH_Tree<Standard_Real, 3>();
-  myBVH[BVHSubset_3d]                = new BVH_Tree<Standard_Real, 3>();
+  myBVH[BVHSubset_2dPersistent] = new BVH_Tree<Standard_Real, 3>();
+  myBVH[BVHSubset_3dPersistent] = new BVH_Tree<Standard_Real, 3>();
+  myBVH[BVHSubset_3d]           = new BVH_Tree<Standard_Real, 3>();
 
-  myBuilder[BVHSubset_ortho2dPersistent] = new BVH_LinearBuilder<Standard_Real, 3>    (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth);
-  myBuilder[BVHSubset_ortho3dPersistent] = new BVH_LinearBuilder<Standard_Real, 3>    (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth);
-  myBuilder[BVHSubset_2dPersistent]      = new BVH_LinearBuilder<Standard_Real, 3>    (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth);
-  myBuilder[BVHSubset_3dPersistent]      = new BVH_LinearBuilder<Standard_Real, 3>    (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth);
-  myBuilder[BVHSubset_3d]                = new BVH_BinnedBuilder<Standard_Real, 3, 4> (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth, Standard_True);
+  myBuilder[BVHSubset_2dPersistent] = new BVH_LinearBuilder<Standard_Real, 3>    (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth);
+  myBuilder[BVHSubset_3dPersistent] = new BVH_LinearBuilder<Standard_Real, 3>    (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth);
+  myBuilder[BVHSubset_3d]           = new BVH_BinnedBuilder<Standard_Real, 3, 4> (BVH_Constants_LeafNodeSizeSingle, BVH_Constants_MaxTreeDepth, Standard_True);
 
-  myIsDirty[BVHSubset_ortho2dPersistent] = Standard_False;
-  myIsDirty[BVHSubset_ortho3dPersistent] = Standard_False;
-  myIsDirty[BVHSubset_2dPersistent]      = Standard_False;
-  myIsDirty[BVHSubset_3dPersistent]      = Standard_False;
-  myIsDirty[BVHSubset_3d]                = Standard_False;
+  myIsDirty[BVHSubset_2dPersistent] = Standard_False;
+  myIsDirty[BVHSubset_3dPersistent] = Standard_False;
+  myIsDirty[BVHSubset_3d]           = Standard_False;
 }
 
 //=============================================================================
@@ -268,9 +262,10 @@ Standard_Boolean SelectMgr_SelectableObjectSet::Append (const Handle(SelectMgr_S
 {
   // get an appropriate BVH subset to insert the object into it
   const Standard_Integer aSubsetIdx = appropriateSubset (theObject);
-  
+
   // check that the object is excluded from other subsets
-  if (currentSubset (theObject) != -1)
+  if (myObjects[(aSubsetIdx + 1) % BVHSubsetNb].Contains (theObject)
+   || myObjects[(aSubsetIdx + 2) % BVHSubsetNb].Contains (theObject))
   {
     return Standard_False;
   }
@@ -406,51 +401,9 @@ void SelectMgr_SelectableObjectSet::UpdateBVH (const Handle(Graphic3d_Camera)& t
       myBuilder[BVHSubset_2dPersistent]->Build (&anAdaptor, myBVH[BVHSubset_2dPersistent].get(), anAdaptor.Box());
     }
 
-    // -------------------------------------------------------------------
-    // check and update 3D orthographic persistence BVH tree if necessary
-    // -------------------------------------------------------------------
-    if (!IsEmpty (BVHSubset_ortho3dPersistent)
-      && (myIsDirty[BVHSubset_ortho3dPersistent]
-       || myLastViewState.IsChanged (aViewState)
-       || isWinSizeChanged))
-    {
-      Handle(Graphic3d_Camera) aNewOrthoCam = new Graphic3d_Camera (*theCam); // If OrthoPers, copy camera and set to orthographic projection
-      aNewOrthoCam->SetProjectionType (Graphic3d_Camera::Projection_Orthographic);
-
-      // construct adaptor over private fields to provide direct access for the BVH builder
-      BVHBuilderAdaptorPersistent anAdaptor (myObjects[BVHSubset_ortho3dPersistent],
-                                             aNewOrthoCam, aNewOrthoCam->ProjectionMatrix(), 
-                                             aNewOrthoCam->OrientationMatrix(), theWinSize);
-
-      // update corresponding BVH tree data structure
-      myBuilder[BVHSubset_ortho3dPersistent]->Build (&anAdaptor, myBVH[BVHSubset_ortho3dPersistent].get(), anAdaptor.Box());
-    }
-
-    // -------------------------------------------------------------------
-    // check and update 2D orthographic persistence BVH tree if necessary
-    // -------------------------------------------------------------------
-    if (!IsEmpty (BVHSubset_ortho2dPersistent)
-      && (myIsDirty[BVHSubset_ortho2dPersistent]
-       || myLastViewState.IsProjectionChanged (aViewState)
-       || isWinSizeChanged))
-    {
-      Handle(Graphic3d_Camera) aNewOrthoCam = new Graphic3d_Camera (*theCam); // If OrthoPers, copy camera and set to orthographic projection
-      aNewOrthoCam->SetProjectionType (Graphic3d_Camera::Projection_Orthographic);
-
-      // construct adaptor over private fields to provide direct access for the BVH builder
-      BVHBuilderAdaptorPersistent anAdaptor (myObjects[BVHSubset_ortho2dPersistent],
-                                             aNewOrthoCam, aNewOrthoCam->ProjectionMatrix(), 
-                                             SelectMgr_SelectableObjectSet_THE_IDENTITY_MAT, theWinSize);
-
-      // update corresponding BVH tree data structure
-      myBuilder[BVHSubset_ortho2dPersistent]->Build (&anAdaptor, myBVH[BVHSubset_ortho2dPersistent].get(), anAdaptor.Box());
-    }
-
     // release dirty state for every subset
-    myIsDirty[BVHSubset_3dPersistent]      = Standard_False;
-    myIsDirty[BVHSubset_2dPersistent]      = Standard_False;
-    myIsDirty[BVHSubset_ortho3dPersistent] = Standard_False;
-    myIsDirty[BVHSubset_ortho2dPersistent] = Standard_False;
+    myIsDirty[BVHSubset_3dPersistent] = Standard_False;
+    myIsDirty[BVHSubset_2dPersistent] = Standard_False;
 
     // keep last view state
     myLastViewState = aViewState;
@@ -466,11 +419,9 @@ void SelectMgr_SelectableObjectSet::UpdateBVH (const Handle(Graphic3d_Camera)& t
 //=============================================================================
 void SelectMgr_SelectableObjectSet::MarkDirty()
 {
-  myIsDirty[BVHSubset_3d]                = Standard_True;
-  myIsDirty[BVHSubset_3dPersistent]      = Standard_True;
-  myIsDirty[BVHSubset_2dPersistent]      = Standard_True;
-  myIsDirty[BVHSubset_ortho3dPersistent] = Standard_True;
-  myIsDirty[BVHSubset_ortho2dPersistent] = Standard_True;
+  myIsDirty[BVHSubset_3d]           = Standard_True;
+  myIsDirty[BVHSubset_3dPersistent] = Standard_True;
+  myIsDirty[BVHSubset_2dPersistent] = Standard_True;
 }
 //=======================================================================
 //function : DumpJson

src/SelectMgr/SelectMgr_SelectableObjectSet.hxx

@@ -42,22 +42,11 @@ public:
   //! needs to be updated only when camera's projection changes. Bounding volumes for this object subclass
   //! is represented directly in eye space coordinates.
   //! This subset uses linear BVH builder with 32 levels of depth and 1 element per leaf.
-  //! - BVHSubset_ortho3dPersistent refers to the subset of 3D persistent selectable objects (rotate, pan, zoom persistence)
-  //! that contains `Graphic3d_TMF_OrthoPers` persistence mode.
-  //! Associated BVH tree needs to be updated when either the camera's projection and position change.
-  //! This subset uses linear BVH builder with 32 levels of depth and 1 element per leaf.
-  //! - BVHSubset_ortho2dPersistent refers to the subset of 2D persistent selectable objects
-  //! that contains `Graphic3d_TMF_OrthoPers` persistence mode. Associated BVH tree
-  //! needs to be updated only when camera's projection changes. Bounding volumes for this object subclass
-  //! is represented directly in eye space coordinates.
-  //! This subset uses linear BVH builder with 32 levels of depth and 1 element per leaf.
   enum BVHSubset
   {
     BVHSubset_3d,
     BVHSubset_3dPersistent,
     BVHSubset_2dPersistent,
-    BVHSubset_ortho3dPersistent,
-    BVHSubset_ortho2dPersistent,
     BVHSubsetNb
   };
 
@@ -151,9 +140,7 @@ public:
   {
     return myObjects[BVHSubset_3d].Contains (theObject)
         || myObjects[BVHSubset_3dPersistent].Contains (theObject)
-        || myObjects[BVHSubset_2dPersistent].Contains (theObject)
-        || myObjects[BVHSubset_ortho3dPersistent].Contains (theObject)
-        || myObjects[BVHSubset_ortho2dPersistent].Contains (theObject);
+        || myObjects[BVHSubset_2dPersistent].Contains (theObject);
   }
 
   //! Returns true if the object set does not contain any selectable objects.
@@ -161,9 +148,7 @@ public:
   {
     return myObjects[BVHSubset_3d].IsEmpty()
         && myObjects[BVHSubset_3dPersistent].IsEmpty()
-        && myObjects[BVHSubset_2dPersistent].IsEmpty()
-        && myObjects[BVHSubset_ortho3dPersistent].IsEmpty()
-        && myObjects[BVHSubset_ortho2dPersistent].IsEmpty();
+        && myObjects[BVHSubset_2dPersistent].IsEmpty();
   }
 
   //! Returns true if the specified object subset is empty.
@@ -207,18 +192,10 @@ private:
       }
       return SelectMgr_SelectableObjectSet::BVHSubset_3d;
     }
-    else if ((theObject->TransformPersistence()->Mode() & Graphic3d_TMF_2d) != 0)
+    else if (theObject->TransformPersistence()->Mode() == Graphic3d_TMF_2d)
     {
-      if (theObject->TransformPersistence()->IsOrthoPers())
-      {
-        return SelectMgr_SelectableObjectSet::BVHSubset_ortho2dPersistent;
-      }
       return SelectMgr_SelectableObjectSet::BVHSubset_2dPersistent;
     }
-    else if (theObject->TransformPersistence()->IsOrthoPers())
-    {
-      return SelectMgr_SelectableObjectSet::BVHSubset_ortho3dPersistent;
-    }
     else
     {
       return SelectMgr_SelectableObjectSet::BVHSubset_3dPersistent;

src/SelectMgr/SelectMgr_SelectingVolumeManager.cxx

@@ -67,28 +67,6 @@ SelectMgr_SelectingVolumeManager SelectMgr_SelectingVolumeManager::ScaleAndTrans
   return aMgr;
 }
 
-//=======================================================================
-// function : CopyWithBuilder
-// purpose  : Returns a copy of the selecting volume manager and its active frustum re-constructed using the passed builder.
-//            Builder is an argument that represents corresponding settings for re-constructing transformed
-//            frustum from scratch.
-//=======================================================================
-SelectMgr_SelectingVolumeManager SelectMgr_SelectingVolumeManager::CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const
-{
-  SelectMgr_SelectingVolumeManager aMgr;
-  aMgr.myToAllowOverlap = myToAllowOverlap;
-  aMgr.myViewClipPlanes = myViewClipPlanes;
-  aMgr.myObjectClipPlanes = myObjectClipPlanes;
-  aMgr.myViewClipRange = myViewClipRange;
-  if (!myActiveSelectingVolume.IsNull())
-  {
-    aMgr.myActiveSelectingVolume = myActiveSelectingVolume->CopyWithBuilder (theBuilder);
-    aMgr.BuildSelectingVolume();
-  }
-
-  return aMgr;
-}
-
 //=======================================================================
 // function : GetActiveSelectionType
 // purpose  :

src/SelectMgr/SelectMgr_SelectingVolumeManager.hxx

@@ -81,11 +81,6 @@ public:
                                                                               const gp_GTrsf& theTrsf,
                                                                               const Handle(SelectMgr_FrustumBuilder)& theBuilder) const;
 
-  //! Returns a copy of the selecting volume manager and its active frustum re-constructed using the passed builder.
-  //! Builder is an argument that represents corresponding settings for re-constructing transformed
-  //! frustum from scratch.
-  Standard_EXPORT virtual SelectMgr_SelectingVolumeManager CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const;
-
 public:
 
   //! Returns current camera definition.

src/SelectMgr/SelectMgr_SensitiveEntitySet.cxx

@@ -28,7 +28,7 @@ IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_SensitiveEntitySet, BVH_PrimitiveSet3d)
 SelectMgr_SensitiveEntitySet::SelectMgr_SensitiveEntitySet (const Handle(Select3D_BVHBuilder3d)& theBuilder)
 : BVH_PrimitiveSet3d (theBuilder)
 {
-  myNbEntityWithPersistence = 0;
+  //
 }
 
 //=======================================================================
@@ -42,6 +42,7 @@ void SelectMgr_SensitiveEntitySet::Append (const Handle(SelectMgr_SensitiveEntit
     theEntity->ResetSelectionActiveStatus();
     return;
   }
+
   const Standard_Integer anExtent = mySensitives.Extent();
   if (mySensitives.Add (theEntity) > anExtent)
   {
@@ -49,7 +50,7 @@ void SelectMgr_SensitiveEntitySet::Append (const Handle(SelectMgr_SensitiveEntit
   }
   if (!theEntity->BaseSensitive()->TransformPersistence().IsNull())
   {
-    ++myNbEntityWithPersistence;
+    myHasEntityWithPersistence = Standard_True;
   }
   MarkDirty();
 }
@@ -77,7 +78,7 @@ void SelectMgr_SensitiveEntitySet::Append (const Handle(SelectMgr_Selection)& th
     }
     if (!aSensEnt->BaseSensitive()->TransformPersistence().IsNull())
     {
-      ++myNbEntityWithPersistence;
+      myHasEntityWithPersistence = Standard_True;
     }
   }
   MarkDirty();
@@ -92,8 +93,7 @@ void SelectMgr_SensitiveEntitySet::Remove (const Handle(SelectMgr_Selection)& th
 {
   for (NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator aSelEntIter (theSelection->Entities()); aSelEntIter.More(); aSelEntIter.Next())
   {
-    const Handle(SelectMgr_SensitiveEntity)& aSensEnt = aSelEntIter.Value();
-    const Standard_Integer anEntIdx = mySensitives.FindIndex (aSensEnt);
+    const Standard_Integer anEntIdx = mySensitives.FindIndex (aSelEntIter.Value());
     if (anEntIdx == 0)
     {
       continue;
@@ -103,13 +103,9 @@ void SelectMgr_SensitiveEntitySet::Remove (const Handle(SelectMgr_Selection)& th
     {
       Swap (anEntIdx - 1, mySensitives.Size() - 1);
     }
-    if (!aSensEnt->BaseSensitive()->TransformPersistence().IsNull())
-    {
-      --myNbEntityWithPersistence;
-    }
 
     mySensitives.RemoveLast();
-    removeOwner (aSensEnt->BaseSensitive()->OwnerId());
+    removeOwner (aSelEntIter.Value()->BaseSensitive()->OwnerId());
   }
 
   MarkDirty();

src/SelectMgr/SelectMgr_SensitiveEntitySet.hxx

@@ -77,7 +77,7 @@ public:
   const SelectMgr_MapOfOwners& Owners() const { return myOwnersMap; }
 
   //! Returns map of entities.
-  Standard_Boolean HasEntityWithPersistence() const { return myNbEntityWithPersistence > 0; }
+  Standard_Boolean HasEntityWithPersistence() const { return myHasEntityWithPersistence; }
 
 protected:
 
@@ -89,9 +89,9 @@ protected:
 
 private:
 
-  SelectMgr_IndexedMapOfHSensitive mySensitives;              //!< Map of entities and its corresponding index in BVH
-  SelectMgr_MapOfOwners            myOwnersMap;               //!< Map of entity owners and its corresponding number of sensitives
-  Standard_Integer                 myNbEntityWithPersistence; //!< number of sensitive entities that have own transform persistence
+  SelectMgr_IndexedMapOfHSensitive mySensitives; //!< Map of entities and its corresponding index in BVH
+  SelectMgr_MapOfOwners            myOwnersMap;  //!< Map of entity owners and its corresponding number of sensitives
+  Standard_Boolean  myHasEntityWithPersistence;  //!< flag if some of sensitive entity has own transform persistence
 };
 
 #endif // _SelectMgr_SensitiveEntitySet_HeaderFile

src/SelectMgr/SelectMgr_TriangularFrustum.cxx

@@ -189,20 +189,6 @@ Handle(SelectMgr_BaseIntersector) SelectMgr_TriangularFrustum::ScaleAndTransform
   return aRes;
 }
 
-//=======================================================================
-// function : CopyWithBuilder
-// purpose  : Returns a copy of the frustum using the given frustum builder configuration.
-//            Returned frustum should be re-constructed before being used.
-//=======================================================================
-Handle(SelectMgr_BaseIntersector) SelectMgr_TriangularFrustum::CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const
-{
-  Handle(SelectMgr_TriangularFrustum) aRes = new SelectMgr_TriangularFrustum();
-  aRes->mySelTriangle = mySelTriangle;
-  aRes->SetBuilder (theBuilder);
-
-  return aRes;
-}
-
 //=======================================================================
 // function : OverlapsBox
 // purpose  : SAT intersection test between defined volume and

src/SelectMgr/SelectMgr_TriangularFrustum.hxx

@@ -55,13 +55,6 @@ public:
                                                                                const gp_GTrsf& theTrsf,
                                                                                const Handle(SelectMgr_FrustumBuilder)& theBuilder) const Standard_OVERRIDE;
 
-  //! Returns a copy of the frustum using the given frustum builder configuration.
-  //! Returned frustum should be re-constructed before being used.
-  //! @param theBuilder [in] argument that represents corresponding settings for re-constructing transformed frustum from scratch;
-  //!                        should NOT be NULL.
-  //! @return a copy of the frustum with the input builder assigned
-  Standard_EXPORT virtual Handle(SelectMgr_BaseIntersector) CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const Standard_OVERRIDE;
-
 public: //! @name SAT Tests for different objects
 
   //! SAT intersection test between defined volume and given axis-aligned box

src/SelectMgr/SelectMgr_TriangularFrustumSet.cxx

@@ -186,32 +186,6 @@ Handle(SelectMgr_BaseIntersector) SelectMgr_TriangularFrustumSet::ScaleAndTransf
   return aRes;
 }
 
-//=======================================================================
-// function : CopyWithBuilder
-// purpose  : Returns a copy of the frustum using the given frustum builder configuration.
-//            Returned frustum should be re-constructed before being used.
-//=======================================================================
-Handle(SelectMgr_BaseIntersector) SelectMgr_TriangularFrustumSet::CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const
-{
-  Standard_ASSERT_RAISE (mySelectionType == SelectMgr_SelectionType_Polyline,
-    "Error! SelectMgr_TriangularFrustumSet::CopyWithBuilder() should be called after selection frustum initialization");
-
-  Standard_ASSERT_RAISE (!theBuilder.IsNull(), 
-    "Error! SelectMgr_TriangularFrustumSet::CopyWithBuilder() should be called with valid builder");
-
-  Handle(SelectMgr_TriangularFrustumSet) aRes = new SelectMgr_TriangularFrustumSet();
-  aRes->SetCamera (myCamera);
-  for (SelectMgr_TriangFrustums::Iterator anIter (myFrustums); anIter.More(); anIter.Next())
-  {
-    aRes->myFrustums.Append (Handle(SelectMgr_TriangularFrustum)::DownCast (anIter.Value()->CopyWithBuilder (theBuilder)));
-  }
-  aRes->mySelectionType = mySelectionType;
-  aRes->mySelPolyline = mySelPolyline;
-  aRes->myToAllowOverlap = myToAllowOverlap;
-  aRes->SetBuilder (theBuilder);
-  return aRes;
-}
-
 // =======================================================================
 // function : OverlapsBox
 // purpose  :

src/SelectMgr/SelectMgr_TriangularFrustumSet.hxx

@@ -62,13 +62,6 @@ public:
                                                                                const gp_GTrsf& theTrsf,
                                                                                const Handle(SelectMgr_FrustumBuilder)& theBuilder) const Standard_OVERRIDE;
 
-  //! Returns a copy of the frustum using the given frustum builder configuration.
-  //! Returned frustum should be re-constructed before being used.
-  //! @param theBuilder [in] argument that represents corresponding settings for re-constructing transformed frustum from scratch;
-  //!                        should NOT be NULL.
-  //! @return a copy of the frustum with the input builder assigned
-  Standard_EXPORT virtual Handle(SelectMgr_BaseIntersector) CopyWithBuilder (const Handle(SelectMgr_FrustumBuilder)& theBuilder) const Standard_OVERRIDE;
-
 public:
 
   Standard_EXPORT virtual Standard_Boolean OverlapsBox (const SelectMgr_Vec3& theMinPnt,

src/SelectMgr/SelectMgr_ViewerSelector.cxx

@@ -138,12 +138,12 @@ void SelectMgr_ViewerSelector::updatePoint3d (SelectMgr_SortCriterion& theCriter
     case SelectMgr_TypeOfDepthTolerance_UniformPixels:
     case SelectMgr_TypeOfDepthTolerance_SensitivityFactor:
     {
-      if (theMgr.Camera().IsNull())
+      if (mySelectingVolumeMgr.Camera().IsNull())
       {
         // fallback for an arbitrary projection matrix
         theCriterion.Tolerance = aSensFactor / 33.0;
       }
-      else if (theMgr.Camera()->IsOrthographic())
+      else if (mySelectingVolumeMgr.Camera()->IsOrthographic())
       {
         theCriterion.Tolerance = myCameraScale * aSensFactor;
       }
@@ -634,9 +634,6 @@ void SelectMgr_ViewerSelector::TraverseSensitives (const Standard_Integer theVie
 
   Graphic3d_Vec2i aWinSize;
   mySelectingVolumeMgr.WindowSize (aWinSize.x(), aWinSize.y());
-  const double aPixelSize = aWinSize.x() > 0 && aWinSize.y() > 0
-                          ? Max (1.0 / aWinSize.x(), 1.0 / aWinSize.y())
-                          : 1.0;
 
   const Handle(Graphic3d_Camera)& aCamera = mySelectingVolumeMgr.Camera();
   Graphic3d_Mat4d aProjectionMat, aWorldViewMat;
@@ -649,6 +646,11 @@ void SelectMgr_ViewerSelector::TraverseSensitives (const Standard_Integer theVie
 
     myCameraEye = aCamera->Eye().XYZ();
     myCameraDir = aCamera->Direction().XYZ();
+    myCameraScale = aCamera->IsOrthographic()
+                  ? aCamera->Scale()
+                  : 2.0 * Tan (aCamera->FOVy() * M_PI / 360.0);
+    const double aPixelSize = Max (1.0 / aWinSize.x(), 1.0 / aWinSize.y());
+    myCameraScale *= aPixelSize;
   }
   mySelectableObjects.UpdateBVH (aCamera, aWinSize);
 
@@ -670,8 +672,7 @@ void SelectMgr_ViewerSelector::TraverseSensitives (const Standard_Integer theVie
     // for 2D space selection transform selecting volumes to perform overlap testing
     // directly in camera's eye space omitting the camera position, which is not
     // needed there at all
-    if (aBVHSubset == SelectMgr_SelectableObjectSet::BVHSubset_2dPersistent 
-     || aBVHSubset == SelectMgr_SelectableObjectSet::BVHSubset_ortho2dPersistent)
+    if (aBVHSubset == SelectMgr_SelectableObjectSet::BVHSubset_2dPersistent)
     {
       gp_GTrsf aTFrustum;
       aTFrustum.SetValue (1, 1, aWorldViewMat.GetValue (0, 0));
@@ -687,46 +688,22 @@ void SelectMgr_ViewerSelector::TraverseSensitives (const Standard_Integer theVie
                                             aWorldViewMat.GetValue (1, 3),
                                             aWorldViewMat.GetValue (2, 3)));
 
-      // define corresponding frustum builder parameters for 2d persistence.
+      // define corresponding frustum builder parameters
       Handle(SelectMgr_FrustumBuilder) aBuilder = new SelectMgr_FrustumBuilder();
       Handle(Graphic3d_Camera) aNewCamera = new Graphic3d_Camera();
       aNewCamera->CopyMappingData (aCamera);
       aNewCamera->SetIdentityOrientation();
-      if (aBVHSubset == SelectMgr_SelectableObjectSet::BVHSubset_ortho2dPersistent)
-      {
-        aNewCamera->SetProjectionType (Graphic3d_Camera::Projection_Orthographic);
-      }
       aWorldViewMat = aNewCamera->OrientationMatrix(); // should be identity matrix
       aProjectionMat = aNewCamera->ProjectionMatrix(); // should be the same to aProjectionMat
       aBuilder->SetCamera (aNewCamera);
       aBuilder->SetWindowSize (aWinSize.x(), aWinSize.y());
       aMgr = mySelectingVolumeMgr.ScaleAndTransform (1, aTFrustum, aBuilder);
     }
-    else if (aBVHSubset == SelectMgr_SelectableObjectSet::BVHSubset_ortho3dPersistent)
-    {
-      // define corresponding frustum builder parameters for 3d orthographic persistence.
-      Handle(SelectMgr_FrustumBuilder) aBuilder = new SelectMgr_FrustumBuilder();
-      Handle(Graphic3d_Camera) aNewCamera = new Graphic3d_Camera (*aCamera);
-      aNewCamera->SetProjectionType (Graphic3d_Camera::Projection_Orthographic);
-      aWorldViewMat = aNewCamera->OrientationMatrix(); // should be the same to aWorldViewMat
-      aProjectionMat = aNewCamera->ProjectionMatrix(); // should be orthographic projection
-      aBuilder->SetCamera (aNewCamera);
-      aBuilder->SetWindowSize (aWinSize.x(), aWinSize.y());
-      aMgr = mySelectingVolumeMgr.CopyWithBuilder (aBuilder);
-    }
     else
     {
       aMgr = mySelectingVolumeMgr;
     }
 
-    if (!aMgr.Camera().IsNull())
-    {
-      myCameraScale = aMgr.Camera()->IsOrthographic()
-                   ? aMgr.Camera()->Scale()
-                   : 2.0 * Tan (aMgr.Camera()->FOVy() * M_PI / 360.0);
-      myCameraScale *= aPixelSize;
-    }
-
     const opencascade::handle<BVH_Tree<Standard_Real, 3> >& aBVHTree = mySelectableObjects.BVH (aBVHSubset);
 
     Standard_Integer aNode = 0;

src/SelectMgr/SelectMgr_ViewerSelector.hxx

@@ -328,7 +328,7 @@ protected:
   //! @param theObject [in] the selectable object for traversal.
   //! @param theMgr [in] the (un)transformed copy of the selecting volume manager representing active selection frustum.
   //! @param theCamera, theProjectionMat, theWorldViewMat [in] the source camera and matrices for theMgr given.
-  //! @param theWinSize [in] viewport (window) dimensions for evaluating 
+  //! @param theViewportWidth, theViewportHeight [in] viewport (window) dimensions for evaluating 
   //!        object's transformation persistence.
   Standard_EXPORT void traverseObject (const Handle(SelectMgr_SelectableObject)& theObject,
                                        const SelectMgr_SelectingVolumeManager& theMgr,

src/Standard/Standard_Version.hxx

@@ -35,19 +35,19 @@
 // Primary definitions
 #define OCC_VERSION_MAJOR         7
 #define OCC_VERSION_MINOR         8
-#define OCC_VERSION_MAINTENANCE   1
+#define OCC_VERSION_MAINTENANCE   0
 
 //! This macro must be commented in official release, and set to non-empty 
 //! string in other situations, to identify specifics of the version, e.g.:
 //! - "dev" for development version between releases
 //! - "beta..." or "rc..." for beta releases or release candidates
 //! - "project..." for version containing project-specific fixes
-#define OCC_VERSION_DEVELOPMENT   "dev"
+//#define OCC_VERSION_DEVELOPMENT   "dev"
 
 // Derived (manually): version as real and string (major.minor)
 #define OCC_VERSION               7.8
 #define OCC_VERSION_STRING       "7.8"
-#define OCC_VERSION_COMPLETE     "7.8.1"
+#define OCC_VERSION_COMPLETE     "7.8.0"
 
 //! Derived: extended version as string ("major.minor.maintenance.dev")
 #ifdef OCC_VERSION_DEVELOPMENT

src/StdPrs/StdPrs_ShadedShape.cxx

@@ -192,6 +192,7 @@ namespace
       }
 
       const Standard_Integer aDecal = anArray->VertexNumber();
+      Standard_Real aMaxX = -FLT_MAX, aMinX = FLT_MAX;
       for (Standard_Integer aNodeIter = 1; aNodeIter <= aT->NbNodes(); ++aNodeIter)
       {
         aPoint = aT->Node (aNodeIter);
@@ -199,13 +200,19 @@ namespace
         if ((aFace.Orientation() == TopAbs_REVERSED) ^ isMirrored)
         {
           aNorm.Reverse();
+          if (aT->HasUVNodes())
+          {
+            gp_Pnt2d aTmpPnt = aT->UVNode(aNodeIter);
+            if (aMaxX < aTmpPnt.X()) { aMaxX = aTmpPnt.X(); }
+            if (aMinX > aTmpPnt.X()) { aMinX = aTmpPnt.X(); }
+          }
         }
         if (!aLoc.IsIdentity())
         {
           aPoint.Transform (aTrsf);
           aNorm .Transform (aTrsf);
         }
-
+        
         if (theHasTexels && aT->HasUVNodes())
         {
           const gp_Pnt2d aNode2d = aT->UVNode (aNodeIter);
@@ -221,6 +228,18 @@ namespace
         }
       }
 
+      // changes uvs for reversed faces depending on number of vertex
+      // by flipping the uv coordinates according to face normal
+      if (((aFace.Orientation() == TopAbs_REVERSED) ^ isMirrored) && aT->HasUVNodes())
+      {
+        for (Standard_Integer anIndex = 1; anIndex <= aT->NbNodes(); anIndex++)
+        {
+          gp_Pnt2d aTmpPnt = aT->UVNode (anIndex);
+          aTmpPnt.SetX (aMaxX + aMinX - aTmpPnt.X());
+          aT->SetUVNode (anIndex, aTmpPnt);
+        }
+      }
+
       // Fill array with vertex and edge visibility info
       Standard_Integer anIndex[3];
       for (Standard_Integer aTriIter = 1; aTriIter <= aT->NbTriangles(); ++aTriIter)

src/StepAP214/StepAP214_Protocol.cxx

@@ -158,8 +158,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepShape_GeometricallyBoundedWireframeShapeRepresentation.hxx>
 #include <StepRepr_GlobalUncertaintyAssignedContext.hxx>
 #include <StepRepr_GlobalUnitAssignedContext.hxx>
-#include <StepBasic_GeneralPropertyAssociation.hxx>
-#include <StepBasic_GeneralPropertyRelationship.hxx>
 #include <StepBasic_GroupRelationship.hxx>
 #include <StepShape_HalfSpaceSolid.hxx>
 #include <StepGeom_Hyperbola.hxx>
@@ -641,9 +639,7 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
 #include <StepRepr_CompShAspAndDatumFeatAndShAsp.hxx>
-#include <StepRepr_BooleanRepresentationItem.hxx>
 #include <StepRepr_IntegerRepresentationItem.hxx>
-#include <StepRepr_RealRepresentationItem.hxx>
 #include <StepRepr_ValueRepresentationItem.hxx>
 #include <StepAP242_DraughtingModelItemAssociation.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
@@ -1564,10 +1560,6 @@ StepAP214_Protocol::StepAP214_Protocol ()
   types.Bind(STANDARD_TYPE(StepVisual_CubicBezierTessellatedEdge), 817);
   types.Bind(STANDARD_TYPE(StepVisual_CubicBezierTriangulatedFace), 818);
   types.Bind(STANDARD_TYPE(StepVisual_TriangulatedSurfaceSet), 819);
-  types.Bind(STANDARD_TYPE(StepBasic_GeneralPropertyAssociation), 820);
-  types.Bind(STANDARD_TYPE(StepBasic_GeneralPropertyRelationship), 821);
-  types.Bind(STANDARD_TYPE(StepRepr_BooleanRepresentationItem), 822);
-  types.Bind(STANDARD_TYPE(StepRepr_RealRepresentationItem), 823);
 }