0031431: Visualization, PrsMgr_PresentableObject - simplify HLR computing interface

Multiple PrsMgr_PresentableObject::Compute() methods have been replaced by single one
PrsMgr_PresentableObject::computeHLR().
Dummy implementations of previously declared methods have been removed
from AIS classes not implementng HLR presentation.
Class Prs3d_Projector has been removed and Graphic3d_Camera is now passed directly,
so that redundant dependency from HLRAlgo_Projector in Prs3d interfaces has been eliminated.
StdPrs_HLRShape and StdPrs_HLRPolyShape now implement common interface StdPrs_HLRShapeI.

dox/dev_guides/upgrade/upgrade.md

@@ -1889,6 +1889,11 @@ Unexpected const-ness of Aspect_Window::DoResize() method has been removed, so t
 
 Enumeration BRepOffset_Type is renamed to ChFiDS_TypeOfConcavity.
 
+@subsection upgrade_750_hlrprs Changes in HLR presentation API
+
+Methods computing HLR presentation within *PrsMgr_PresentableObject::Compute()* have been renamed to *PrsMgr_PresentableObject::computeHLR()*
+and now accept *Graphic3d_Camera* object instead of removed *Prs3d_Projector*.
+
 @subsection upgrade_750_sensitiveEntity Select3D_SensitiveEntity interface change
 
 The method Select3D_SensitiveEntity::NbSubElements() has been changed to be constant. Select3D_SensitiveEntity subclasses at application level should be updated accordingly.

samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.h

@@ -18,7 +18,6 @@ public:
 private:
 
   Standard_EXPORT virtual  void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
-  virtual void Compute(const Handle(Prs3d_Projector)& ,const Handle(Prs3d_Presentation)& ) {}
   virtual void ComputeSelection (const Handle(SelectMgr_Selection)& ,const Standard_Integer ) {}
 
 private:

samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.cpp

@@ -104,12 +104,6 @@ void ISession_Direction::Compute (const Handle(PrsMgr_PresentationManager3d)& /*
   }
 }
 
-
-void ISession_Direction::Compute (const Handle(Prs3d_Projector)& /*aProjector*/,
-                                  const Handle(Prs3d_Presentation)& /*aPresentation*/) 
-{
-}
-
 void ISession_Direction::ComputeSelection (const Handle(SelectMgr_Selection)& /*aSelection*/,
                                            const Standard_Integer /*aMode*/) 
 {

samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.h

@@ -33,8 +33,6 @@ private:
     void Compute         (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
                           const Handle(Prs3d_Presentation)& aPresentation,
                           const Standard_Integer aMode);
-    void Compute         (const Handle(Prs3d_Projector)& aProjector,
-                          const Handle(Prs3d_Presentation)& aPresentation) ;
     void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;
 
     gp_Pnt myPnt;

samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.cpp

@@ -50,12 +50,6 @@ void ISession_Point::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPres
     StdPrs_Point::Add(aPresentation,aGeomPoint,myDrawer);
  }
 
-
-void ISession_Point::Compute(const Handle(Prs3d_Projector)& /*aProjector*/,
-                             const Handle(Prs3d_Presentation)& /*aPresentation*/) 
- {
- }
-
 void ISession_Point::ComputeSelection(const Handle(SelectMgr_Selection)& /*aSelection*/, 
 				      const Standard_Integer /*unMode*/)
 {

samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.h

@@ -29,8 +29,6 @@ private :
   void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
                 const Handle(Prs3d_Presentation)& aPresentation,
                 const Standard_Integer aMode);
-  void Compute (const Handle(Prs3d_Projector)& aProjector,
-                const Handle(Prs3d_Presentation)& aPresentation);
 
   void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection,
                         const Standard_Integer unMode);

samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.h

@@ -18,7 +18,6 @@ public:
 private:
 
   Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0);
-  virtual void Compute (const Handle(Prs3d_Projector)& ,const Handle(Prs3d_Presentation)& ) {}
   virtual void ComputeSelection (const Handle(SelectMgr_Selection)& ,const Standard_Integer ) {}
 
 private:

samples/mfc/standard/04_Viewer3d/src/ISession_Curve.cpp

@@ -44,12 +44,6 @@ void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPres
   StdPrs_Curve::Add (aPresentation, anAdaptorCurve, myDrawer);
 }
 
-void ISession_Curve::Compute(const Handle(Prs3d_Projector)& /*aProjector*/,
-                             const Handle(Prs3d_Presentation)& /*aPresentation*/) 
- {
-
- }
-
 void ISession_Curve::ComputeSelection(const Handle(SelectMgr_Selection)& /*aSelection*/,
 				      const Standard_Integer /*aMode*/) 
 { 

samples/mfc/standard/04_Viewer3d/src/ISession_Curve.h

@@ -24,7 +24,6 @@ DEFINE_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
 private:
 
 Standard_EXPORT virtual  void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
-Standard_EXPORT virtual  void Compute(const Handle(Prs3d_Projector)& aProjector,const Handle(Prs3d_Presentation)& aPresentation) ;
 void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;
 
 Handle(Geom_Curve) myCurve;

samples/mfc/standard/06_Ocaf/src/StdAfx.h

@@ -81,7 +81,6 @@
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_IsoAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Prs3d_Text.hxx>
 #include <Quantity_Factor.hxx>
 #include <Quantity_Length.hxx>

samples/mfc/standard/07_Triangulation/src/ISession_Curve.cpp

@@ -44,12 +44,6 @@ void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPres
   StdPrs_Curve::Add (aPresentation, anAdaptorCurve, myDrawer);
 }
 
-void ISession_Curve::Compute(const Handle(Prs3d_Projector)& /*aProjector*/,
-                             const Handle(Prs3d_Presentation)& /*aPresentation*/) 
- {
-
- }
-
 void ISession_Curve::ComputeSelection(const Handle(SelectMgr_Selection)& /*aSelection*/,
 				      const Standard_Integer /*aMode*/) 
 { 

samples/mfc/standard/07_Triangulation/src/ISession_Curve.h

@@ -24,7 +24,6 @@ DEFINE_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
 private:
 
 Standard_EXPORT virtual  void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
-Standard_EXPORT virtual  void Compute(const Handle(Prs3d_Projector)& aProjector,const Handle(Prs3d_Presentation)& aPresentation) ;
 void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;
 
 Handle(Geom_Curve) myCurve;

samples/mfc/standard/08_HLR/src/SelectionDialog.cpp

@@ -8,7 +8,6 @@
 #include "HLRApp.h"
 #include "OCC_2dView.h"
 #include <ISession2D/ISession2D_Shape.h>
-#include "Prs3d_Projector.hxx"
 
 #ifdef _DEBUG
 //#define new DEBUG_NEW
@@ -261,15 +260,15 @@ void CSelectionDialog::Apply()
 
 void CSelectionDialog::UpdateProjector()
 {
-  Standard_Real DX,DY,DZ,XAt,YAt,ZAt, Vx,Vy,Vz ;
+  const Handle(Graphic3d_Camera)& aCam = myActiveView->Camera();
-  myActiveView->Proj(DX,DY,DZ);
+  gp_Dir aBackDir = -aCam->Direction();
-  myActiveView->At(XAt,YAt,ZAt);
+  gp_Dir aXpers   = aCam->Up().Crossed (aBackDir);
-  myActiveView->Up( Vx,Vy,Vz );
+  gp_Ax3 anAx3 (aCam->Center(), aBackDir, aXpers);
+  gp_Trsf aTrsf;
+  aTrsf.SetTransformation (anAx3);
+  HLRAlgo_Projector aProjector (aTrsf, !aCam->IsOrthographic(), aCam->Scale());
+
   OnDisplay(false);
-  Standard_Boolean IsPerspective = (myActiveView->Type() == V3d_PERSPECTIVE);
-  Standard_Real aFocus = 1;
-  Prs3d_Projector aPrs3dProjector(IsPerspective,aFocus,DX,DY,DZ,XAt,YAt,ZAt,Vx,Vy,Vz);
-  HLRAlgo_Projector aProjector = aPrs3dProjector.Projector();
 
   if (myDisplayableShape.IsNull()) return;
   myDisplayableShape->SetProjector(aProjector);

samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.cpp

@@ -44,12 +44,6 @@ void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPres
   StdPrs_Curve::Add (aPresentation, anAdaptorCurve, myDrawer);
 }
 
-void ISession_Curve::Compute(const Handle(Prs3d_Projector)& /*aProjector*/,
-                             const Handle(Prs3d_Presentation)& /*aPresentation*/) 
- {
-
- }
-
 void ISession_Curve::ComputeSelection(const Handle(SelectMgr_Selection)& /*aSelection*/,
 				      const Standard_Integer /*aMode*/) 
 { 

samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.h

@@ -24,7 +24,6 @@ DEFINE_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
 private:
 
 Standard_EXPORT virtual  void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
-Standard_EXPORT virtual  void Compute(const Handle(Prs3d_Projector)& aProjector,const Handle(Prs3d_Presentation)& aPresentation) ;
 void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;
 
 Handle(Geom_Curve) myCurve;

samples/mfc/standard/Common/User_Cylinder.cxx

@@ -291,7 +291,8 @@ case 6: //color
   }
 }
 
-void User_Cylinder::Compute(const Handle(Prs3d_Projector)& aProjector,
+void User_Cylinder::computeHLR (const Handle(Graphic3d_Camera)& aProjector,
+                                const Handle(Geom_Transformation)& ,
                                 const Handle(Prs3d_Presentation)& aPresentation)
 {
   Handle (Prs3d_Drawer) aDefDrawer = GetContext()->DefaultDrawer();
@@ -299,7 +300,8 @@ void User_Cylinder::Compute(const Handle(Prs3d_Projector)& aProjector,
     myDrawer->EnableDrawHiddenLine();
   else
     myDrawer->DisableDrawHiddenLine();
-  StdPrs_HLRPolyShape::Add(aPresentation,myShape,myDrawer,aProjector);
+  StdPrs_HLRPolyShape aTool;
+  aTool.ComputeHLR (aPresentation,myShape,myDrawer,aProjector);
 }
 
 void User_Cylinder::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,

samples/mfc/standard/Common/User_Cylinder.hxx

@@ -8,7 +8,6 @@
 #include <Standard_DefineHandle.hxx>
 #include <Standard_Macro.hxx>
 #include <Graphic3d_AspectFillArea3d.hxx>
-#include <Prs3d_Projector.hxx>
 // Handle definition
 //
 class User_Cylinder;
@@ -31,7 +30,7 @@ private:
 				 const Standard_Integer aMode = 0) ;
 	void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
 						  const Standard_Integer aMode) ;
-	void Compute(const Handle(Prs3d_Projector)& aProjector,const Handle(Prs3d_Presentation)& aPresentation);
+	void computeHLR (const Handle(Graphic3d_Camera)& aProjector, const Handle(Geom_Transformation)& theTrsf, const Handle(Prs3d_Presentation)& aPresentation);
 	Standard_Boolean TriangleIsValid(const gp_Pnt& P1,const gp_Pnt& P2,const gp_Pnt& P3) const;
 	Quantity_Color Color(gp_Pnt& thePoint,Standard_Real AltMin,Standard_Real AltMax, const Standard_Integer ColorizationMode) ;
 						

src/AIS/AIS_AngleDimension.hxx

@@ -27,7 +27,6 @@
 #include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
 #include <Prs3d_DimensionAspect.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Standard.hxx>
 #include <Standard_Macro.hxx>

src/AIS/AIS_Axis.cxx

@@ -31,7 +31,6 @@
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Quantity_Color.hxx>
 #include <Select3D_SensitiveSegment.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -183,12 +182,6 @@ void AIS_Axis::Compute(const Handle(PrsMgr_PresentationManager3d)&,
 
 }
 
-void AIS_Axis::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_Axis::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
-  PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 
@@ -239,16 +232,6 @@ void AIS_Axis::SetWidth(const Standard_Real aValue)
   SynchronizeAspects();
 }
 
-
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning
-//=======================================================================
-void AIS_Axis::Compute(const Handle(Prs3d_Projector)&, 
-		       const Handle(Prs3d_Presentation)&)
-{
-}
-
 //=======================================================================
 //function : ComputeFields
 //purpose  : 

src/AIS/AIS_Axis.hxx

@@ -84,15 +84,6 @@ public:
   //! Returns true if the interactive object accepts the display mode aMode.
   Standard_EXPORT Standard_Boolean AcceptDisplayMode (const Standard_Integer aMode) const Standard_OVERRIDE;
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
   virtual Standard_Integer Signature() const Standard_OVERRIDE { return 2; }
 
   virtual AIS_KindOfInteractive Type() const Standard_OVERRIDE { return AIS_KOI_Datum; }
@@ -109,8 +100,6 @@ private:
 
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
   
   Standard_EXPORT void ComputeFields();

src/AIS/AIS_Chamf2dDimension.cxx

@@ -36,7 +36,6 @@
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Select3D_SensitiveBox.hxx>
 #include <Select3D_SensitiveSegment.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -204,24 +203,6 @@ void AIS_Chamf2dDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
   
   }
 
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning
-//=======================================================================
-
-void AIS_Chamf2dDimension::Compute(const Handle(Prs3d_Projector)& aProjector,
-				   const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_Chamf2dDimension::Compute(const Handle(Prs3d_Projector)&,const Handle(Prs3d_Presentation)&)");
- PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ;
-}
-
-void AIS_Chamf2dDimension::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_Chamf2dDimension::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
-  PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 

src/AIS/AIS_Chamf2dDimension.hxx

@@ -53,21 +53,10 @@ public:
   //! Returns true if the 2d chamfer dimension is movable.
     virtual Standard_Boolean IsMovable() const Standard_OVERRIDE;
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
 private:
   
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
 
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
 
   gp_Pnt myPntAttach;

src/AIS/AIS_Chamf3dDimension.cxx

@@ -35,7 +35,6 @@
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Select3D_SensitiveBox.hxx>
 #include <Select3D_SensitiveSegment.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -178,24 +177,6 @@ void AIS_Chamf3dDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
   
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning
-//=======================================================================
-
-void AIS_Chamf3dDimension::Compute(const Handle(Prs3d_Projector)& aProjector,
-				   const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_Chamf3dDimension::Compute(const Handle(Prs3d_Projector)&,const Handle(Prs3d_Presentation)&)");
- PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ;
-}
-
-void AIS_Chamf3dDimension::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_Chamf3dDimension::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
-  PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 

src/AIS/AIS_Chamf3dDimension.hxx

@@ -51,21 +51,10 @@ public:
   //! Returns true if the 3d chamfer dimension is movable.
     virtual Standard_Boolean IsMovable() const Standard_OVERRIDE;
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
 private:
 
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
 
   gp_Pnt myPntAttach;

src/AIS/AIS_Circle.cxx

@@ -27,7 +27,6 @@
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Quantity_Color.hxx>
 #include <Select3D_SensitiveCircle.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -85,19 +84,6 @@ void AIS_Circle::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresenta
 
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : 
-//=======================================================================
-
-void AIS_Circle::Compute(const Handle(Prs3d_Projector)& aProjector,
-                         const Handle(Geom_Transformation)& aTransformation,
-                         const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_Circle::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
-  PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 
@@ -282,12 +268,3 @@ void AIS_Circle::ComputeArcSelection(const Handle(SelectMgr_Selection)& aSelecti
                                                                        myIsFilledCircleSens);
   aSelection->Add(seg);
 }
-
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning
-//=======================================================================
-void AIS_Circle::Compute(const Handle(Prs3d_Projector)&, 
-                         const Handle(Prs3d_Presentation)&)
-{
-}

src/AIS/AIS_Circle.hxx

@@ -38,15 +38,6 @@ public:
   //! and the type of sensitivity theIsFilledCircleSens.
   Standard_EXPORT AIS_Circle(const Handle(Geom_Circle)& theCircle, const Standard_Real theUStart, const Standard_Real theUEnd, const Standard_Boolean theIsFilledCircleSens = Standard_False);
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   //! Returns index 6 by default.
   virtual Standard_Integer Signature() const Standard_OVERRIDE { return 6; }
 
@@ -103,8 +94,6 @@ private:
 
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
   
   Standard_EXPORT void ComputeCircle (const Handle(Prs3d_Presentation)& aPresentation);

src/AIS/AIS_ConcentricRelation.cxx

@@ -30,7 +30,6 @@
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Select3D_SensitiveCircle.hxx>
 #include <Select3D_SensitiveSegment.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -86,12 +85,6 @@ void AIS_ConcentricRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&
   }  
 }
 
-void AIS_ConcentricRelation::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_ConcentricRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
-  PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
 //=======================================================================
 //function : ComputeTwoEdgesConcentric
 //purpose  : 
@@ -223,16 +216,6 @@ void AIS_ConcentricRelation::ComputeTwoEdgesConcentric(const Handle(Prs3d_Presen
   }
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning
-//=======================================================================
-
-void AIS_ConcentricRelation::Compute(const Handle(Prs3d_Projector)&, 
-				     const Handle(Prs3d_Presentation)&)
-{
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 

src/AIS/AIS_ConcentricRelation.hxx

@@ -42,21 +42,10 @@ public:
   //! relation of concentricity can be extended.
   Standard_EXPORT AIS_ConcentricRelation(const TopoDS_Shape& aFShape, const TopoDS_Shape& aSShape, const Handle(Geom_Plane)& aPlane);
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
 private:
 
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT void ComputeTwoEdgesConcentric (const Handle(Prs3d_Presentation)& aPresentationManager);
   
   Standard_EXPORT void ComputeEdgeVertexConcentric (const Handle(Prs3d_Presentation)& aPresentationManager);

src/AIS/AIS_ConnectedInteractive.cxx

@@ -22,7 +22,7 @@
 #include <NCollection_DataMap.hxx>
 #include <Precision.hxx>
 #include <Prs3d_Drawer.hxx>
-#include <Prs3d_Projector.hxx>
+#include <Prs3d_Presentation.hxx>
 #include <Select3D_SensitiveEntity.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <SelectMgr_Selection.hxx>
@@ -137,42 +137,30 @@ void AIS_ConnectedInteractive::Compute (const Handle(PrsMgr_PresentationManager3
 }
 
 //=======================================================================
-//function : Compute
+//function : computeHLR
 //purpose  :
 //=======================================================================
-void AIS_ConnectedInteractive::Compute (const Handle(Prs3d_Projector)& theProjector,
+void AIS_ConnectedInteractive::computeHLR (const Handle(Graphic3d_Camera)& theProjector,
                                            const Handle(Geom_Transformation)& theTransformation,
                                            const Handle(Prs3d_Presentation)& thePresentation)
 {
-  updateShape (Standard_False);
+  const bool hasTrsf = !theTransformation.IsNull()
+                     && theTransformation->Form() != gp_Identity;
+  updateShape (!hasTrsf);
   if (myShape.IsNull())
   {
     return;
   }
+  if (hasTrsf)
+  {
     const TopLoc_Location& aLocation = myShape.Location();
     TopoDS_Shape aShape = myShape.Located (TopLoc_Location (theTransformation->Trsf()) * aLocation);
-  Compute (theProjector, thePresentation, aShape);
+    AIS_Shape::computeHlrPresentation (theProjector, thePresentation, aShape, myDrawer);
-}
+  }
-
+  else
-//=======================================================================
+  {
-//function : Compute
+    AIS_Shape::computeHlrPresentation (theProjector, thePresentation, myShape, myDrawer);
-//purpose  :
+  }
-//=======================================================================
-void AIS_ConnectedInteractive::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation)
-{
-  updateShape (Standard_True);
-  Compute (aProjector, aPresentation, myShape);
-}
-
-//=======================================================================
-//function : Compute
-//purpose  :
-//=======================================================================
-void AIS_ConnectedInteractive::Compute (const Handle(Prs3d_Projector)& theProjector,
-                                        const Handle(Prs3d_Presentation)& thePrs,
-                                        const TopoDS_Shape& theShape)
-{
-  AIS_Shape::computeHlrPresentation (theProjector, thePrs, theShape, myDrawer);
 }
 
 //=======================================================================

src/AIS/AIS_ConnectedInteractive.hxx

@@ -105,18 +105,10 @@ protected:
   //! a transformation if there's one stored.
   Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode) Standard_OVERRIDE;
 
-  //! Computes the presentation according to a point of view
+  //! Computes the presentation according to a point of view.
-  //! given by <aProjector>.
+  Standard_EXPORT virtual void computeHLR (const Handle(Graphic3d_Camera)& theProjector,
-  //! To be Used when the associated degenerated Presentations
+                                           const Handle(Geom_Transformation)& theTrsf,
-  //! have been transformed by <aTrsf> which is not a Pure
+                                           const Handle(Prs3d_Presentation)& thePrs) Standard_OVERRIDE;
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
-  //! Computes the presentation according to a point of view
-  //! given by <aProjector>.
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
 
   //! Generates sensitive entities by copying
   //! them from myReference selection, creates and sets an entity
@@ -130,10 +122,6 @@ protected:
 
   Standard_EXPORT void updateShape (const Standard_Boolean WithLocation = Standard_True);
 
-  //! Computes the presentation according to a point of view
-  //! given by <aProjector>.
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation, const TopoDS_Shape& aShape);
-
   Standard_EXPORT void connect (const Handle(AIS_InteractiveObject)& theAnotherObj,
                                 const Handle(Geom_Transformation)& theLocation);
 

src/AIS/AIS_EqualDistanceRelation.cxx

@@ -37,7 +37,6 @@
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Select3D_SensitiveBox.hxx>
 #include <Select3D_SensitiveCircle.hxx>
 #include <Select3D_SensitiveSegment.hxx>
@@ -206,33 +205,6 @@ void AIS_EqualDistanceRelation::Compute( const Handle( PrsMgr_PresentationManage
 					myPoint1, myPoint2, myPoint3, myPoint4, myPlane );
 }
 
-
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning at compilation (SUN)
-//=======================================================================
-
-void AIS_EqualDistanceRelation::Compute( const Handle( Prs3d_Projector )& /*aProjector*/,
-					 const Handle( Prs3d_Presentation )& /*aPresentation*/) 
-{
-// throw Standard_NotImplemented("AIS_EqualDistanceRelation::Compute( const Handle( Prs3d_Projector )&,
- // const Handle( Prs3d_Presentation )& )");
-// PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ; 
-}
-
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning at compilation (SUN)
-//=======================================================================
-void AIS_EqualDistanceRelation::Compute(const Handle(Prs3d_Projector)& aProjector, 
-				  const Handle(Geom_Transformation)& aTransformation,
-				  const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_EqualDistanceRelation::Compute(const Handle(Prs3d_Projector)&,
-//  const Handle(Geom_Transformation)&,const Handle(Prs3d_Presentation)&)");
- PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ; 
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 

src/AIS/AIS_EqualDistanceRelation.hxx

@@ -62,15 +62,6 @@ public:
   //! created at construction time.
     const TopoDS_Shape& Shape4() const;
 
-  //! Computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   //! Computes the location of an intreval between
   //! between two edges. FirstAttach , SecondAttach
   //! are the returned extreme points of the interval.
@@ -88,8 +79,6 @@ private:
 
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
 
   TopoDS_Shape myShape3;

src/AIS/AIS_EqualRadiusRelation.cxx

@@ -30,7 +30,6 @@
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Select3D_SensitiveBox.hxx>
 #include <Select3D_SensitiveSegment.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -147,31 +146,6 @@ void AIS_EqualRadiusRelation::Compute( const Handle( PrsMgr_PresentationManager3
 				      myFirstCenter, mySecondCenter, myFirstPoint, mySecondPoint, myPlane );
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning at compilation (SUN)
-//=======================================================================
-
-void AIS_EqualRadiusRelation::Compute( const Handle( Prs3d_Projector )& /*aProjector*/,
-				       const Handle( Prs3d_Presentation )& /*aPresentation*/)
-{
-// throw Standard_NotImplemented("AIS_EqualRadiusRelation::Compute( const Handle( Prs3d_Projector )&,const Handle( Prs3d_Presentation )& )");
-// PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ;
-}
-
-//=======================================================================
-//function : Compute
-//purpose  : 
-//=======================================================================
-
-void AIS_EqualRadiusRelation::Compute(const Handle(Prs3d_Projector)& aProjector,
-                                      const Handle(Geom_Transformation)& aTransformation,
-                                      const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_EqualRadiusRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
- PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 

src/AIS/AIS_EqualRadiusRelation.hxx

@@ -33,21 +33,10 @@ public:
   //! the presentation method projects it onto the plane.
   Standard_EXPORT AIS_EqualRadiusRelation(const TopoDS_Edge& aFirstEdge, const TopoDS_Edge& aSecondEdge, const Handle(Geom_Plane)& aPlane);
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
 private:
 
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
   
   Standard_EXPORT void ComputeRadiusPosition();

src/AIS/AIS_FixRelation.cxx

@@ -37,7 +37,6 @@
 #include <gp_XYZ.hxx>
 #include <Precision.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Select3D_SensitiveSegment.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <SelectMgr_Selection.hxx>
@@ -196,31 +195,6 @@ void AIS_FixRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
 			      myArrowSize);
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning
-//=======================================================================
-
-void AIS_FixRelation::Compute(const Handle(Prs3d_Projector)& aProjector,
-			      const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_FixRelation::Compute(const Handle(Prs3d_Projector)&,const Handle(Prs3d_Presentation)&)");
- PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ; 
-}
-
-//=======================================================================
-//function : Compute
-//purpose  : 
-//=======================================================================
-
-void AIS_FixRelation::Compute(const Handle(Prs3d_Projector)& aProjector,
-                              const Handle(Geom_Transformation)& aTransformation,
-                              const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_FixRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
- PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 

src/AIS/AIS_FixRelation.hxx

@@ -67,22 +67,11 @@ public:
   //! are movable.
   virtual Standard_Boolean IsMovable() const Standard_OVERRIDE { return Standard_True; }
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
 private:
 
   
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
   
   //! computes the presentation for <myFixShape> if it's a

src/AIS/AIS_IdenticRelation.cxx

@@ -36,7 +36,6 @@
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Select3D_SensitiveCurve.hxx>
 #include <Select3D_SensitiveSegment.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -352,23 +351,6 @@ void AIS_IdenticRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
   }
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : 
-//=======================================================================
-void AIS_IdenticRelation::Compute(const Handle(Prs3d_Projector)& aProjector,
-				  const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_IdenticRelation::Compute(const Handle(Prs3d_Projector)&,const Handle(Prs3d_Presentation)&)");
- PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ;
-}
-
-void AIS_IdenticRelation::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_IdenticRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
- PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : function used to compute the selection associated to the 

src/AIS/AIS_IdenticRelation.hxx

@@ -60,15 +60,6 @@ public:
   //! Returns true if the interactive object is movable.
   virtual Standard_Boolean IsMovable() const Standard_OVERRIDE { return Standard_True; }
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
   DEFINE_STANDARD_RTTIEXT(AIS_IdenticRelation,AIS_Relation)
 
 private:
@@ -76,8 +67,6 @@ private:
   
   Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
   
   Standard_EXPORT void ComputeOneEdgeOVertexPresentation (const Handle(Prs3d_Presentation)& aPresentation);

src/AIS/AIS_LengthDimension.hxx

@@ -22,7 +22,6 @@
 #include <gp_Dir.hxx>
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_Drawer.hxx>
-#include <Prs3d_Projector.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Vertex.hxx>
 

src/AIS/AIS_Line.cxx

@@ -29,7 +29,6 @@
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Quantity_Color.hxx>
 #include <Select3D_SensitiveSegment.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -78,11 +77,6 @@ void AIS_Line::Compute(const Handle(PrsMgr_PresentationManager3d)&,
 
 }
 
-void AIS_Line::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation)
-{
-  PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation) ;
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 
@@ -288,16 +282,3 @@ void AIS_Line::ComputeSegmentLineSelection(const Handle(SelectMgr_Selection)& aS
 									myEndPoint->Pnt());
   aSelection->Add(seg);
 }
-
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning
-//=======================================================================
-void AIS_Line::Compute(const Handle(Prs3d_Projector)&, 
-			  const Handle(Prs3d_Presentation)&)
-{
-}
-
-
-
-

src/AIS/AIS_Line.hxx

@@ -37,15 +37,6 @@ public:
   //! and a finishing point aEndPoint for the line.
   Standard_EXPORT AIS_Line(const Handle(Geom_Point)& aStartPoint, const Handle(Geom_Point)& aEndPoint);
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
   //! Returns the signature 5.
   virtual Standard_Integer Signature() const Standard_OVERRIDE { return 5; }
 
@@ -95,8 +86,6 @@ private:
   
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
   
   Standard_EXPORT void ComputeInfiniteLine (const Handle(Prs3d_Presentation)& aPresentation);

src/AIS/AIS_MaxRadiusDimension.cxx

@@ -43,7 +43,6 @@
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Prs3d_Text.hxx>
 #include <Prs3d_TextAspect.hxx>
 #include <Select3D_SensitiveBox.hxx>
@@ -118,32 +117,6 @@ void AIS_MaxRadiusDimension::Compute(const Handle(PrsMgr_PresentationManager3d)&
     ComputeEllipse(aPresentation);
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning
-//=======================================================================
-
-void  AIS_MaxRadiusDimension::Compute(const Handle(Prs3d_Projector)& aProjector,
-                                      const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_MaxRadiusDimension::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation)");
- PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ;
-}
-
-//=======================================================================
-//function : Compute
-//purpose  : 
-//=======================================================================
-
-void AIS_MaxRadiusDimension::Compute(const Handle(Prs3d_Projector)& aProjector,
-                                     const Handle(Geom_Transformation)& aTransformation,
-                                     const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_MaxRadiusDimension::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
- PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
-
 //=======================================================================
 //function : ComputeEllipse
 //purpose  : 

src/AIS/AIS_MaxRadiusDimension.hxx

@@ -38,21 +38,10 @@ public:
   //! Shape  can  be  edge  ,  planar  face  or  cylindrical  face
   Standard_EXPORT AIS_MaxRadiusDimension(const TopoDS_Shape& aShape, const Standard_Real aVal, const TCollection_ExtendedString& aText, const gp_Pnt& aPosition, const DsgPrs_ArrowSide aSymbolPrs, const Standard_Real anArrowSize = 0.0);
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
 private:
 
   Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
   
   Standard_EXPORT void ComputeEllipse (const Handle(Prs3d_Presentation)& aPresentation);

src/AIS/AIS_MidPointRelation.cxx

@@ -41,7 +41,6 @@
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Select3D_SensitiveCurve.hxx>
 #include <Select3D_SensitiveSegment.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -137,25 +136,6 @@ void AIS_MidPointRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
     }
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning at compilation (SUN)
-//=======================================================================
-void AIS_MidPointRelation::Compute(const Handle(Prs3d_Projector)& /*aProjector*/,
-				   const Handle(Prs3d_Presentation)& /*aPresentation*/)
-{
-// throw Standard_NotImplemented("AIS_MidPointRelation::Compute(const Handle(Prs3d_Projector)&,const Handle(Prs3d_Presentation)&)");
-// PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ;
-}
-
-void AIS_MidPointRelation::Compute(const Handle(Prs3d_Projector)&,
-				   const Handle(Geom_Transformation)&,
-				   const Handle(Prs3d_Presentation)&)
-{
- throw Standard_NotImplemented("AIS_MidPointRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
-// PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 

src/AIS/AIS_MidPointRelation.hxx

@@ -40,21 +40,10 @@ public:
   
     const TopoDS_Shape& GetTool() const;
 
-  //! Computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
 private:
 
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
   
   Standard_EXPORT void ComputeFaceFromPnt (const Handle(Prs3d_Presentation)& aprs, const Standard_Boolean first);

src/AIS/AIS_MinRadiusDimension.cxx

@@ -43,7 +43,6 @@
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Prs3d_Text.hxx>
 #include <Prs3d_TextAspect.hxx>
 #include <Select3D_SensitiveBox.hxx>
@@ -118,31 +117,6 @@ void AIS_MinRadiusDimension::Compute(const Handle(PrsMgr_PresentationManager3d)&
     ComputeEllipse(aPresentation);
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning
-//=======================================================================
-
-void  AIS_MinRadiusDimension::Compute(const Handle(Prs3d_Projector)& aProjector,
-                                      const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_MinRadiusDimension::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation)");
- PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ;
-}
-
-//=======================================================================
-//function : Compute
-//purpose  : 
-//=======================================================================
-
-void AIS_MinRadiusDimension::Compute(const Handle(Prs3d_Projector)& aProjector,
-                                     const Handle(Geom_Transformation)& aTransformation,
-                                     const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_MinRadiusDimension::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
- PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
 //=======================================================================
 //function : ComputeEllipse
 //purpose  : 

src/AIS/AIS_MinRadiusDimension.hxx

@@ -38,21 +38,10 @@ public:
   //! Shape  can  be  edge  ,  planar  face  or  cylindrical  face
   Standard_EXPORT AIS_MinRadiusDimension(const TopoDS_Shape& aShape, const Standard_Real aVal, const TCollection_ExtendedString& aText, const gp_Pnt& aPosition, const DsgPrs_ArrowSide aSymbolPrs, const Standard_Real anArrowSize = 0.0);
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
 private:
   
   Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
   
   Standard_EXPORT void ComputeEllipse (const Handle(Prs3d_Presentation)& aPresentation);

src/AIS/AIS_MultipleConnectedInteractive.cxx

@@ -19,7 +19,6 @@
 #include <AIS_ConnectedInteractive.hxx>
 #include <AIS_InteractiveContext.hxx>
 #include <AIS_InteractiveObject.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Select3D_SensitiveEntity.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <Standard_NotImplemented.hxx>
@@ -159,29 +158,6 @@ void AIS_MultipleConnectedInteractive::Compute (const Handle(PrsMgr_Presentation
   }
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : 
-//=======================================================================
-
-void AIS_MultipleConnectedInteractive::Compute(const Handle(Prs3d_Projector)& aProjector,
-                                               const Handle(Prs3d_Presentation)& aPresentation)
-{
-  PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ;
-}
-
-//=======================================================================
-//function : Compute
-//purpose  : 
-//=======================================================================
-
-void AIS_MultipleConnectedInteractive::Compute(const Handle(Prs3d_Projector)& aProjector,
-                                               const Handle(Geom_Transformation)& aTransformation,
-                                               const Handle(Prs3d_Presentation)& aPresentation)
-{
-  PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
 //=======================================================================
 //function : AcceptShapeDecomposition
 //purpose  : 

src/AIS/AIS_MultipleConnectedInteractive.hxx

@@ -57,17 +57,6 @@ public:
   //! Clears all the connections to objects.
   Standard_EXPORT void DisconnectAll();
   
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   //! Informs the graphic context that the interactive Object
   //! may be decomposed into sub-shapes for dynamic selection.
   Standard_EXPORT virtual Standard_Boolean AcceptShapeDecomposition() const Standard_OVERRIDE;

src/AIS/AIS_OffsetDimension.cxx

@@ -41,7 +41,6 @@
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Select3D_SensitiveBox.hxx>
 #include <Select3D_SensitiveSegment.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -132,26 +131,6 @@ void AIS_OffsetDimension::Compute(const Handle(PrsMgr_PresentationManager3d)&,
   }  
 }
 
-
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning at compilation (SUN)
-//=======================================================================
-void AIS_OffsetDimension::Compute(const Handle(Prs3d_Projector)& /*aProjector*/,
-				  const Handle(Prs3d_Presentation)& /*aPresentation*/)
-{
-// throw Standard_NotImplemented("AIS_OffsetDimension::Compute(const Handle(Prs3d_Projector)& aProjector,const Handle(Prs3d_Presentation)& aPresentation)");
-// PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ;
-}
-
-void AIS_OffsetDimension::Compute(const Handle(Prs3d_Projector)& aProjector, 
-				  const Handle(Geom_Transformation)& aTransformation,
-				  const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_OffsetDimension::Compute(const Handle(Prs3d_Projector)&,const Handle(Geom_Transformation)&,const Handle(Prs3d_Presentation)&)");
- PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 

src/AIS/AIS_OffsetDimension.hxx

@@ -37,16 +37,6 @@ public:
   //! dimension aVal, and the text aText.
   Standard_EXPORT AIS_OffsetDimension(const TopoDS_Shape& FistShape, const TopoDS_Shape& SecondShape, const Standard_Real aVal, const TCollection_ExtendedString& aText);
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
-
   //! Indicates that the dimension we are concerned with is an offset.
     virtual AIS_KindOfDimension KindOfDimension() const Standard_OVERRIDE;
   
@@ -61,8 +51,6 @@ private:
 
   Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
   
   Standard_EXPORT void ComputeTwoFacesOffset (const Handle(Prs3d_Presentation)& aPresentation, const gp_Trsf& aTrsf);

src/AIS/AIS_ParallelRelation.cxx

@@ -38,7 +38,6 @@
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Select3D_SensitiveBox.hxx>
 #include <Select3D_SensitiveSegment.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -116,23 +115,6 @@ void AIS_ParallelRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
     }
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning
-//=======================================================================
-void AIS_ParallelRelation::Compute(const Handle(Prs3d_Projector)& aProjector,
-				   const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_ParallelRelation::Compute(const Handle(Prs3d_Projector)&,const Handle(Prs3d_Presentation)&)");
-  PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ;
-}
-
-void AIS_ParallelRelation::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_ParallelRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
-  PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 

src/AIS/AIS_ParallelRelation.hxx

@@ -46,21 +46,10 @@ public:
   //! Returns true if the parallelism is movable.
     virtual Standard_Boolean IsMovable() const Standard_OVERRIDE;
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
 private:
 
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
   
   Standard_EXPORT void ComputeTwoFacesParallel (const Handle(Prs3d_Presentation)& aPresentation);

src/AIS/AIS_PerpendicularRelation.cxx

@@ -38,7 +38,6 @@
 #include <IntAna2d_IntPoint.hxx>
 #include <Precision.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Select3D_SensitiveSegment.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <SelectMgr_Selection.hxx>
@@ -107,23 +106,6 @@ void AIS_PerpendicularRelation::Compute(const Handle(PrsMgr_PresentationManager3
   // Cas pas traite - Edge/Face
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning
-//=======================================================================
-void AIS_PerpendicularRelation::Compute(const Handle(Prs3d_Projector)& aProjector,
-					const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_PerpendicularRelation::Compute(const Handle(Prs3d_Projector)&,const Handle(Prs3d_Presentation)&)");
- PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ;
-}
-
-void AIS_PerpendicularRelation::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_PerpendicularRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
- PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 

src/AIS/AIS_PerpendicularRelation.hxx

@@ -44,22 +44,11 @@ public:
   //! second shape aSShape.
   Standard_EXPORT AIS_PerpendicularRelation(const TopoDS_Shape& aFShape, const TopoDS_Shape& aSShape);
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
 private:
 
   
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
 
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
   
   Standard_EXPORT void ComputeTwoFacesPerpendicular (const Handle(Prs3d_Presentation)& aPresentation);

src/AIS/AIS_Plane.cxx

@@ -39,7 +39,6 @@
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_PlaneAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Prs3d_ShadingAspect.hxx>
 #include <Quantity_Color.hxx>
 #include <Select3D_SensitiveTriangulation.hxx>
@@ -286,11 +285,6 @@ void AIS_Plane::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
   }
 }
 
-void AIS_Plane::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation)
-{
-  PrsMgr_PresentableObject::Compute(aProjector, aTransformation, aPresentation);
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 
@@ -529,15 +523,6 @@ void AIS_Plane::ComputeFrame()
   }
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning
-//=======================================================================
-void AIS_Plane::Compute(const Handle(Prs3d_Projector)&, 
-			   const Handle(Prs3d_Presentation)&)
-{
-}
-
 //=======================================================================
 //function : ComputeFields
 //purpose  : 

src/AIS/AIS_Plane.hxx

@@ -132,15 +132,6 @@ public:
   //! Sets the type of sensitivity for the plane.
   void SetTypeOfSensitivity (Select3D_TypeOfSensitivity theTypeOfSensitivity) { myTypeOfSensitivity = theTypeOfSensitivity; }
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, const Standard_Integer theMode) Standard_OVERRIDE;
 
   Standard_EXPORT void SetColor (const Quantity_Color& aColor) Standard_OVERRIDE;
@@ -151,8 +142,6 @@ private:
 
   Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT void ComputeFrame();
   
   Standard_EXPORT void ComputeFields();

src/AIS/AIS_PlaneTrihedron.cxx

@@ -42,7 +42,6 @@
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Quantity_Color.hxx>
 #include <Select3D_SensitivePoint.hxx>
 #include <Select3D_SensitiveSegment.hxx>
@@ -181,12 +180,6 @@ void AIS_PlaneTrihedron::Compute(const Handle(PrsMgr_PresentationManager3d)&,
   aPresentation->SetInfiniteState (Standard_True);
 }
 
-void AIS_PlaneTrihedron::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_PlaneTrihedron::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
- PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation) ;
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 
@@ -251,13 +244,6 @@ void AIS_PlaneTrihedron::SetColor(const Quantity_Color &aCol)
   SynchronizeAspects();
 }
 
-
-void AIS_PlaneTrihedron::Compute(const Handle(Prs3d_Projector)&, 
-			       const Handle(Prs3d_Presentation)&)
-{
-}
-
-
 //=======================================================================
 //function : ExtremityPoints
 //purpose  : to avoid warning

src/AIS/AIS_PlaneTrihedron.hxx

@@ -74,15 +74,6 @@ public:
   //! Returns true if the display mode selected, aMode, is valid.
   Standard_EXPORT Standard_Boolean AcceptDisplayMode (const Standard_Integer aMode) const Standard_OVERRIDE;
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   virtual Standard_Integer Signature() const Standard_OVERRIDE { return 4; }
 
   //! Returns datum as the type of Interactive Object.
@@ -101,8 +92,6 @@ protected:
 
 private:
 
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
   Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
 
 private:

src/AIS/AIS_Point.cxx

@@ -28,7 +28,6 @@
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_PointAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Quantity_Color.hxx>
 #include <Select3D_SensitivePoint.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -102,19 +101,6 @@ void AIS_Point::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
     
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : 
-//=======================================================================
-
-void AIS_Point::Compute(const Handle(Prs3d_Projector)& aProjector,
-                        const Handle(Geom_Transformation)& aTransformation,
-                        const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_Point::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
- PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation) ;
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 
@@ -160,16 +146,6 @@ TopoDS_Vertex AIS_Point::Vertex() const
   return BRepBuilderAPI_MakeVertex(P);
 }
 
-
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning
-//=======================================================================
-void AIS_Point::Compute(const Handle(Prs3d_Projector)&, 
-			   const Handle(Prs3d_Presentation)&)
-{
-}
-
 //=======================================================================
 //function : SetMarker
 //purpose  : 

src/AIS/AIS_Point.hxx

@@ -49,15 +49,6 @@ public:
   //! Returns true if the display mode selected is valid for point datums.
   Standard_EXPORT Standard_Boolean AcceptDisplayMode (const Standard_Integer aMode) const Standard_OVERRIDE;
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
   //! Allows you to provide settings for the Color.
   Standard_EXPORT virtual void SetColor (const Quantity_Color& theColor) Standard_OVERRIDE;
 
@@ -85,8 +76,6 @@ protected:
 
 private:
 
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
   Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
 
   Standard_EXPORT void UpdatePointValues();

src/AIS/AIS_Shape.cxx

@@ -43,7 +43,6 @@
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_IsoAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Prs3d_Root.hxx>
 #include <Prs3d_ShadingAspect.hxx>
 #include <StdPrs_BndBox.hxx>
@@ -224,7 +223,7 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
 //function : computeHlrPresentation
 //purpose  :
 //=======================================================================
-void AIS_Shape::computeHlrPresentation (const Handle(Prs3d_Projector)& theProjector,
+void AIS_Shape::computeHlrPresentation (const Handle(Graphic3d_Camera)& theProjector,
                                         const Handle(Prs3d_Presentation)& thePrs,
                                         const TopoDS_Shape& theShape,
                                         const Handle(Prs3d_Drawer)& theDrawer)
@@ -282,14 +281,20 @@ void AIS_Shape::computeHlrPresentation (const Handle(Prs3d_Projector)& theProjec
       switch (theDrawer->TypeOfHLR())
       {
         case Prs3d_TOH_Algo:
-          StdPrs_HLRShape::Add (thePrs, theShape, theDrawer, theProjector);
+        {
+          StdPrs_HLRShape aBuilder;
+          aBuilder.ComputeHLR (thePrs, theShape, theDrawer, theProjector);
           break;
+        }
         case Prs3d_TOH_PolyAlgo:
-        default:
+        case Prs3d_TOH_NotSet:
-          StdPrs_HLRPolyShape::Add (thePrs, theShape, theDrawer, theProjector);
+        {
+          StdPrs_HLRPolyShape aBuilder;
+          aBuilder.ComputeHLR (thePrs, theShape, theDrawer, theProjector);
           break;
         }
       }
+    }
     catch (Standard_Failure const& anException)
     {
       Message::DefaultMessenger()->Send (TCollection_AsciiString()

src/AIS/AIS_Shape.hxx

@@ -282,21 +282,22 @@ protected:
                                         const Standard_Integer theMode) Standard_OVERRIDE;
 
   //! Compute projected presentation.
-  virtual void Compute (const Handle(Prs3d_Projector)& theProjector,
+  virtual void computeHLR (const Handle(Graphic3d_Camera)& theProjector,
-                        const Handle(Prs3d_Presentation)& thePrs) Standard_OVERRIDE
-  {
-    computeHlrPresentation (theProjector, thePrs, myshape, myDrawer);
-  }
-
-  //! Compute projected presentation with transformation.
-  virtual void Compute (const Handle(Prs3d_Projector)& theProjector,
                            const Handle(Geom_Transformation)& theTrsf,
                            const Handle(Prs3d_Presentation)& thePrs) Standard_OVERRIDE
+  {
+    if (!theTrsf.IsNull()
+      && theTrsf->Form() != gp_Identity)
     {
       const TopLoc_Location& aLoc = myshape.Location();
       const TopoDS_Shape aShape = myshape.Located (TopLoc_Location (theTrsf->Trsf()) * aLoc);
       computeHlrPresentation (theProjector, thePrs, aShape, myDrawer);
     }
+    else
+    {
+      computeHlrPresentation (theProjector, thePrs, myshape, myDrawer);
+    }
+  }
 
   //! Compute selection.
   Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection,
@@ -320,7 +321,7 @@ protected:
 public:
 
   //! Compute HLR presentation for specified shape.
-  Standard_EXPORT static void computeHlrPresentation (const Handle(Prs3d_Projector)& theProjector,
+  Standard_EXPORT static void computeHlrPresentation (const Handle(Graphic3d_Camera)& theProjector,
                                                       const Handle(Prs3d_Presentation)& thePrs,
                                                       const TopoDS_Shape& theShape,
                                                       const Handle(Prs3d_Drawer)& theDrawer);

src/AIS/AIS_SymmetricRelation.cxx

@@ -39,7 +39,6 @@
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Select3D_SensitiveBox.hxx>
 #include <Select3D_SensitiveSegment.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -121,25 +120,6 @@ void AIS_SymmetricRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
   }
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning at compilation (SUN)
-//=======================================================================
-void AIS_SymmetricRelation::Compute(const Handle(Prs3d_Projector)& /*aProjector*/,
-				    const Handle(Prs3d_Presentation)& /*aPresentation*/)
-{
-// throw Standard_NotImplemented("AIS_SymmetricRelation::Compute(const Handle(Prs3d_Projector)&,const Handle(Prs3d_Presentation)&)");
-// PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ;
-}
-
-void AIS_SymmetricRelation::Compute(const Handle(Prs3d_Projector)&,
-                                    const Handle(Geom_Transformation)&,
-                                    const Handle(Prs3d_Presentation)&)
-{
- throw Standard_NotImplemented("AIS_SymmetricRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
-// PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 

src/AIS/AIS_SymmetricRelation.hxx

@@ -55,21 +55,10 @@ public:
   //! shape, and a plane. This tool is created at construction time.
     const TopoDS_Shape& GetTool() const;
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
 private:
 
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
   
   Standard_EXPORT void ComputeTwoFacesSymmetric (const Handle(Prs3d_Presentation)& aprs);

src/AIS/AIS_TangentRelation.cxx

@@ -37,7 +37,6 @@
 #include <gp_Vec.hxx>
 #include <Precision.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Select3D_SensitiveSegment.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <SelectMgr_Selection.hxx>
@@ -113,25 +112,6 @@ void AIS_TangentRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
     }
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : to avoid warning
-//=======================================================================
-void AIS_TangentRelation::Compute(const Handle(Prs3d_Projector)& aProjector,
-				  const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_TangentRelation::Compute(const Handle(Prs3d_Projector)&,const Handle(Prs3d_Presentation)&)");
-  PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ;
-}
-
-void AIS_TangentRelation::Compute(const Handle(Prs3d_Projector)& aProjector,
-				  const Handle(Geom_Transformation)& aTransformation,
-				  const Handle(Prs3d_Presentation)& aPresentation)
-{
-// throw Standard_NotImplemented("AIS_TangentRelation::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
-  PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  : 

src/AIS/AIS_TangentRelation.hxx

@@ -53,21 +53,10 @@ public:
   //! This reference is initially defined at construction time.
   Standard_EXPORT void SetExternRef (const Standard_Integer aRef);
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
 private:
 
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
   Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
   
   Standard_EXPORT void ComputeTwoFacesTangent (const Handle(Prs3d_Presentation)& aPresentation);

src/AIS/AIS_Trihedron.cxx

@@ -34,7 +34,6 @@
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_PointAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Prs3d_ShadingAspect.hxx>
 #include <Prs3d_Text.hxx>
 #include <Prs3d_TextAspect.hxx>
@@ -200,17 +199,6 @@ void AIS_Trihedron::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsM
   computePresentation (thePrsMgr, thePrs);
 }
 
-//=======================================================================
-//function : Compute
-//purpose  :
-//=======================================================================
-void AIS_Trihedron::Compute (const Handle(Prs3d_Projector)& theProjector,
-                             const Handle(Geom_Transformation)& theTrsf,
-                             const Handle(Prs3d_Presentation)& thePrs)
-{
-  PrsMgr_PresentableObject::Compute (theProjector, theTrsf, thePrs);
-}
-
 //=======================================================================
 //function : ComputeSelection
 //purpose  :

src/AIS/AIS_Trihedron.hxx

@@ -207,14 +207,6 @@ protected:
                                 const Handle(Prs3d_Presentation)& thePrs,
                                 const Standard_Integer theMode) Standard_OVERRIDE;
 
-  //! This compute is unavailable for trihedron presentation.
-  void Compute (const Handle(Prs3d_Projector)& , const Handle(Prs3d_Presentation)& ) Standard_OVERRIDE {}
-
-  //! This compute is unavailable for trihedron presentation.
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& theProjector,
-                                        const Handle(Geom_Transformation)& theTrsf,
-                                        const Handle(Prs3d_Presentation)& thePrs) Standard_OVERRIDE;
-
   //! Compute selection.
   Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection,
                                                  const Standard_Integer theMode) Standard_OVERRIDE;

src/Graphic3d/Graphic3d_CView.cxx

@@ -218,7 +218,8 @@ void Graphic3d_CView::SetComputedMode (const Standard_Boolean theMode)
     }
     else
     {
-      Handle(Graphic3d_Structure) aCompStruct = aStruct->IsTransformed() ? aStruct->Compute (this, aStruct->Transformation()) : aStruct->Compute (this);
+      Handle(Graphic3d_Structure) aCompStruct;
+      aStruct->computeHLR (myCamera, aCompStruct);
       aCompStruct->SetHLRValidation (Standard_True);
 
       const Standard_Boolean toComputeWireframe = myVisualization == Graphic3d_TOV_WIREFRAME
@@ -298,8 +299,7 @@ void Graphic3d_CView::ReCompute (const Handle(Graphic3d_Structure)& theStruct)
   Handle(Graphic3d_Structure) aCompStructOld = myStructsComputed.ChangeValue (anIndex);
   Handle(Graphic3d_Structure) aCompStruct    = aCompStructOld;
   aCompStruct->SetTransformation (Handle(Geom_Transformation)());
-  theStruct->IsTransformed() ? theStruct->Compute (this, theStruct->Transformation(), aCompStruct)
+  theStruct->computeHLR (myCamera, aCompStruct);
-                             : theStruct->Compute (this,                              aCompStruct);
   aCompStruct->SetHLRValidation (Standard_True);
   aCompStruct->CalculateBoundBox();
 
@@ -769,21 +769,8 @@ void Graphic3d_CView::Display (const Handle(Graphic3d_Structure)& theStructure)
   {
     aStruct = myStructsComputed.Value (anIndex);
     aStruct->SetTransformation (Handle(Geom_Transformation)());
-    if (theStructure->IsTransformed())
-    {
-      theStructure->Compute (this, theStructure->Transformation(), aStruct);
-    }
-    else
-    {
-      theStructure->Compute (this, aStruct);
-    }
-  }
-  else
-  {
-    aStruct = theStructure->IsTransformed()
-            ? theStructure->Compute (this, theStructure->Transformation())
-            : theStructure->Compute (this);
   }
+  theStructure->computeHLR (myCamera, aStruct);
 
   aStruct->SetHLRValidation (Standard_True);
 

src/Graphic3d/Graphic3d_CView.hxx

@@ -90,7 +90,7 @@ public:
   Standard_Boolean IsRemoved() const { return myIsRemoved; }
 
   //! Returns camera object of the view.
-  virtual const Handle(Graphic3d_Camera)& Camera() const { return myCamera; }
+  virtual const Handle(Graphic3d_Camera)& Camera() const Standard_OVERRIDE { return myCamera; }
 
   //! Sets camera used by the view.
   virtual void SetCamera (const Handle(Graphic3d_Camera)& theCamera) { myCamera = theCamera; }

src/Graphic3d/Graphic3d_DataStructureManager.hxx

@@ -21,6 +21,7 @@
 
 #include <Standard_Transient.hxx>
 
+class Graphic3d_Camera;
 
 class Graphic3d_DataStructureManager;
 DEFINE_STANDARD_HANDLE(Graphic3d_DataStructureManager, Standard_Transient)
@@ -31,30 +32,15 @@ DEFINE_STANDARD_HANDLE(Graphic3d_DataStructureManager, Standard_Transient)
 //! It defines the global attributes.
 class Graphic3d_DataStructureManager : public Standard_Transient
 {
-
-public:
-
   DEFINE_STANDARD_RTTIEXT(Graphic3d_DataStructureManager,Standard_Transient)
-
 protected:
 
-  
   //! Initializes the manager <me>.
   Standard_EXPORT Graphic3d_DataStructureManager();
 
-
+  //! Returns camera object of the view.
-
+  virtual const Handle(Graphic3d_Camera)& Camera() const = 0;
-private:
-
-
-
 
 };
 
-
-
-
-
-
-
 #endif // _Graphic3d_DataStructureManager_HeaderFile

src/Graphic3d/Graphic3d_Structure.hxx

@@ -175,39 +175,13 @@ public:
   }
 
   //! Returns the new Structure defined for the new visualization
-  virtual Handle(Graphic3d_Structure) Compute (const Handle(Graphic3d_DataStructureManager)& theProjector)
+  virtual void computeHLR (const Handle(Graphic3d_Camera)& theProjector,
-  {
-    (void )theProjector;
-    return this;
-  }
-  
-  //! Returns the new Structure defined for the new visualization
-  virtual Handle(Graphic3d_Structure) Compute (const Handle(Graphic3d_DataStructureManager)& theProjector,
-                                               const Handle(Geom_Transformation)& theTrsf)
-  {
-    (void )theProjector;
-    (void )theTrsf;
-    return this;
-  }
-
-  //! Returns the new Structure defined for the new visualization
-  virtual void Compute (const Handle(Graphic3d_DataStructureManager)& theProjector,
                            Handle(Graphic3d_Structure)& theStructure)
   {
     (void )theProjector;
     (void )theStructure;
   }
 
-  //! Returns the new Structure defined for the new visualization
-  virtual void Compute (const Handle(Graphic3d_DataStructureManager)& theProjector,
-                        const Handle(Geom_Transformation)& theTrsf,
-                        Handle(Graphic3d_Structure)& theStructure)
-  {
-    (void )theProjector;
-    (void )theTrsf;
-    (void )theStructure;
-  }
-
   //! Forces a new construction of the structure <me>
   //! if <me> is displayed and TOS_COMPUTED.
   Standard_EXPORT void ReCompute();

src/Prs3d/FILES

@@ -35,8 +35,6 @@ Prs3d_PointAspect.hxx
 Prs3d_Presentation.hxx
 Prs3d_PresentationShadow.cxx
 Prs3d_PresentationShadow.hxx
-Prs3d_Projector.cxx
-Prs3d_Projector.hxx
 Prs3d_Root.hxx
 Prs3d_ShadingAspect.cxx
 Prs3d_ShadingAspect.hxx

src/Prs3d/Prs3d_Projector.cxx

@@ -1,57 +0,0 @@
-// Copyright (c) 1995-1999 Matra Datavision
-// Copyright (c) 1999-2014 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 <gp_Ax3.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Trsf.hxx>
-#include <HLRAlgo_Projector.hxx>
-#include <Prs3d_Projector.hxx>
-#include <Standard_Type.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(Prs3d_Projector,Standard_Transient)
-
-Prs3d_Projector::Prs3d_Projector (const HLRAlgo_Projector& HLPr): MyProjector(HLPr)
-{}
-
-
-
-Prs3d_Projector::Prs3d_Projector (const Standard_Boolean Pers,
-				const Standard_Real Focus,
-			        const Standard_Real DX,
-			        const Standard_Real DY,
-			        const Standard_Real DZ,
-			        const Standard_Real XAt,
-			        const Standard_Real YAt,
-			        const Standard_Real ZAt,
-			        const Standard_Real XUp,
-			        const Standard_Real YUp,
-			        const Standard_Real ZUp) 
-{
-  gp_Pnt At (XAt,YAt,ZAt);
-  gp_Dir Zpers (DX,DY,DZ);
-  gp_Dir Ypers (XUp,YUp,ZUp);
-  gp_Dir Xpers = Ypers.Crossed(Zpers);
-  gp_Ax3 Axe (At, Zpers, Xpers);
-  gp_Trsf T;
-  T.SetTransformation(Axe);
-  MyProjector = HLRAlgo_Projector(T,Pers,Focus);
-}
-
-
-HLRAlgo_Projector Prs3d_Projector::Projector () const 
-{
-  return MyProjector;
-}

src/Prs3d/Prs3d_Projector.hxx

@@ -1,64 +0,0 @@
-// Created on: 1993-03-19
-// Created by: Jean-Louis FRENKEL
-// Copyright (c) 1993-1999 Matra Datavision
-// Copyright (c) 1999-2014 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 _Prs3d_Projector_HeaderFile
-#define _Prs3d_Projector_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
-#include <HLRAlgo_Projector.hxx>
-#include <Standard_Transient.hxx>
-#include <Standard_Boolean.hxx>
-
-class Prs3d_Projector;
-DEFINE_STANDARD_HANDLE(Prs3d_Projector, Standard_Transient)
-
-//! A projector object.
-//! This object defines the parameters of a view for a
-//! visualization algorithm. It is, for example, used by the
-//! hidden line removal algorithms.
-class Prs3d_Projector : public Standard_Transient
-{
-
-public:
-
-  
-  Standard_EXPORT Prs3d_Projector(const HLRAlgo_Projector& Pr);
-  
-  //! Constructs a projector framework from the following parameters
-  //! -   Pers is true if the view is a perspective view and
-  //! false if it is an axonometric one;
-  //! -   Focus is the focal length if a perspective view is defined;
-  //! -   DX, DY and DZ are the coordinates of the
-  //! projection vector;
-  //! -   XAt, YAt and ZAt are the coordinates of the view point;
-  //! -   XUp, YUp and ZUp are the coordinates of the
-  //! vertical direction vector.
-  Standard_EXPORT Prs3d_Projector(const Standard_Boolean Pers, const Standard_Real Focus, const Standard_Real DX, const Standard_Real DY, const Standard_Real DZ, const Standard_Real XAt, const Standard_Real YAt, const Standard_Real ZAt, const Standard_Real XUp, const Standard_Real YUp, const Standard_Real ZUp);
-  
-  //! Returns a projector object for use in a hidden line removal algorithm.
-  Standard_EXPORT HLRAlgo_Projector Projector() const;
-
-  DEFINE_STANDARD_RTTIEXT(Prs3d_Projector,Standard_Transient)
-
-private:
-
-  HLRAlgo_Projector MyProjector;
-
-};
-
-#endif // _Prs3d_Projector_HeaderFile

src/PrsMgr/PrsMgr_PresentableObject.cxx

@@ -21,7 +21,6 @@
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_PointAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Prs3d_ShadingAspect.hxx>
 #include <PrsMgr_Presentation.hxx>
 #include <PrsMgr_PresentationManager.hxx>
@@ -99,22 +98,12 @@ void PrsMgr_PresentableObject::Fill (const Handle(PrsMgr_PresentationManager)& t
 }
 
 //=======================================================================
-//function : Compute
+//function : computeHLR
 //purpose  :
 //=======================================================================
-void PrsMgr_PresentableObject::Compute(const Handle(Prs3d_Projector)& /*aProjector*/,
+void PrsMgr_PresentableObject::computeHLR (const Handle(Graphic3d_Camera)& ,
-                                       const Handle(Prs3d_Presentation)& /*aPresentation*/)
+                                           const Handle(Geom_Transformation)& ,
-{
+                                           const Handle(Prs3d_Presentation)& )
-  throw Standard_NotImplemented("cannot compute under a specific projector");
-}
-
-//=======================================================================
-//function : Compute
-//purpose  : 
-//=======================================================================
-void PrsMgr_PresentableObject::Compute(const Handle(Prs3d_Projector)& /* aProjector*/,
-                                       const Handle(Geom_Transformation)& /*aTrsf*/,
-				                               const Handle(Prs3d_Presentation)& /*aPresentation*/)
 {
   throw Standard_NotImplemented("cannot compute under a specific projector");
 }

src/PrsMgr/PrsMgr_PresentableObject.hxx

@@ -341,19 +341,14 @@ protected: //! @name interface methods
                                         const Handle(Prs3d_Presentation)& thePrs,
                                         const Standard_Integer theMode) = 0;
 
-  //! Calculates the 3D view presentation.
+  //! Calculates hidden line removal presentation for specific camera position.
   //! Each of the views in the viewer and every modification such as rotation, for example, entails recalculation.
-  //! It must be redefined to implement hidden line removal for the object. The user never calls this method himself.
+  //! Default implementation throws Standard_NotImplemented exception
-  //! This is done via the InteractiveContext object and is dependent on the point of view from which the object is displayed.
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& theProjector,
-                                        const Handle(Prs3d_Presentation)& thePrs);
-
-  //! Calculates the 3D view presentation.
-  //! A point of view is provided by the projector, and the geometric transformation which has transformed associated presentable objects is specified by transformation.
-  //! This function is to be used in case where a hidden line removal display cannot be calculated automatically.
-  //! This occurs when associated presentable objects have been transformed geometrically, but not translated.
   //! Warning! The transformation must be applied to the object before computation.
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& theProjector,
+  //! @param theProjector [in] view orientation
+  //! @param theTrsf [in] additional transformation, or NULL if undefined
+  //! @param thePrs  [in] presentation to fill
+  Standard_EXPORT virtual void computeHLR (const Handle(Graphic3d_Camera)& theProjector,
                                            const Handle(Geom_Transformation)& theTrsf,
                                            const Handle(Prs3d_Presentation)& thePrs);
 

src/PrsMgr/PrsMgr_Presentation.cxx

@@ -18,7 +18,6 @@
 #include <Graphic3d_DataStructureManager.hxx>
 #include <Precision.hxx>
 #include <Prs3d_Drawer.hxx>
-#include <Prs3d_Projector.hxx>
 #include <PrsMgr_PresentableObject.hxx>
 #include <PrsMgr_PresentationManager.hxx>
 #include <Quantity_Color.hxx>
@@ -188,71 +187,20 @@ void PrsMgr_Presentation::Compute()
   myPresentableObject->Compute (myPresentationManager, this, aDispMode);
 }
 
-//=======================================================================
-//function : Compute
-//purpose  : Methods for hidden parts...
-//=======================================================================
-Handle(Graphic3d_Structure) PrsMgr_Presentation::Compute (const Handle(Graphic3d_DataStructureManager)& theProjector)
-{
-  Handle(Graphic3d_Structure) aPrs = new Graphic3d_Structure (myPresentationManager->StructureManager());
-  myPresentableObject->Compute (Projector (theProjector), aPrs);
-  return aPrs;
-}
-
 //=======================================================================
 //function : Compute
 //purpose  :
 //=======================================================================
-void PrsMgr_Presentation::Compute (const Handle(Graphic3d_DataStructureManager)& theProjector,
+void PrsMgr_Presentation::computeHLR (const Handle(Graphic3d_Camera)& theProjector,
                                       Handle(Graphic3d_Structure)& theStructToFill)
 {
-  theStructToFill->Clear();
+  if (theStructToFill.IsNull())
-  Handle(Prs3d_Presentation) aPrs = theStructToFill;
+  {
-  myPresentableObject->Compute (Projector (theProjector), aPrs);
+    theStructToFill = new Prs3d_Presentation (myPresentationManager->StructureManager());
-}
+  }
-
-//=======================================================================
-//function : Compute
-//purpose  :
-//=======================================================================
-Handle(Graphic3d_Structure) PrsMgr_Presentation::Compute (const Handle(Graphic3d_DataStructureManager)& theProjector,
-                                                          const Handle(Geom_Transformation)&            theTrsf)
-{
-  Handle(Prs3d_Presentation) aPrs3d = new Prs3d_Presentation (myPresentationManager->StructureManager());
-  myPresentableObject->Compute (Projector (theProjector), theTrsf, aPrs3d);
-  return aPrs3d;
-}
-
-//=======================================================================
-//function : Compute
-//purpose  :
-//=======================================================================
-void PrsMgr_Presentation::Compute (const Handle(Graphic3d_DataStructureManager)& theProjector,
-                                   const Handle(Geom_Transformation)& theTrsf,
-                                   Handle(Graphic3d_Structure)& theStructToFill)
-{
-  // recompute HLR after transformation in all the case
   Handle(Graphic3d_Structure) aPrs = theStructToFill;
   theStructToFill->Clear();
-  myPresentableObject->Compute (Projector (theProjector), theTrsf, aPrs);
+  myPresentableObject->computeHLR (theProjector, Transformation(), aPrs);
-}
-
-//=======================================================================
-//function : Projector
-//purpose  :
-//=======================================================================
-Handle(Prs3d_Projector) PrsMgr_Presentation::Projector (const Handle(Graphic3d_DataStructureManager)& theProjector)
-{
-  Handle(Graphic3d_Camera) aCamera = Handle(Graphic3d_CView)::DownCast (theProjector)->Camera();
-  const gp_Dir aDir = aCamera->Direction().Reversed();
-  const gp_Pnt anAt = aCamera->Center();
-  const gp_Dir anUp = aCamera->Up();
-  Handle(Prs3d_Projector) aProj = new Prs3d_Projector (!aCamera->IsOrthographic(),
-                                                       aCamera->Scale(),
-                                                       aDir.X(), aDir.Y(), aDir.Z(),
-                                                       anAt.X(), anAt.Y(), anAt.Z(),
-                                                       anUp.X(), anUp.Y(), anUp.Z());
-  return aProj;
 }
 
 //=======================================================================

src/PrsMgr/PrsMgr_Presentation.hxx

@@ -23,11 +23,11 @@
 class PrsMgr_PresentationManager;
 class PrsMgr_PresentableObject;
 class Quantity_Color;
+class Graphic3d_Camera;
 class Geom_Transformation;
 class Prs3d_Drawer;
 class Graphic3d_Structure;
 class Graphic3d_DataStructureManager;
-class Prs3d_Projector;
 
 DEFINE_STANDARD_HANDLE(PrsMgr_Presentation, Graphic3d_Structure)
 
@@ -93,20 +93,8 @@ protected:
   //! Displays myStructure.
   Standard_EXPORT void display (const Standard_Boolean theIsHighlight);
 
-  Standard_EXPORT virtual Handle(Graphic3d_Structure) Compute (const Handle(Graphic3d_DataStructureManager)& theProjector) Standard_OVERRIDE;
+  Standard_EXPORT virtual void computeHLR (const Handle(Graphic3d_Camera)& theProjector,
-
-  Standard_EXPORT virtual Handle(Graphic3d_Structure) Compute (const Handle(Graphic3d_DataStructureManager)& theProjector,
-                                                               const Handle(Geom_Transformation)& theTrsf) Standard_OVERRIDE;
-
-  Standard_EXPORT virtual void Compute (const Handle(Graphic3d_DataStructureManager)& theProjector,
                                            Handle(Graphic3d_Structure)& theGivenStruct) Standard_OVERRIDE;
-
-  Standard_EXPORT virtual void Compute (const Handle(Graphic3d_DataStructureManager)& theProjector,
-                                        const Handle(Geom_Transformation)& theTrsf,
-                                        Handle(Graphic3d_Structure)& theGivenStruct) Standard_OVERRIDE;
-
-  Standard_EXPORT static Handle(Prs3d_Projector) Projector (const Handle(Graphic3d_DataStructureManager)& theProjector);
-
 protected:
 
   Handle(PrsMgr_PresentationManager) myPresentationManager;

src/QABugs/QABugs_17.cxx

@@ -69,7 +69,6 @@
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_CompSolid.hxx>
 #include <StdSelect_ShapeTypeFilter.hxx>
-#include <Prs3d_Projector.hxx>
 #include <HLRAlgo_Projector.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Font_NameOfFont.hxx>

src/StdPrs/FILES

@@ -8,6 +8,8 @@ StdPrs_HLRPolyShape.cxx
 StdPrs_HLRPolyShape.hxx
 StdPrs_HLRShape.cxx
 StdPrs_HLRShape.hxx
+StdPrs_HLRShapeI.cxx
+StdPrs_HLRShapeI.hxx
 StdPrs_HLRToolShape.cxx
 StdPrs_HLRToolShape.hxx
 StdPrs_Isolines.cxx

src/StdPrs/StdPrs_HLRPolyShape.cxx

@@ -27,7 +27,7 @@
 #include <HLRBRep_PolyAlgo.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
+#include <StdPrs_ToolTriangulatedShape.hxx>
 #include <StdPrs_WFShape.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
 #include <TopAbs.hxx>
@@ -41,16 +41,24 @@
 #define PntY2 ((Standard_Real*)Coordinates)[4]
 #define PntZ2 ((Standard_Real*)Coordinates)[5]
 
+IMPLEMENT_STANDARD_RTTIEXT(StdPrs_HLRPolyShape, StdPrs_HLRShapeI)
+
 //=======================================================================
 //function : Add
 //purpose  :
 //=======================================================================
-
+void StdPrs_HLRPolyShape::ComputeHLR (const Handle(Prs3d_Presentation)& aPresentation,
-void StdPrs_HLRPolyShape::Add(const Handle (Prs3d_Presentation)& aPresentation,
                                       const TopoDS_Shape& aShape,
-			      const Handle (Prs3d_Drawer)&        aDrawer,
+                                      const Handle(Prs3d_Drawer)& aDrawer,
-			      const Handle (Prs3d_Projector)&     aProjector)
+                                      const Handle(Graphic3d_Camera)& theProjector) const
 {
+  gp_Dir aBackDir = -theProjector->Direction();
+  gp_Dir aXpers   = theProjector->Up().Crossed (aBackDir);
+  gp_Ax3 anAx3 (theProjector->Center(), aBackDir, aXpers);
+  gp_Trsf aTrsf;
+  aTrsf.SetTransformation (anAx3);
+  const HLRAlgo_Projector aProj (aTrsf, !theProjector->IsOrthographic(), theProjector->Scale());
+
   Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(aPresentation);
 
   TopExp_Explorer ex;
@@ -76,8 +84,7 @@ void StdPrs_HLRPolyShape::Add(const Handle (Prs3d_Presentation)& aPresentation,
   }
   
   Handle(HLRBRep_PolyAlgo) hider = new HLRBRep_PolyAlgo(aShape);
-
+  hider->Projector (aProj);
-  hider->Projector(aProjector->Projector());
   hider->Angle(aDrawer->HLRAngle());
   hider->Update();
   Standard_Real sta,end,dx,dy,dz;

src/StdPrs/StdPrs_HLRPolyShape.hxx

@@ -17,59 +17,26 @@
 #ifndef _StdPrs_HLRPolyShape_HeaderFile
 #define _StdPrs_HLRPolyShape_HeaderFile
 
-#include <Prs3d_Root.hxx>
+#include <StdPrs_HLRShapeI.hxx>
-#include <Prs3d_Drawer.hxx>
 
-class TopoDS_Shape;
+//! Instantiates Prs3d_PolyHLRShape to define a display of a shape where hidden
-class Prs3d_Projector;
+//! and visible lines are identified with respect to a given projection.
-
+//! StdPrs_HLRPolyShape works with a polyhedral simplification of the shape whereas
-//! Instantiates Prs3d_PolyHLRShape to define a
+//! StdPrs_HLRShape takes the shape itself into account.
-//! display of a shape where hidden and visible lines are
+//! When you use StdPrs_HLRShape, you obtain an exact result, whereas, when you use StdPrs_HLRPolyShape,
-//! identified with respect to a given projection.
+//! you reduce computation time but obtain polygonal segments.
-//! StdPrs_HLRPolyShape works with a polyhedral
-//! simplification of the shape whereas
-//! StdPrs_HLRShape takes the shape itself into
-//! account. When you use StdPrs_HLRShape, you
-//! obtain an exact result, whereas, when you use
-//! StdPrs_HLRPolyShape, you reduce computation
-//! time but obtain polygonal segments.
 //! The polygonal algorithm is used.
-class StdPrs_HLRPolyShape  : public Prs3d_Root
+class StdPrs_HLRPolyShape : public StdPrs_HLRShapeI
 {
+  DEFINE_STANDARD_RTTIEXT(StdPrs_HLRPolyShape, StdPrs_HLRShapeI)
 public:
   
-  DEFINE_STANDARD_ALLOC
+  //! Compute presentation for specified shape.
-
+  Standard_EXPORT virtual void ComputeHLR (const Handle(Prs3d_Presentation)& thePrs,
-  
+                                           const TopoDS_Shape& theShape,
-  //! Defines the hidden line removal display of the
+                                           const Handle(Prs3d_Drawer)& theDrawer,
-  //! topology aShape in the projection defined by
+                                           const Handle(Graphic3d_Camera)& theProjector) const Standard_OVERRIDE;
-  //! aProjector. The shape and the projection are added
-  //! to the display aPresentation, and the attributes of the
-  //! elements present in the aPresentation are defined by
-  //! the attribute manager aDrawer.
-  Standard_EXPORT static void Add (const Handle(Prs3d_Presentation)& aPresentation, const TopoDS_Shape& aShape, const Handle(Prs3d_Drawer)& aDrawer, const Handle(Prs3d_Projector)& aProjector);
-
-
-
-
-protected:
-
-
-
-
-
-private:
-
-
-
-
 
 };
 
-
-
-
-
-
-
 #endif // _StdPrs_HLRPolyShape_HeaderFile

src/StdPrs/StdPrs_HLRShape.cxx

@@ -11,29 +11,38 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
+#include <StdPrs_HLRShape.hxx>
+
 #include <BRepAdaptor_Curve.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
-#include <StdPrs_HLRShape.hxx>
 #include <StdPrs_HLRToolShape.hxx>
 #include <StdPrs_DeflectionCurve.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
+#include <HLRAlgo_Projector.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(StdPrs_HLRShape, StdPrs_HLRShapeI)
 
 //=======================================================================
-//function : Add
+//function : ComputeHLR
 //purpose  :
 //=======================================================================
-
+void StdPrs_HLRShape::ComputeHLR (const Handle(Prs3d_Presentation)& thePresentation,
-void StdPrs_HLRShape::Add (const Handle(Prs3d_Presentation)& thePresentation,
                                   const TopoDS_Shape& theShape,
                                   const Handle(Prs3d_Drawer)& theDrawer,
-                           const Handle(Prs3d_Projector)&    theProjector)
+                                  const Handle(Graphic3d_Camera)& theProjector) const
 {
-  StdPrs_HLRToolShape aTool(theShape, theProjector->Projector());
+  gp_Dir aBackDir = -theProjector->Direction();
+  gp_Dir aXpers   = theProjector->Up().Crossed (aBackDir);
+  gp_Ax3 anAx3 (theProjector->Center(), aBackDir, aXpers);
+  gp_Trsf aTrsf;
+  aTrsf.SetTransformation (anAx3);
+  const HLRAlgo_Projector aProj (aTrsf, !theProjector->IsOrthographic(), theProjector->Scale());
+
+  StdPrs_HLRToolShape aTool(theShape, aProj);
   Standard_Integer aNbEdges = aTool.NbEdges();
   Standard_Integer anI;
   Standard_Real anU1, anU2;

src/StdPrs/StdPrs_HLRShape.hxx

@@ -14,26 +14,20 @@
 #ifndef _StdPrs_HLRFace_H__
 #define _StdPrs_HLRFace_H__
 
-#include <Prs3d_Root.hxx>
+#include <StdPrs_HLRShapeI.hxx>
-#include <Prs3d_Presentation.hxx>
-#include <Prs3d_Drawer.hxx>
-#include <Prs3d_Projector.hxx>
 
-// Computes the presentation of objects with
+//! Computes the presentation of objects with removal of their hidden lines for a specific projector.
-// removal of their hidden lines for a specific
+//! The exact algorithm is used.
-// projector. The exact algorithm is used.
+class StdPrs_HLRShape : public StdPrs_HLRShapeI
-
-class StdPrs_HLRShape: public Prs3d_Root
 {
+  DEFINE_STANDARD_RTTIEXT(StdPrs_HLRShape, StdPrs_HLRShapeI)
 public:
 
-  DEFINE_STANDARD_ALLOC
+  //! Compute presentation for specified shape.
-
+  Standard_EXPORT virtual void ComputeHLR (const Handle(Prs3d_Presentation)& thePrs,
-  Standard_EXPORT static void Add
-                       (const Handle(Prs3d_Presentation)& thePresentation,
                                            const TopoDS_Shape& theShape,
                                            const Handle(Prs3d_Drawer)& theDrawer,
-                        const Handle(Prs3d_Projector)&    theProjector);
+                                           const Handle(Graphic3d_Camera)& theProjector) const Standard_OVERRIDE;
 
 };
 #endif

src/StdPrs/StdPrs_HLRShapeI.cxx

@@ -0,0 +1,16 @@
+// Copyright (c) 2020 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 <StdPrs_HLRShapeI.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(StdPrs_HLRShapeI, Standard_Transient)

src/StdPrs/StdPrs_HLRShapeI.hxx

@@ -0,0 +1,39 @@
+// Copyright (c) 2020 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 _StdPrs_HLRShapeI_HeaderFile
+#define _StdPrs_HLRShapeI_HeaderFile
+
+#include <Prs3d_Presentation.hxx>
+#include <Standard_Transient.hxx>
+#include <Standard_Type.hxx>
+
+class TopoDS_Shape;
+class Prs3d_Drawer;
+class Graphic3d_Camera;
+
+//! Computes the presentation of objects with removal of their hidden lines for a specific projector.
+class StdPrs_HLRShapeI : public Standard_Transient
+{
+  DEFINE_STANDARD_RTTIEXT(StdPrs_HLRShapeI, Standard_Transient)
+public:
+
+  //! Compute presentation for specified shape.
+  virtual void ComputeHLR (const Handle(Prs3d_Presentation)& thePrs,
+                           const TopoDS_Shape& theShape,
+                           const Handle(Prs3d_Drawer)& theDrawer,
+                           const Handle(Graphic3d_Camera)& theProjector) const = 0;
+
+};
+
+#endif // _StdPrs_HLRShapeI_HeaderFile

src/StdSelect/StdSelect_Shape.cxx

@@ -19,7 +19,6 @@
 #include <Geom_Transformation.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_Projector.hxx>
 #include <Standard_Type.hxx>
 #include <StdPrs_WFShape.hxx>
 #include <StdPrs_ShadedShape.hxx>
@@ -58,20 +57,6 @@ void StdSelect_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*PM*/
     StdPrs_WFShape::Add (P, mysh, myDrawer);
 }
 
-void StdSelect_Shape::Compute(const Handle(Prs3d_Projector)& aProjector ,
-			      const Handle(Geom_Transformation)& aGeomTrans, 
-			      const Handle(Prs3d_Presentation)& aPresentation )
-{
-  PrsMgr_PresentableObject::Compute(aProjector,aGeomTrans,aPresentation);
-}
-
-
-void StdSelect_Shape::Compute(const Handle(Prs3d_Projector)& aProjector,
-			      const Handle(Prs3d_Presentation)& aPresentation)
-{
-  PrsMgr_PresentableObject::Compute(aProjector,aPresentation);
-}
-
 void StdSelect_Shape::DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth) const
 {
   OCCT_DUMP_TRANSIENT_CLASS_BEGIN (theOStream)

src/StdSelect/StdSelect_Shape.hxx

@@ -33,15 +33,6 @@ public:
   
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
 
-  //! computes the presentation according to a point of view
-  //! given by <aProjector>.
-  //! To be Used when the associated degenerated Presentations
-  //! have been transformed by <aTrsf> which is not a Pure
-  //! Translation. The HLR Prs can't be deducted automatically
-  //! WARNING :<aTrsf> must be applied
-  //! to the object to display before computation  !!!
-  Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
   const TopoDS_Shape& Shape() const { return mysh; }
 
   void Shape (const TopoDS_Shape& theShape) { mysh = theShape; }
@@ -49,10 +40,6 @@ public:
   //! Dumps the content of me into the stream
   Standard_EXPORT virtual void DumpJson (Standard_OStream& theOStream, Standard_Integer theDepth = -1) const Standard_OVERRIDE;
 
-private:
-
-  Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-
 private:
 
   TopoDS_Shape mysh;