0032161: Coding Rules - deprecate obsolete alias PrsMgr_PresentationManager3d

adm/upgrade.dat

@@ -94,6 +94,7 @@ GeomAdaptor_HCurve GeomAdaptor_Curve
 GeomAdaptor_HSurface GeomAdaptor_Surface
 GeomAdaptor_HSurfaceOfLinearExtrusion GeomAdaptor_SurfaceOfLinearExtrusion
 GeomAdaptor_HSurfaceOfRevolution GeomAdaptor_SurfaceOfRevolution
+PrsMgr_PresentationManager3d PrsMgr_PresentationManager
 
 [tcollection]
 AdvApp2Var_SequenceOfNode

dox/upgrade/upgrade.md

@@ -884,7 +884,7 @@ Old APIs based on global callback functions for creating *UserDraw* objects and
 class UserDrawElement : public OpenGl_Element {};
 
 //! Implementation of virtual method AIS_InteractiveObject::Compute().
-void UserDrawObject::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+void UserDrawObject::Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                               const Handle(Prs3d_Presentation)& thePrs,
                               const Standard_Integer theMode)
 {

dox/user_guides/visualization/visualization.md

@@ -551,7 +551,7 @@ If you are creating your own type of interactive object, you must implement the
 #### For 3D:
 
 ~~~~~{.cpp}
-void PackageName_ClassName::Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
+void PackageName_ClassName::Compute (const Handle(PrsMgr_PresentationManager)& thePresentationManager,
                                      const Handle(Prs3d_Presentation)& thePresentation,
                                      const Standard_Integer theMode);
 ~~~~~
@@ -650,7 +650,7 @@ Standard_Boolean myPk_IShape::AcceptDisplayMode (const Standard_Integer theMode)
   return theMode == 0 || theMode == 1;
 }
 
-void myPk_IShape::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+void myPk_IShape::Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                            const Handle(Prs3d_Presentation)& thePrs,
                            const Standard_Integer theMode)
 {
@@ -2096,7 +2096,7 @@ i.e. in hidden line removal and wireframe modes.
 Let us look at the example of compute methods
 
 ~~~~~{.cpp}
-void MyPresentableObject::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsManager,
+void MyPresentableObject::Compute (const Handle(PrsMgr_PresentationManager)& thePrsManager,
                                    const Handle(Graphic3d_Structure)& thePrs,
                                    const Standard_Integer theMode)
 (

samples/OCCTOverview/code/AdaptorCurve2d_AIS.cxx

@@ -46,7 +46,7 @@ AdaptorCurve2d_AIS::AdaptorCurve2d_AIS (const Handle(Geom2d_Curve)& theGeom2dCur
   //
 }
 
-void AdaptorCurve2d_AIS::Compute (const Handle(PrsMgr_PresentationManager3d)&,
+void AdaptorCurve2d_AIS::Compute (const Handle(PrsMgr_PresentationManager)&,
                                   const Handle(Prs3d_Presentation)& thePrs,
                                   const Standard_Integer theMode)
 {

samples/OCCTOverview/code/AdaptorCurve2d_AIS.h

@@ -53,7 +53,7 @@ private:
   virtual Standard_Boolean AcceptDisplayMode(const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; }
 
   //! Compute presentation.
-  virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                         const Handle(Prs3d_Presentation)& thePrs,
                         const Standard_Integer theMode) Standard_OVERRIDE;
 

samples/OCCTOverview/code/AdaptorCurve_AIS.cxx

@@ -26,7 +26,7 @@
 #include <StdPrs_PoleCurve.hxx>
 #include <StdPrs_Curve.hxx>
 
-void AdaptorCurve_AIS::Compute (const Handle(PrsMgr_PresentationManager3d)&,
+void AdaptorCurve_AIS::Compute (const Handle(PrsMgr_PresentationManager)&,
                                 const Handle(Prs3d_Presentation)& thePrs,
                                 const Standard_Integer theMode)
 {

samples/OCCTOverview/code/AdaptorCurve_AIS.h

@@ -37,7 +37,7 @@ private:
   virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0 || theMode == 1; }
 
   //! Compute presentation.
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                                         const Handle(Prs3d_Presentation)& thePrs,
                                         const Standard_Integer theMode) Standard_OVERRIDE;
 

samples/OCCTOverview/code/AdaptorPnt2d_AIS.cxx

@@ -24,7 +24,7 @@
 #include <Geom_CartesianPoint.hxx>
 #include <StdPrs_Point.hxx>
 
-void AdaptorPnt2d_AIS::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
+void AdaptorPnt2d_AIS::Compute (const Handle(PrsMgr_PresentationManager)& ,
                                 const Handle(Prs3d_Presentation)& thePrs,
                                 const Standard_Integer theMode)
 {

samples/OCCTOverview/code/AdaptorPnt2d_AIS.h

@@ -40,7 +40,7 @@ private:
   virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; }
 
   //! Compute presentation.
-  virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                         const Handle(Prs3d_Presentation)& thePrs,
                         const Standard_Integer theMode) Standard_OVERRIDE;
 

samples/OCCTOverview/code/AdaptorVec_AIS.cxx

@@ -39,7 +39,7 @@ AdaptorVec_AIS::AdaptorVec_AIS (const gp_Pnt2d& thePnt1,
   myLength = aVec.Magnitude();
 }
 
-void AdaptorVec_AIS::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
+void AdaptorVec_AIS::Compute (const Handle(PrsMgr_PresentationManager)& ,
                               const Handle(Prs3d_Presentation)& thePrs,
                               const Standard_Integer theMode)
 {

samples/OCCTOverview/code/AdaptorVec_AIS.h

@@ -101,7 +101,7 @@ private:
   virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; }
 
   //! Compute presentation.
-  virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                         const Handle(Prs3d_Presentation)& thePrs,
                         const Standard_Integer theMode) Standard_OVERRIDE;
 

samples/OCCTOverview/code/Sample2D_Face.cxx

@@ -219,7 +219,7 @@ void Sample2D_Face::FillData(Standard_Boolean isSizesRecompute)
   }
 }
 
-void Sample2D_Face::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
+void Sample2D_Face::Compute (const Handle(PrsMgr_PresentationManager)& ,
                              const Handle(Prs3d_Presentation)& thePresentation,
                              const Standard_Integer theMode)
 {
@@ -303,7 +303,7 @@ void Sample2D_Face::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
   thePresentation->CurrentGroup()->AddPrimitiveArray(myExternalArray);
 }
 
-void Sample2D_Face::HilightSelected (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+void Sample2D_Face::HilightSelected (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                                      const SelectMgr_SequenceOfOwner& theOwners)
 {
   Handle(Prs3d_Presentation) aSelectionPrs = GetSelectPresentation (thePrsMgr);
@@ -368,7 +368,7 @@ void Sample2D_Face::ClearSelected()
   }
 }
 
-void Sample2D_Face::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM,
+void Sample2D_Face::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePM,
                                            const Handle(Prs3d_Drawer)& theStyle,
                                            const Handle(SelectMgr_EntityOwner)& theOwner)
 {

samples/OCCTOverview/code/Sample2D_Face.h

@@ -56,7 +56,7 @@ private:
   virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; }
 
   //! Compute presentation.
-  virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                         const Handle(Prs3d_Presentation)& thePrs,
                         const Standard_Integer theMode) Standard_OVERRIDE;
 
@@ -67,11 +67,11 @@ private:
   virtual void ClearSelected() Standard_OVERRIDE;
 
   //! Method for advanced customizable selection of picked object
-  virtual void HilightSelected (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  virtual void HilightSelected (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                                 const SelectMgr_SequenceOfOwner& theOwners) Standard_OVERRIDE;
 
   //! Method for advanced customizable highlighting of picked object.
-  virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM,
+  virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePM,
                                       const Handle(Prs3d_Drawer)& theStyle,
                                       const Handle(SelectMgr_EntityOwner)& theOwner) Standard_OVERRIDE;
 

samples/OCCTOverview/code/Sample2D_Markers.cxx

@@ -54,7 +54,7 @@ Sample2D_Markers::Sample2D_Markers (const Standard_Real theXPosition,
   myArrayOfPoints = theArrayOfPoints;
 }
 
-void Sample2D_Markers::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
+void Sample2D_Markers::Compute (const Handle(PrsMgr_PresentationManager)& ,
                                 const Handle(Prs3d_Presentation)& thePrs,
                                 const Standard_Integer theMode)
 {

samples/OCCTOverview/code/Sample2D_Markers.h

@@ -61,7 +61,7 @@ private:
   virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; }
 
   //! Compute presentation.
-  virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+  virtual void Compute (const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/,
                         const Handle(Prs3d_Presentation)& /*aPresentation*/,
                         const Standard_Integer theMode) Standard_OVERRIDE;
 

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

@@ -26,7 +26,7 @@ ISession2D_Curve::ISession2D_Curve(const Handle(Geom2d_Curve) aGeom2dCurve,
   myradiusratio = 1;
 }
 
-void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
+void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager)& ,
                                const Handle(Prs3d_Presentation)& thePrs,
                                const Standard_Integer )
 {

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

@@ -63,7 +63,7 @@ private:
 
   // Methods PRIVATE
   virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const { return theMode == 0; }
-  virtual  void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
+  virtual  void Compute(const Handle(PrsMgr_PresentationManager)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
   void ComputeSelection(const Handle(SelectMgr_Selection)& ,const Standard_Integer ) {}
 
   // Fields PRIVATE

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

@@ -14,7 +14,7 @@ IMPLEMENT_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
 static char THIS_FILE[]=__FILE__;
 #endif
 
-void ISession_Curve::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
+void ISession_Curve::Compute (const Handle(PrsMgr_PresentationManager)& ,
                               const Handle(Prs3d_Presentation)& thePrs,
                               const Standard_Integer theMode)
 {

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

@@ -17,7 +17,7 @@ public:
 
 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(PrsMgr_PresentationManager)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
   virtual void ComputeSelection (const Handle(SelectMgr_Selection)& ,const Standard_Integer ) {}
 
 private:

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

@@ -69,7 +69,7 @@ ISession_Direction::~ISession_Direction()
 
 }
 
-void ISession_Direction::Compute (const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+void ISession_Direction::Compute (const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/,
                                   const Handle(Prs3d_Presentation)& aPresentation,
                                   const Standard_Integer /*aMode*/)
 {

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

@@ -30,7 +30,7 @@ public:
 
 private:
 
-    void Compute         (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+    void Compute         (const Handle(PrsMgr_PresentationManager)& aPresentationManager,
                           const Handle(Prs3d_Presentation)& aPresentation,
                           const Standard_Integer aMode);
     void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;

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

@@ -41,7 +41,7 @@ ISession_Point::~ISession_Point()
 
 }
 
-void ISession_Point::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+void ISession_Point::Compute(const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/,
                              const Handle(Prs3d_Presentation)& aPresentation,
                              const Standard_Integer /*aMode*/)
 {

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

@@ -26,7 +26,7 @@ public:
 
 private :
 
-  void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+  void Compute (const Handle(PrsMgr_PresentationManager)& aPresentationManager,
                 const Handle(Prs3d_Presentation)& aPresentation,
                 const Standard_Integer aMode);
 

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

@@ -18,7 +18,7 @@ static char THIS_FILE[]=__FILE__;
 
 IMPLEMENT_STANDARD_RTTIEXT(ISession_Surface,AIS_InteractiveObject)
 
-void ISession_Surface::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
+void ISession_Surface::Compute (const Handle(PrsMgr_PresentationManager)& ,
                                 const Handle(Prs3d_Presentation)& thePrs,
                                 const Standard_Integer theMode)
 {

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

@@ -17,7 +17,7 @@ public:
 
 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(PrsMgr_PresentationManager)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0);
   virtual void ComputeSelection (const Handle(SelectMgr_Selection)& ,const Standard_Integer ) {}
 
 private:

samples/mfc/standard/01_Geometry/src/StdAfx.h

@@ -215,7 +215,7 @@
 #include <Prs3d_Text.hxx>
 #include <Prs3d_ArrowAspect.hxx>
 #include <Prs3d_IsoAspect.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Prs3d_IsoAspect.hxx>
 #include <Prs3d_TextAspect.hxx>
 #include <Prs3d_PointAspect.hxx>

samples/mfc/standard/02_Modeling/src/ISession_Direction.cpp

@@ -31,7 +31,7 @@ ISession_Direction::ISession_Direction(const gp_Pnt& aPnt,const gp_Vec& aVec)
 }
 
 
-void ISession_Direction::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+void ISession_Direction::Compute(const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/,
                                  const Handle(Prs3d_Presentation)& aPresentation,
                                  const Standard_Integer /*aMode*/)
 {

samples/mfc/standard/02_Modeling/src/ISession_Direction.h

@@ -28,7 +28,7 @@ public:
 
 private:
 
-  void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+  void Compute (const Handle(PrsMgr_PresentationManager)& aPresentationManager,
                 const Handle(Prs3d_Presentation)& aPresentation,
                 const Standard_Integer aMode);
 

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

@@ -31,7 +31,7 @@ ISession_Curve::~ISession_Curve()
 {
 
 }
-void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/,
                              const Handle(Prs3d_Presentation)& aPresentation,
                              const Standard_Integer /*aMode*/)
 {

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

@@ -23,7 +23,7 @@ public:
 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(PrsMgr_PresentationManager)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
 void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;
 
 Handle(Geom_Curve) myCurve;

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

@@ -31,7 +31,7 @@ ISession_Curve::~ISession_Curve()
 {
 
 }
-void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/,
                              const Handle(Prs3d_Presentation)& aPresentation,
                              const Standard_Integer /*aMode*/)
 {

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

@@ -23,7 +23,7 @@ public:
 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(PrsMgr_PresentationManager)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
 void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;
 
 Handle(Geom_Curve) myCurve;

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

@@ -31,7 +31,7 @@ ISession_Curve::~ISession_Curve()
 {
 
 }
-void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/,
                              const Handle(Prs3d_Presentation)& aPresentation,
                              const Standard_Integer /*aMode*/)
 {

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

@@ -23,7 +23,7 @@ public:
 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(PrsMgr_PresentationManager)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
 void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;
 
 Handle(Geom_Curve) myCurve;

samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp

@@ -75,7 +75,7 @@ void ISession2D_Shape::BuildPolyAlgo()
   myPolyAlgo->Update();
 }
 
-void ISession2D_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*thePresentationManager*/,
+void ISession2D_Shape::Compute(const Handle(PrsMgr_PresentationManager)& /*thePresentationManager*/,
                                const Handle(Prs3d_Presentation)& thePresentation,
                                const Standard_Integer theMode)
 {

samples/mfc/standard/Common/ISession2D/ISession2D_Shape.h

@@ -51,7 +51,7 @@ private:
                      const TopoDS_Shape& theCompound,
                      const Handle(Prs3d_LineAspect) theAspect);
 
-  Standard_EXPORT virtual  void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
+  Standard_EXPORT virtual  void Compute (const Handle(PrsMgr_PresentationManager)& thePresentationManager,
                                          const Handle(Prs3d_Presentation)& thePresentation,
                                          const Standard_Integer theMode = 0);
 

samples/mfc/standard/Common/Primitive/Sample2D_Face.cpp

@@ -171,7 +171,7 @@ void Sample2D_Face::FillData(Standard_Boolean isSizesRecompute)
   }
 }
 
-void Sample2D_Face::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePresentationManager*/,
+void Sample2D_Face::Compute (const Handle(PrsMgr_PresentationManager)& /*thePresentationManager*/,
                              const Handle(Prs3d_Presentation)& thePresentation,
                              const Standard_Integer /*theMode*/)
 {
@@ -257,7 +257,7 @@ void Sample2D_Face::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePr
 
 //Method for advanced customizable selection of picked object
 void Sample2D_Face::HilightSelected 
-( const Handle(PrsMgr_PresentationManager3d)& thePM,
+( const Handle(PrsMgr_PresentationManager)& thePM,
  const SelectMgr_SequenceOfOwner& theOwners)
 {
   Handle( Prs3d_Presentation ) aSelectionPrs;
@@ -329,7 +329,7 @@ void Sample2D_Face::ClearSelected ()
 
 
 //Method for advanced customizable highlighting of picked object
-void Sample2D_Face::HilightOwnerWithColor ( const Handle(PrsMgr_PresentationManager3d)& thePM,
+void Sample2D_Face::HilightOwnerWithColor ( const Handle(PrsMgr_PresentationManager)& thePM,
                                            const Handle(Prs3d_Drawer)& theStyle,
                                            const Handle(SelectMgr_EntityOwner)& theOwner)
 {

samples/mfc/standard/Common/Primitive/Sample2D_Face.h

@@ -49,14 +49,14 @@ private:
 //private methods
   void FillData(Standard_Boolean isSizesRecomputed = Standard_False); 
   void ClearSelected ();
-  void HilightSelected( const Handle(PrsMgr_PresentationManager3d)& thePM,
+  void HilightSelected( const Handle(PrsMgr_PresentationManager)& thePM,
                         const SelectMgr_SequenceOfOwner& theOwners);
 
-  void HilightOwnerWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM,
+  void HilightOwnerWithColor( const Handle(PrsMgr_PresentationManager)& thePM,
                               const Handle(Prs3d_Drawer)& theStyle,
                               const Handle(SelectMgr_EntityOwner)& theOwner);
 
-  void Compute (  const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
+  void Compute (  const Handle(PrsMgr_PresentationManager)& thePresentationManager,
                   const Handle(Prs3d_Presentation)& thePresentation,
                   const Standard_Integer theMode);
 

samples/mfc/standard/Common/Primitive/Sample2D_Markers.cpp

@@ -36,7 +36,7 @@ Sample2D_Markers::Sample2D_Markers (const Standard_Real theXPosition,
 }
 
 
-void Sample2D_Markers::Compute (const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+void Sample2D_Markers::Compute (const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/,
                                 const Handle(Prs3d_Presentation)& aPresentation,
                                 const Standard_Integer /*aMode*/)
 {

samples/mfc/standard/Common/Primitive/Sample2D_Markers.h

@@ -37,7 +37,7 @@ DEFINE_STANDARD_RTTIEXT(Sample2D_Markers,AIS_InteractiveObject)
 
 private: 
 
-virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+virtual void Compute (const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/,
                       const Handle(Prs3d_Presentation)& /*aPresentation*/,
                       const Standard_Integer /*aMode*/);
 

samples/mfc/standard/Common/StdAfx.h

@@ -70,7 +70,7 @@
 #include <Prs3d_IsoAspect.hxx>
 #include <Prs3d_ShadingAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Prs3d_TextAspect.hxx>
 #include <Prs3d_Text.hxx>
 

samples/mfc/standard/Common/User_Cylinder.cxx

@@ -11,7 +11,7 @@ IMPLEMENT_STANDARD_RTTIEXT(User_Cylinder,AIS_InteractiveObject)
 
 #include <Graphic3d_ArrayOfTriangles.hxx>
 #include <Graphic3d_StructureManager.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <StdPrs_ToolTriangulatedShape.hxx>
 #include <Poly_Connect.hxx>
 #include <TColgp_Array1OfPnt.hxx>
@@ -49,7 +49,7 @@ AIS_InteractiveObject(PrsMgr_TOP_ProjectorDependant)
   myColor = Quantity_NOC_KHAKI4;
 }
 
-void User_Cylinder::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+void User_Cylinder::Compute(const Handle(PrsMgr_PresentationManager)& /*aPresentationManager*/,
                             const Handle(Prs3d_Presentation)& aPresentation,
                             const Standard_Integer aMode ) 
 {

samples/mfc/standard/Common/User_Cylinder.hxx

@@ -25,7 +25,7 @@ public:
 	void SetColor(const Quantity_Color &aColor);
 
 private:
-	void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+	void Compute(const Handle(PrsMgr_PresentationManager)& aPresentationManager,
 				 const Handle(Prs3d_Presentation)& aPresentation,
 				 const Standard_Integer aMode = 0) ;
 	void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,

src/AIS/AIS_Axis.cxx

@@ -161,24 +161,23 @@ void AIS_Axis::SetAxis1Placement(const Handle(Geom_Axis1Placement)& anAxis)
 //function : Compute
 //purpose  : 
 //=======================================================================
-void AIS_Axis::Compute(const Handle(PrsMgr_PresentationManager3d)&,
+void AIS_Axis::Compute (const Handle(PrsMgr_PresentationManager)& ,
-		       const Handle(Prs3d_Presentation)& aPresentation, 
+		        const Handle(Prs3d_Presentation)& thePrs,
-		       const Standard_Integer)
+		        const Standard_Integer )
 {
-  aPresentation->SetInfiniteState (myInfiniteState);
+  thePrs->SetInfiniteState (myInfiniteState);
-
+  thePrs->SetDisplayPriority(5);
-  aPresentation->SetDisplayPriority(5);
+  if (!myIsXYZAxis)
-  if (!myIsXYZAxis ){
+  {
-    GeomAdaptor_Curve curv(myComponent);
+    GeomAdaptor_Curve curv (myComponent);
-    StdPrs_Curve::Add(aPresentation,curv,myDrawer);
+    StdPrs_Curve::Add (thePrs, curv, myDrawer);
   }
   else
   {
-    DsgPrs_XYZAxisPresentation::Add (aPresentation,myLineAspect,myDir,myVal,
+    DsgPrs_XYZAxisPresentation::Add (thePrs, myLineAspect, myDir, myVal,
                                      myDrawer->DatumAspect()->ToDrawLabels() ? myText : "",
                                      myPfirst, myPlast);
   }
-
 }
 
 //=======================================================================

src/AIS/AIS_Axis.hxx

@@ -98,10 +98,13 @@ public:
 
 private:
 
-  Standard_EXPORT 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(PrsMgr_PresentationManager)& thePrsMgr,
-  
+                                        const Handle(Prs3d_Presentation)& thePrs,
-  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
+                                        const Standard_Integer theMode) Standard_OVERRIDE;
-  
+
+  Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel,
+                                                 const Standard_Integer theMode) Standard_OVERRIDE;
+
   Standard_EXPORT void ComputeFields();
 
 private:

src/AIS/AIS_CameraFrustum.cxx

@@ -229,9 +229,9 @@ void AIS_CameraFrustum::fillBorders()
 //function : Compute
 //purpose  :
 //=======================================================================
-void AIS_CameraFrustum::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
+void AIS_CameraFrustum::Compute (const Handle(PrsMgr_PresentationManager)& ,
-                                 const Handle(Prs3d_Presentation)&           thePrs,
+                                 const Handle(Prs3d_Presentation)& thePrs,
-                                 const Standard_Integer                      theMode)
+                                 const Standard_Integer theMode)
 {
   thePrs->SetInfiniteState (true);
   if (myTriangles.IsNull())

src/AIS/AIS_CameraFrustum.hxx

@@ -58,9 +58,9 @@ public:
 protected:
 
   //! Computes presentation of camera frustum.
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
-                                        const Handle(Prs3d_Presentation)&           thePrs,
+                                        const Handle(Prs3d_Presentation)& thePrs,
-                                        const Standard_Integer                      theMode) Standard_OVERRIDE;
+                                        const Standard_Integer theMode) Standard_OVERRIDE;
 
   //! Compute selection.
   Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection,

src/AIS/AIS_Circle.cxx

@@ -72,15 +72,14 @@ AIS_Circle::AIS_Circle(const Handle(Geom_Circle)& theComponent,
 //function : Compute
 //purpose  : 
 //=======================================================================
-void AIS_Circle::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+void AIS_Circle::Compute (const Handle(PrsMgr_PresentationManager)& ,
-                         const Handle(Prs3d_Presentation)& aPresentation, 
+                          const Handle(Prs3d_Presentation)& thePrs,
-                         const Standard_Integer /*aMode*/)
+                          const Standard_Integer )
 {
-  aPresentation->SetDisplayPriority(5);
+  thePrs->SetDisplayPriority (5);
-
-  if (myCircleIsArc) ComputeArc(aPresentation);
-  else ComputeCircle(aPresentation);
 
+  if (myCircleIsArc) { ComputeArc (thePrs); }
+  else { ComputeCircle (thePrs); }
 }
 
 //=======================================================================

src/AIS/AIS_Circle.hxx

@@ -92,16 +92,19 @@ public:
 
 private:
 
-  Standard_EXPORT 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(PrsMgr_PresentationManager)& thePrsMgr,
-  
+                                        const Handle(Prs3d_Presentation)& theprs,
-  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
+                                        const Standard_Integer theMode) Standard_OVERRIDE;
-  
+
+  Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel,
+                                                 const Standard_Integer theMode) Standard_OVERRIDE;
+
   Standard_EXPORT void ComputeCircle (const Handle(Prs3d_Presentation)& aPresentation);
-  
+
   Standard_EXPORT void ComputeArc (const Handle(Prs3d_Presentation)& aPresentation);
-  
+
   Standard_EXPORT void ComputeCircleSelection (const Handle(SelectMgr_Selection)& aSelection);
-  
+
   Standard_EXPORT void ComputeArcSelection (const Handle(SelectMgr_Selection)& aSelection);
 
   //! Replace aspects of already computed groups with the new value.

src/AIS/AIS_ColorScale.cxx

@@ -545,7 +545,7 @@ void AIS_ColorScale::updateTextAspect()
 //function : Compute
 //purpose  :
 //=======================================================================
-void AIS_ColorScale::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
+void AIS_ColorScale::Compute (const Handle(PrsMgr_PresentationManager)& ,
                               const Handle(Prs3d_Presentation)& thePrs,
                               const Standard_Integer theMode)
 {

src/AIS/AIS_ColorScale.hxx

@@ -392,7 +392,7 @@ public:
   virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; }
 
   //! Compute presentation.
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                                         const Handle(Prs3d_Presentation)& thePresentation,
                                         const Standard_Integer theMode) Standard_OVERRIDE;
 

src/AIS/AIS_ColoredShape.cxx

@@ -33,7 +33,7 @@
 #include <Prs3d_IsoAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_ShadingAspect.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <StdSelect_BRepSelectionTool.hxx>
 #include <StdPrs_ShadedShape.hxx>
@@ -349,9 +349,9 @@ void AIS_ColoredShape::SetMaterial (const Graphic3d_MaterialAspect& theMaterial)
 //function : Compute
 //purpose  :
 //=======================================================================
-void AIS_ColoredShape::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+void AIS_ColoredShape::Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
-                                const Handle(Prs3d_Presentation)&           thePrs,
+                                const Handle(Prs3d_Presentation)& thePrs,
-                                const Standard_Integer                      theMode)
+                                const Standard_Integer theMode)
 {
   if (myshape.IsNull())
   {

src/AIS/AIS_ColoredShape.hxx

@@ -95,9 +95,9 @@ public:
 protected: //! @name override presentation computation
 
   //! Compute presentation considering sub-shape color map.
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
-                                        const Handle(Prs3d_Presentation)&           thePrs,
+                                        const Handle(Prs3d_Presentation)& thePrs,
-                                        const Standard_Integer                      theMode) Standard_OVERRIDE;
+                                        const Standard_Integer theMode) Standard_OVERRIDE;
 
   //! Compute selection considering sub-shape hidden state.
   Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection,

src/AIS/AIS_ConnectedInteractive.cxx

@@ -110,9 +110,9 @@ void AIS_ConnectedInteractive::Disconnect()
 //function : Compute
 //purpose  :
 //=======================================================================
-void AIS_ConnectedInteractive::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+void AIS_ConnectedInteractive::Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
-                                        const Handle(Prs3d_Presentation)&           thePrs,
+                                        const Handle(Prs3d_Presentation)& thePrs,
-                                        const Standard_Integer                      theMode)
+                                        const Standard_Integer theMode)
 {
   if (HasConnection())
   {

src/AIS/AIS_ConnectedInteractive.hxx

@@ -103,7 +103,9 @@ protected:
   //! compute anything, but just uses the
   //! presentation of this last object, with
   //! 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;
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
+                                        const Handle(Prs3d_Presentation)& theprs,
+                                        const Standard_Integer theMode) Standard_OVERRIDE;
 
   //! Computes the presentation according to a point of view.
   Standard_EXPORT virtual void computeHLR (const Handle(Graphic3d_Camera)& theProjector,

src/AIS/AIS_InteractiveContext.cxx

@@ -108,7 +108,7 @@ namespace
 //=======================================================================
 
 AIS_InteractiveContext::AIS_InteractiveContext(const Handle(V3d_Viewer)& MainViewer):
-myMainPM(new PrsMgr_PresentationManager3d(MainViewer->StructureManager())),
+myMainPM (new PrsMgr_PresentationManager (MainViewer->StructureManager())),
 myMainVwr(MainViewer),
 myMainSel(new StdSelect_ViewerSelector3d()),
 myToHilightSelected(Standard_True),

src/AIS/AIS_InteractiveContext.hxx

@@ -33,7 +33,7 @@
 #include <Graphic3d_Vec2.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_TypeOfHighlight.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <SelectMgr_AndOrFilter.hxx>
 #include <SelectMgr_IndexedMapOfOwner.hxx>
 #include <SelectMgr_ListOfFilter.hxx>
@@ -834,7 +834,7 @@ public: //! @name common properties
 
   const Handle(SelectMgr_SelectionManager)& SelectionManager() const { return mgrSelector; }
 
-  const Handle(PrsMgr_PresentationManager3d)& MainPrsMgr() const { return myMainPM; }
+  const Handle(PrsMgr_PresentationManager)& MainPrsMgr() const { return myMainPM; }
 
   const Handle(StdSelect_ViewerSelector3d)& MainSelector() const { return myMainSel; }
 
@@ -1411,7 +1411,7 @@ protected: //! @name internal fields
 
   AIS_DataMapOfIOStatus myObjects;
   Handle(SelectMgr_SelectionManager) mgrSelector;
-  Handle(PrsMgr_PresentationManager3d) myMainPM;
+  Handle(PrsMgr_PresentationManager) myMainPM;
   Handle(V3d_Viewer) myMainVwr;
   Handle(StdSelect_ViewerSelector3d) myMainSel;
   V3d_View* myLastActiveView;

src/AIS/AIS_LightSource.cxx

@@ -359,7 +359,7 @@ void AIS_LightSource::setLocalTransformation (const Handle(TopLoc_Datum3D)& theT
 // function : Compute
 // purpose  :
 // =======================================================================
-void AIS_LightSource::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
+void AIS_LightSource::Compute (const Handle(PrsMgr_PresentationManager)& ,
                                const Handle(Prs3d_Presentation)& thePrs,
                                const Standard_Integer theMode)
 {

src/AIS/AIS_LightSource.hxx

@@ -174,7 +174,7 @@ protected:
   }
 
   //! Computes selection sensitive zones(triangulation) for light source presentation.
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                                         const Handle(Prs3d_Presentation)& thePrs,
                                         const Standard_Integer theMode) Standard_OVERRIDE;
 

src/AIS/AIS_Line.cxx

@@ -65,15 +65,14 @@ myLineIsSegment(Standard_True)
 //function : Compute
 //purpose  : 
 //=======================================================================
-void AIS_Line::Compute(const Handle(PrsMgr_PresentationManager3d)&,
+void AIS_Line::Compute (const Handle(PrsMgr_PresentationManager)&,
-		       const Handle(Prs3d_Presentation)& aPresentation, 
+		        const Handle(Prs3d_Presentation)& thePrs,
-		       const Standard_Integer)
+		        const Standard_Integer )
 {
-  aPresentation->SetDisplayPriority(5);
+  thePrs->SetDisplayPriority (5);
-
-  if (!myLineIsSegment) ComputeInfiniteLine(aPresentation);
-  else ComputeSegmentLine(aPresentation);
 
+  if (!myLineIsSegment) { ComputeInfiniteLine (thePrs); }
+  else { ComputeSegmentLine (thePrs); }
 }
 
 //=======================================================================

src/AIS/AIS_Line.hxx

@@ -83,19 +83,21 @@ public:
   Standard_EXPORT void UnsetWidth() 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 ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
-  
-  Standard_EXPORT void ComputeInfiniteLine (const Handle(Prs3d_Presentation)& aPresentation);
-  
-  Standard_EXPORT void ComputeSegmentLine (const Handle(Prs3d_Presentation)& aPresentation);
-  
-  Standard_EXPORT void ComputeInfiniteLineSelection (const Handle(SelectMgr_Selection)& aSelection);
-  
-  Standard_EXPORT void ComputeSegmentLineSelection (const Handle(SelectMgr_Selection)& aSelection);
 
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
+                                        const Handle(Prs3d_Presentation)& thePrs,
+                                        const Standard_Integer theMode) Standard_OVERRIDE;
+
+  Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel,
+                                                 const Standard_Integer theMode) Standard_OVERRIDE;
+
+  Standard_EXPORT void ComputeInfiniteLine (const Handle(Prs3d_Presentation)& aPresentation);
+
+  Standard_EXPORT void ComputeSegmentLine (const Handle(Prs3d_Presentation)& aPresentation);
+
+  Standard_EXPORT void ComputeInfiniteLineSelection (const Handle(SelectMgr_Selection)& aSelection);
+
+  Standard_EXPORT void ComputeSegmentLineSelection (const Handle(SelectMgr_Selection)& aSelection);
   //! Replace aspects of already computed groups with the new value.
   void replaceWithNewLineAspect (const Handle(Prs3d_LineAspect)& theAspect);
 

src/AIS/AIS_Manipulator.cxx

@@ -965,7 +965,7 @@ void AIS_Manipulator::setLocalTransformation (const Handle(TopLoc_Datum3D)& /*th
 //function : Compute
 //purpose  : 
 //=======================================================================
-void AIS_Manipulator::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+void AIS_Manipulator::Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                                const Handle(Prs3d_Presentation)& thePrs,
                                const Standard_Integer theMode)
 {
@@ -1007,7 +1007,7 @@ void AIS_Manipulator::Compute (const Handle(PrsMgr_PresentationManager3d)& thePr
 //function : HilightSelected
 //purpose  : 
 //=======================================================================
-void AIS_Manipulator::HilightSelected (const Handle(PrsMgr_PresentationManager3d)& thePM,
+void AIS_Manipulator::HilightSelected (const Handle(PrsMgr_PresentationManager)& thePM,
                                        const SelectMgr_SequenceOfOwner& theSeq)
 {
   if (theSeq.IsEmpty())
@@ -1059,7 +1059,7 @@ void AIS_Manipulator::ClearSelected()
 //function : HilightOwnerWithColor
 //purpose  : 
 //=======================================================================
-void AIS_Manipulator::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM,
+void AIS_Manipulator::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePM,
                                              const Handle(Prs3d_Drawer)& theStyle,
                                              const Handle(SelectMgr_EntityOwner)& theOwner)
 {

src/AIS/AIS_Manipulator.hxx

@@ -317,7 +317,7 @@ public: //! @name Presentation computation
 
   //! Fills presentation.
   //! @note Manipulator presentation does not use display mode and for all modes has the same presentation.
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                                         const Handle(Prs3d_Presentation)& thePrs,
                                         const Standard_Integer theMode = 0) Standard_OVERRIDE;
 
@@ -337,11 +337,11 @@ public: //! @name Presentation computation
   Standard_EXPORT virtual void ClearSelected() Standard_OVERRIDE;
 
   //! Method which draws selected owners ( for fast presentation draw ).
-  Standard_EXPORT virtual void HilightSelected (const Handle(PrsMgr_PresentationManager3d)& thePM, const SelectMgr_SequenceOfOwner& theSeq) Standard_OVERRIDE;
+  Standard_EXPORT virtual void HilightSelected (const Handle(PrsMgr_PresentationManager)& thePM, const SelectMgr_SequenceOfOwner& theSeq) Standard_OVERRIDE;
 
   //! Method which hilight an owner belonging to
   //! this selectable object  ( for fast presentation draw ).
-  Standard_EXPORT virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM,
+  Standard_EXPORT virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePM,
                                                       const Handle(Prs3d_Drawer)& theStyle,
                                                       const Handle(SelectMgr_EntityOwner)& theOwner) Standard_OVERRIDE;
 

src/AIS/AIS_ManipulatorOwner.cxx

@@ -35,7 +35,7 @@ AIS_ManipulatorOwner::AIS_ManipulatorOwner (const Handle(SelectMgr_SelectableObj
 //function : HilightWithColor
 //purpose  : 
 //=======================================================================
-void AIS_ManipulatorOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM,
+void AIS_ManipulatorOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM,
                                              const Handle(Prs3d_Drawer)& theStyle,
                                              const Standard_Integer theMode)
 {

src/AIS/AIS_ManipulatorOwner.hxx

@@ -35,7 +35,7 @@ public:
                                         const AIS_ManipulatorMode theMode,
                                         const Standard_Integer thePriority = 0);
 
-  Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM,
+  Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM,
                                                  const Handle(Prs3d_Drawer)& theStyle,
                                                  const Standard_Integer theMode) Standard_OVERRIDE;
 

src/AIS/AIS_MediaPlayer.cxx

@@ -210,7 +210,7 @@ void AIS_MediaPlayer::PlayPause()
 // function : Compute
 // purpose  :
 // =======================================================================
-void AIS_MediaPlayer::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
+void AIS_MediaPlayer::Compute (const Handle(PrsMgr_PresentationManager)& ,
                                const Handle(Prs3d_Presentation)& thePrs,
                                const Standard_Integer theMode)
 {

src/AIS/AIS_MediaPlayer.hxx

@@ -69,7 +69,7 @@ protected:
   virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; }
 
   //! Compute presentation.
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                                         const Handle(Prs3d_Presentation)& thePrs,
                                         const Standard_Integer theMode) Standard_OVERRIDE;
 

src/AIS/AIS_MultipleConnectedInteractive.cxx

@@ -125,9 +125,9 @@ void AIS_MultipleConnectedInteractive::DisconnectAll()
 //function : Compute
 //purpose  :
 //=======================================================================
-void AIS_MultipleConnectedInteractive::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePrsMgr*/,
+void AIS_MultipleConnectedInteractive::Compute (const Handle(PrsMgr_PresentationManager)& ,
-                                                const Handle(Prs3d_Presentation)&           /*thePrs*/,
+                                                const Handle(Prs3d_Presentation)& ,
-                                                const Standard_Integer                      /*theMode*/)
+                                                const Standard_Integer )
 {
   Handle(AIS_InteractiveContext) aCtx = GetContext();
   for (PrsMgr_ListOfPresentableObjectsIter anIter (Children()); anIter.More(); anIter.Next())

src/AIS/AIS_MultipleConnectedInteractive.hxx

@@ -107,7 +107,9 @@ protected:
   //! compute anything, but just uses the
   //! presentation of this last object, with
   //! 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 = 0) Standard_OVERRIDE;
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
+                                        const Handle(Prs3d_Presentation)& thePrs,
+                                        const Standard_Integer theMode) Standard_OVERRIDE;
 
   //! Establishes the connection between the Connected Interactive Object, theInteractive, and its reference.
   //! Locates instance in theLocation and applies specified transformation persistence mode.

src/AIS/AIS_Plane.cxx

@@ -208,17 +208,17 @@ void AIS_Plane::SetPlaneAttributes(const Handle(Geom_Plane)& aComponent,
 
 //=======================================================================
 //function : Compute
-//purpose  : 
+//purpose  :
 //=======================================================================
-void AIS_Plane::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
+void AIS_Plane::Compute (const Handle(PrsMgr_PresentationManager)& ,
-			const Handle(Prs3d_Presentation)& aPresentation, 
+                         const Handle(Prs3d_Presentation)& thePrs,
-			const Standard_Integer aMode)
+                         const Standard_Integer theMode)
 {
   ComputeFields();
-  aPresentation->SetInfiniteState(myInfiniteState);
+  thePrs->SetInfiniteState (myInfiniteState);
   myDrawer->PlaneAspect()->EdgesAspect()->SetWidth(myCurrentMode == 0? 1 : 3);
 
-  switch (aMode)
+  switch (theMode)
   {
     case 0:
     {
@@ -228,10 +228,12 @@ void AIS_Plane::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
         const Handle(Geom_Plane)& pl = myComponent;
         Handle(Geom_Plane) thegoodpl (Handle(Geom_Plane)::DownCast(pl->Translated(pl->Location(),myCenter)));
         GeomAdaptor_Surface surf(thegoodpl);
-        StdPrs_Plane::Add(aPresentation,surf,myDrawer);
+        StdPrs_Plane::Add (thePrs, surf, myDrawer);
       }
       else
-        DsgPrs_XYZPlanePresentation::Add(aPresentation,myDrawer,myCenter,myPmin,myPmax);
+      {
+        DsgPrs_XYZPlanePresentation::Add (thePrs, myDrawer, myCenter, myPmin, myPmax);
+      }
       break;
     }
     case 1:
@@ -239,12 +241,12 @@ void AIS_Plane::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
       if (!myIsXYZPlane)
       {
         ComputeFrame();
-        Handle(Prs3d_PlaneAspect) theaspect = myDrawer->PlaneAspect();
+        Handle(Prs3d_PlaneAspect) anAspect = myDrawer->PlaneAspect();
-        Handle(Graphic3d_Group) TheGroup = aPresentation->CurrentGroup();
+        Handle(Graphic3d_Group) aGroup = thePrs->CurrentGroup();
-        TheGroup->SetPrimitivesAspect(myDrawer->ShadingAspect()->Aspect());
+        aGroup->SetPrimitivesAspect (myDrawer->ShadingAspect()->Aspect());
         gp_Pnt p1;
-        const Standard_Real Xmax = 0.5*Standard_Real(theaspect->PlaneXLength());
+        const Standard_Real Xmax = 0.5*Standard_Real(anAspect->PlaneXLength());
-        const Standard_Real Ymax = 0.5*Standard_Real(theaspect->PlaneYLength());
+        const Standard_Real Ymax = 0.5*Standard_Real(anAspect->PlaneYLength());
 
         Handle(Graphic3d_ArrayOfQuadrangles) aQuads = new Graphic3d_ArrayOfQuadrangles(4);
 
@@ -257,10 +259,12 @@ void AIS_Plane::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
         myComponent->D0(-Xmax,-Ymax,p1);
         aQuads->AddVertex(p1);
 
-        TheGroup->AddPrimitiveArray(aQuads);
+        aGroup->AddPrimitiveArray (aQuads);
       }
       else
-        DsgPrs_ShadedPlanePresentation::Add(aPresentation,myDrawer,myCenter,myPmin,myPmax);
+      {
+        DsgPrs_ShadedPlanePresentation::Add (thePrs, myDrawer, myCenter, myPmin, myPmax);
+      }
       break;
     }
   }

src/AIS/AIS_Plane.hxx

@@ -140,12 +140,14 @@ public:
 
 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(PrsMgr_PresentationManager)& thePrsMgr,
-  
+                                        const Handle(Prs3d_Presentation)& thePrs,
+                                        const Standard_Integer theMode) Standard_OVERRIDE;
+
   Standard_EXPORT void ComputeFrame();
-  
+
   Standard_EXPORT void ComputeFields();
-  
+
   Standard_EXPORT void InitDrawerAttributes();
 
 private:

src/AIS/AIS_PlaneTrihedron.cxx

@@ -147,13 +147,13 @@ Standard_Real AIS_PlaneTrihedron::GetLength() const {
 
 //=======================================================================
 //function : Compute
-//purpose  : 
+//purpose  :
 //=======================================================================
-void AIS_PlaneTrihedron::Compute(const Handle(PrsMgr_PresentationManager3d)&,
+void AIS_PlaneTrihedron::Compute (const Handle(PrsMgr_PresentationManager)& ,
-				    const Handle(Prs3d_Presentation)& aPresentation, 
+                                  const Handle(Prs3d_Presentation)& thePrs,
-				    const Standard_Integer)
+                                  const Standard_Integer )
 {
-  aPresentation->SetDisplayPriority(5);
+  thePrs->SetDisplayPriority (5);
   // drawing axis in X direction
   gp_Pnt first, last;
   Standard_Real value = myDrawer->DatumAspect()->AxisLength(Prs3d_DatumParts_XAxis);
@@ -166,7 +166,7 @@ void AIS_PlaneTrihedron::Compute(const Handle(PrsMgr_PresentationManager3d)&,
   first.SetCoord( xo, yo, zo );
   last.SetCoord( xo + x * value, yo + y * value, zo + z * value );
   
-  DsgPrs_XYZAxisPresentation::Add (aPresentation,
+  DsgPrs_XYZAxisPresentation::Add (thePrs,
                                    myDrawer->DatumAspect()->LineAspect(Prs3d_DatumParts_XAxis),
                                    myDrawer->ArrowAspect(),
                                    myDrawer->TextAspect(),
@@ -178,13 +178,13 @@ void AIS_PlaneTrihedron::Compute(const Handle(PrsMgr_PresentationManager3d)&,
 
   yDir.Coord( x, y, z );
   last.SetCoord( xo + x * value, yo + y * value, zo + z * value );
-  DsgPrs_XYZAxisPresentation::Add (aPresentation,
+  DsgPrs_XYZAxisPresentation::Add (thePrs,
                                    myDrawer->DatumAspect()->LineAspect(Prs3d_DatumParts_XAxis),
                                    myDrawer->ArrowAspect(),
                                    myDrawer->TextAspect(),
                                    yDir, value, myYLabel.ToCString(), first, last);
 
-  aPresentation->SetInfiniteState (Standard_True);
+  thePrs->SetInfiniteState (Standard_True);
 }
 
 //=======================================================================

src/AIS/AIS_PlaneTrihedron.hxx

@@ -88,11 +88,14 @@ public:
 
 protected:
 
-  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(PrsMgr_PresentationManager)& theprsMgr,
+                                        const Handle(Prs3d_Presentation)& thePrs,
+                                        const Standard_Integer theMode) Standard_OVERRIDE;
 
 private:
 
-  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
+  Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel,
+                                                 const Standard_Integer theMode) Standard_OVERRIDE;
 
 private:
 

src/AIS/AIS_Point.cxx

@@ -81,23 +81,23 @@ Handle(Geom_Point) AIS_Point::Component()
 //function : Compute
 //purpose  : 
 //=======================================================================
-void AIS_Point::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+void AIS_Point::Compute(const Handle(PrsMgr_PresentationManager)& ,
-                        const Handle(Prs3d_Presentation)& aPresentation, 
+                        const Handle(Prs3d_Presentation)& thePrs,
-                        const Standard_Integer aMode)
+                        const Standard_Integer theMode)
 {
-  aPresentation->SetInfiniteState(myInfiniteState);
+  thePrs->SetInfiniteState (myInfiniteState);
-
+  if (theMode == 0)
-  if (aMode==0)
+  {
-    StdPrs_Point::Add(aPresentation,myComponent,myDrawer);
+    StdPrs_Point::Add (thePrs, myComponent, myDrawer);
-  else if (aMode== -99)
+  }
-    {
+  else if (theMode == -99)
-      Handle(Graphic3d_Group) TheGroup = aPresentation->CurrentGroup();
+  {
-      TheGroup->SetPrimitivesAspect (myHilightDrawer->PointAspect()->Aspect());
+    Handle(Graphic3d_Group) aGroup = thePrs->CurrentGroup();
-      Handle(Graphic3d_ArrayOfPoints) aPoint = new Graphic3d_ArrayOfPoints (1);
+    aGroup->SetPrimitivesAspect (myHilightDrawer->PointAspect()->Aspect());
-      aPoint->AddVertex (myComponent->X(),myComponent->Y(),myComponent->Z());
+    Handle(Graphic3d_ArrayOfPoints) aPoint = new Graphic3d_ArrayOfPoints (1);
-      TheGroup->AddPrimitiveArray (aPoint);
+    aPoint->AddVertex (myComponent->X(), myComponent->Y(), myComponent->Z());
-    }
+    aGroup->AddPrimitiveArray (aPoint);
-    
+  }
 }
 
 //=======================================================================

src/AIS/AIS_Point.hxx

@@ -72,7 +72,9 @@ public:
 
 protected:
 
-  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(PrsMgr_PresentationManager)& thePrsMgr,
+                                        const Handle(Prs3d_Presentation)& thePrs,
+                                        const Standard_Integer theMode) Standard_OVERRIDE;
 
 private:
 

src/AIS/AIS_PointCloud.cxx

@@ -67,9 +67,9 @@ Standard_Boolean AIS_PointCloudOwner::IsForcedHilight() const
 //function : HilightWithColor
 //purpose  :
 //=======================================================================
-void AIS_PointCloudOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+void AIS_PointCloudOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
-                                                      const Handle(Prs3d_Drawer)& theStyle,
+                                            const Handle(Prs3d_Drawer)& theStyle,
-                                                      const Standard_Integer )
+                                            const Standard_Integer )
 {
   Handle(AIS_PointCloud) anObj = Handle(AIS_PointCloud)::DownCast (Selectable());
   if (anObj.IsNull())
@@ -150,7 +150,7 @@ void AIS_PointCloudOwner::HilightWithColor (const Handle(PrsMgr_PresentationMana
 //=======================================================================
 void AIS_PointCloudOwner::Unhilight (const Handle(PrsMgr_PresentationManager)& , const Standard_Integer )
 {
-  if (Handle(Prs3d_Presentation) aPrs = Selectable()->GetSelectPresentation (Handle(PrsMgr_PresentationManager3d)()))
+  if (Handle(Prs3d_Presentation) aPrs = Selectable()->GetSelectPresentation (Handle(PrsMgr_PresentationManager)()))
   {
     aPrs->Erase();
   }
@@ -372,9 +372,9 @@ void AIS_PointCloud::UnsetMaterial()
 //function : Compute
 //purpose  :
 //=======================================================================
-void AIS_PointCloud::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePrsMgr*/,
+void AIS_PointCloud::Compute (const Handle(PrsMgr_PresentationManager)& ,
-                              const Handle(Prs3d_Presentation)&           thePrs,
+                              const Handle(Prs3d_Presentation)& thePrs,
-                              const Standard_Integer                      theMode)
+                              const Standard_Integer theMode)
 {
   switch (theMode)
   {

src/AIS/AIS_PointCloud.hxx

@@ -106,9 +106,9 @@ public:
 protected:
 
   //! Prepare presentation for this object.
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
-                                        const Handle(Prs3d_Presentation)&           thePrs,
+                                        const Handle(Prs3d_Presentation)& thePrs,
-                                        const Standard_Integer                      theMode) Standard_OVERRIDE;
+                                        const Standard_Integer theMode) Standard_OVERRIDE;
 
   //! Prepare selection for this object.
   Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection,
@@ -146,7 +146,7 @@ public:
   Standard_EXPORT virtual Standard_Boolean IsForcedHilight() const Standard_OVERRIDE;
 
   //! Handle dynamic highlighting.
-  Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                                                  const Handle(Prs3d_Drawer)& theStyle,
                                                  const Standard_Integer theMode) Standard_OVERRIDE;
 

src/AIS/AIS_RubberBand.cxx

@@ -390,10 +390,15 @@ Standard_Boolean AIS_RubberBand::fillTriangles()
 //function : Compute
 //purpose  :
 //=======================================================================
-void AIS_RubberBand::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePresentationManager*/,
+void AIS_RubberBand::Compute (const Handle(PrsMgr_PresentationManager)& ,
                               const Handle(Prs3d_Presentation)& thePresentation,
-                              const Standard_Integer /*theMode*/)
+                              const Standard_Integer theMode)
 {
+  if (theMode != 0)
+  {
+    return;
+  }
+
   // Draw filling
   if (IsFilling() && fillTriangles())
   {

src/AIS/AIS_RubberBand.hxx

@@ -135,9 +135,15 @@ public:
 
 protected:
 
+  //! Returns true if the interactive object accepts the display mode.
+  Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE
+  {
+    return theMode == 0;
+  }
+
   //! Computes presentation of rubber band.
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
-                                        const Handle(Prs3d_Presentation)& thePresentation,
+                                        const Handle(Prs3d_Presentation)& thePrs,
                                         const Standard_Integer theMode) Standard_OVERRIDE;
 
   //! Does not fill selection primitives for rubber band.

src/AIS/AIS_Shape.cxx

@@ -115,19 +115,23 @@ AIS_Shape::AIS_Shape(const TopoDS_Shape& theShape)
 
 //=======================================================================
 //function : Compute
-//purpose  : 
+//purpose  :
 //=======================================================================
-void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+void AIS_Shape::Compute (const Handle(PrsMgr_PresentationManager)& ,
-                        const Handle(Prs3d_Presentation)& aPrs,
+                         const Handle(Prs3d_Presentation)& thePrs,
-                        const Standard_Integer theMode)
+                         const Standard_Integer theMode)
-{  
+{
-  if(myshape.IsNull()) return;
+  if (myshape.IsNull())
+  {
+    return;
+  }
 
   // wire,edge,vertex -> pas de HLR + priorite display superieure
-  Standard_Integer TheType = (Standard_Integer) myshape.ShapeType();
+  const Standard_Integer aShapeType = (Standard_Integer )myshape.ShapeType();
-  if(TheType>4 && TheType<8) {
+  if (aShapeType > 4 && aShapeType < 8)
-    aPrs->SetVisual(Graphic3d_TOS_ALL);
+  {
-    aPrs->SetDisplayPriority(TheType+2);
+    thePrs->SetVisual (Graphic3d_TOS_ALL);
+    thePrs->SetDisplayPriority (aShapeType + 2);
   }
   // Shape vide -> Assemblage vide.
   if (myshape.ShapeType() == TopAbs_COMPOUND && myshape.NbChildren() == 0)
@@ -137,7 +141,7 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
 
   if (IsInfinite())
   {
-    aPrs->SetInfiniteState (Standard_True); //not taken in account during FITALL
+    thePrs->SetInfiniteState (Standard_True); //not taken in account during FITALL
   }
 
   switch (theMode)
@@ -148,7 +152,7 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
       try
       {
         OCC_CATCH_SIGNALS
-        StdPrs_WFShape::Add (aPrs, myshape, myDrawer);
+        StdPrs_WFShape::Add (thePrs, myshape, myDrawer);
       }
       catch (Standard_Failure const& anException)
       {
@@ -162,20 +166,20 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
       StdPrs_ToolTriangulatedShape::ClearOnOwnDeflectionChange (myshape, myDrawer, Standard_True);
       if ((Standard_Integer) myshape.ShapeType() > 4)
       {
-        StdPrs_WFShape::Add (aPrs, myshape, myDrawer);
+        StdPrs_WFShape::Add (thePrs, myshape, myDrawer);
       }
       else
       {
         if (IsInfinite())
         {
-          StdPrs_WFShape::Add (aPrs, myshape, myDrawer);
+          StdPrs_WFShape::Add (thePrs, myshape, myDrawer);
         }
         else
         {
           try
           {
             OCC_CATCH_SIGNALS
-            StdPrs_ShadedShape::Add (aPrs, myshape, myDrawer,
+            StdPrs_ShadedShape::Add (thePrs, myshape, myDrawer,
                                      myDrawer->ShadingAspect()->Aspect()->ToMapTexture()
                                  && !myDrawer->ShadingAspect()->Aspect()->TextureMap().IsNull(),
                                      myUVOrigin, myUVRepeat, myUVScale);
@@ -184,7 +188,7 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
           {
             Message::SendFail (TCollection_AsciiString("Error: AIS_Shape::Compute() shaded presentation builder has failed (")
                              + anException.GetMessageString() + ")");
-            StdPrs_WFShape::Add (aPrs, myshape, myDrawer);
+            StdPrs_WFShape::Add (thePrs, myshape, myDrawer);
           }
         }
       }
@@ -201,17 +205,17 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
     {
       if (IsInfinite())
       {
-        StdPrs_WFShape::Add (aPrs, myshape, myDrawer);
+        StdPrs_WFShape::Add (thePrs, myshape, myDrawer);
       }
       else
       {
-        Prs3d_BndBox::Add (aPrs, BoundingBox(), myDrawer);
+        Prs3d_BndBox::Add (thePrs, BoundingBox(), myDrawer);
       }
     }
   }
 
   // Recompute hidden line presentation (if necessary).
-  aPrs->ReCompute();
+  thePrs->ReCompute();
 }
 
 //=======================================================================

src/AIS/AIS_Shape.hxx

@@ -248,7 +248,7 @@ public: //! @name methods to alter texture mapping properties
 protected:
 
   //! Compute normal presentation.
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                                         const Handle(Prs3d_Presentation)& thePrs,
                                         const Standard_Integer theMode) Standard_OVERRIDE;
 

src/AIS/AIS_TextLabel.cxx

@@ -263,9 +263,9 @@ void AIS_TextLabel::SetColorSubTitle (const Quantity_Color& theColor)
 //function : Compute
 //purpose  :
 //=======================================================================
-void AIS_TextLabel::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePrsMgr*/,
+void AIS_TextLabel::Compute (const Handle(PrsMgr_PresentationManager)& ,
-                             const Handle(Prs3d_Presentation)&             thePrs,
+                             const Handle(Prs3d_Presentation)& thePrs,
-                             const Standard_Integer                        theMode)
+                             const Standard_Integer theMode)
 {
   switch (theMode)
   {

src/AIS/AIS_TextLabel.hxx

@@ -132,9 +132,9 @@ public:
 protected:
 
   //! Compute
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& theprsMgr,
-                                        const Handle(Prs3d_Presentation)&           thePresentation,
+                                        const Handle(Prs3d_Presentation)& thePrs,
-                                        const Standard_Integer                      theMode) Standard_OVERRIDE;
+                                        const Standard_Integer theMode) Standard_OVERRIDE;
 
   //! Compute selection
   Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection,

src/AIS/AIS_TexturedShape.cxx

@@ -30,7 +30,7 @@
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_ShadingAspect.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Prs3d_BndBox.hxx>
 #include <StdPrs_ShadedShape.hxx>
@@ -345,10 +345,9 @@ void AIS_TexturedShape::updateAttributes (const Handle(Prs3d_Presentation)& theP
 //function : Compute
 //purpose  :
 //=======================================================================
-
+void AIS_TexturedShape::Compute (const Handle(PrsMgr_PresentationManager)& ,
-void AIS_TexturedShape::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePrsMgr*/,
+                                 const Handle(Prs3d_Presentation)& thePrs,
-                                 const Handle(Prs3d_Presentation)&           thePrs,
+                                 const Standard_Integer theMode)
-                                 const Standard_Integer                      theMode)
 {
   if (myshape.IsNull())
   {

src/AIS/AIS_TexturedShape.hxx

@@ -25,7 +25,7 @@
 #include <Graphic3d_AspectFillArea3d.hxx>
 #include <Graphic3d_Texture2Dmanual.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 
 class Graphic3d_AspectFillArea3d;
 class Graphic3d_Texture2Dmanual;
@@ -178,9 +178,9 @@ public: //! @name methods to alter texture mapping properties
 protected: //! @name overridden methods
 
   //! Compute presentation with texture mapping support.
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
-                                        const Handle(Prs3d_Presentation)&           thePrs,
+                                        const Handle(Prs3d_Presentation)& thePrs,
-                                        const Standard_Integer                      theMode) Standard_OVERRIDE;
+                                        const Standard_Integer theMode) Standard_OVERRIDE;
 
   Standard_EXPORT void updateAttributes (const Handle(Prs3d_Presentation)& thePrs);
 

src/AIS/AIS_Triangulation.cxx

@@ -116,78 +116,76 @@ void AIS_Triangulation::updatePresentation()
 //function : Compute
 //purpose  :
 //=======================================================================
-void AIS_Triangulation::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+void AIS_Triangulation::Compute (const Handle(PrsMgr_PresentationManager)& ,
-                                const Handle(Prs3d_Presentation)& aPresentation,
+                                 const Handle(Prs3d_Presentation)& thePrs,
-                                const Standard_Integer aMode)
+                                 const Standard_Integer theMode)
 {
-  switch (aMode)
+  if (theMode != 0)
   {
-    case 0:
+    return;
-      Standard_Boolean hasVNormals = myTriangulation->HasNormals();
-      Standard_Boolean hasVColors  = HasVertexColors();
-
-      Handle(Graphic3d_ArrayOfTriangles) anArray = new Graphic3d_ArrayOfTriangles (myNbNodes, myNbTriangles * 3,
-                                                                                   hasVNormals, hasVColors, Standard_False);
-      Handle(Graphic3d_Group) TheGroup = aPresentation->CurrentGroup();
-      Handle(Graphic3d_AspectFillArea3d) aspect = myDrawer->ShadingAspect()->Aspect();
-
-      Standard_Integer i;
-
-      const Standard_Real ambient = 0.2;
-      if (hasVNormals)
-      {
-        gp_Vec3f aNormal;
-        if (hasVColors)
-        {
-          const TColStd_Array1OfInteger& colors = myColor->Array1();
-          for ( i = 1; i <= myTriangulation->NbNodes(); i++ )
-          {
-            anArray->AddVertex (myTriangulation->Node (i), attenuateColor (colors[i], ambient));
-            myTriangulation->Normal (i, aNormal);
-            anArray->SetVertexNormal (i, aNormal.x(), aNormal.y(), aNormal.z());
-          }
-        }
-        else // !hasVColors
-        {
-          for ( i = 1; i <= myTriangulation->NbNodes(); i++ )
-          {
-            anArray->AddVertex (myTriangulation->Node (i));
-            myTriangulation->Normal (i, aNormal);
-            anArray->SetVertexNormal(i, aNormal.x(), aNormal.y(), aNormal.z());
-          }
-        }
-      }
-      else // !hasVNormals
-      {
-        if (hasVColors)
-        {
-          const TColStd_Array1OfInteger& colors = myColor->Array1();
-          for ( i = 1; i <= myTriangulation->NbNodes(); i++ )
-          {
-            anArray->AddVertex (myTriangulation->Node (i), attenuateColor(colors(i), ambient));
-          }
-        }
-        else // !hasVColors
-        {
-          for ( i = 1; i <= myTriangulation->NbNodes(); i++ )
-          {
-            anArray->AddVertex (myTriangulation->Node (i));
-          }
-        }
-      }
-
-      Standard_Integer indexTriangle[3] = {0,0,0};
-      for ( i = 1; i<= myTriangulation->NbTriangles(); i++ )
-      {
-        myTriangulation->Triangle (i).Get (indexTriangle[0], indexTriangle[1], indexTriangle[2]);
-        anArray->AddEdge(indexTriangle[0]);
-        anArray->AddEdge(indexTriangle[1]);
-        anArray->AddEdge(indexTriangle[2]);
-      }
-      TheGroup->SetPrimitivesAspect(aspect);
-      TheGroup->AddPrimitiveArray(anArray);
-      break;
   }
+
+  Standard_Boolean hasVNormals = myTriangulation->HasNormals();
+  Standard_Boolean hasVColors  = HasVertexColors();
+
+  Handle(Graphic3d_ArrayOfTriangles) anArray = new Graphic3d_ArrayOfTriangles (myNbNodes, myNbTriangles * 3,
+                                                                               hasVNormals, hasVColors, Standard_False);
+  Handle(Graphic3d_Group) aGroup = thePrs->CurrentGroup();
+  Handle(Graphic3d_AspectFillArea3d) anAspect = myDrawer->ShadingAspect()->Aspect();
+
+  const Standard_Real anAmbient = 0.2;
+  if (hasVNormals)
+  {
+    gp_Vec3f aNormal;
+    if (hasVColors)
+    {
+      const TColStd_Array1OfInteger& colors = myColor->Array1();
+      for (Standard_Integer aNodeIter = 1; aNodeIter <= myTriangulation->NbNodes(); ++aNodeIter)
+      {
+        anArray->AddVertex (myTriangulation->Node (aNodeIter), attenuateColor (colors[aNodeIter], anAmbient));
+        myTriangulation->Normal (aNodeIter, aNormal);
+        anArray->SetVertexNormal (aNodeIter, aNormal.x(), aNormal.y(), aNormal.z());
+      }
+    }
+    else // !hasVColors
+    {
+      for (Standard_Integer aNodeIter = 1; aNodeIter <= myTriangulation->NbNodes(); ++aNodeIter)
+      {
+        anArray->AddVertex (myTriangulation->Node (aNodeIter));
+        myTriangulation->Normal (aNodeIter, aNormal);
+        anArray->SetVertexNormal(aNodeIter, aNormal.x(), aNormal.y(), aNormal.z());
+      }
+    }
+  }
+  else // !hasVNormals
+  {
+    if (hasVColors)
+    {
+      const TColStd_Array1OfInteger& colors = myColor->Array1();
+      for (Standard_Integer aNodeIter = 1; aNodeIter <= myTriangulation->NbNodes(); ++aNodeIter)
+      {
+        anArray->AddVertex (myTriangulation->Node (aNodeIter), attenuateColor (colors[aNodeIter], anAmbient));
+      }
+    }
+    else // !hasVColors
+    {
+      for (Standard_Integer aNodeIter = 1; aNodeIter <= myTriangulation->NbNodes(); ++aNodeIter)
+      {
+        anArray->AddVertex (myTriangulation->Node (aNodeIter));
+      }
+    }
+  }
+
+  Standard_Integer aTriIndices[3] = {0,0,0};
+  for (Standard_Integer aTriIter = 1; aTriIter <= myTriangulation->NbTriangles(); ++aTriIter)
+  {
+    myTriangulation->Triangle (aTriIter).Get (aTriIndices[0], aTriIndices[1], aTriIndices[2]);
+    anArray->AddEdge (aTriIndices[0]);
+    anArray->AddEdge (aTriIndices[1]);
+    anArray->AddEdge (aTriIndices[2]);
+  }
+  aGroup->SetPrimitivesAspect (anAspect);
+  aGroup->AddPrimitiveArray (anArray);
 }
 
 //=======================================================================

src/AIS/AIS_Triangulation.hxx

@@ -67,15 +67,15 @@ protected:
 
   Standard_EXPORT void updatePresentation();
 
-
-
 private:
 
-  
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
+                                        const Handle(Prs3d_Presentation)& thePrs,
-  
+                                        const Standard_Integer theMode) Standard_OVERRIDE;
-  Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
+
-  
+  Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel,
+                                                 const Standard_Integer theMode) Standard_OVERRIDE;
+
   //! Attenuates 32-bit color by a given attenuation factor (0...1):
   //! aColor = Alpha << 24 + Blue << 16 + Green << 8 + Red
   //! All color components are multiplied by aComponent, the result is then packed again as 32-bit integer.

src/AIS/AIS_Trihedron.cxx

@@ -165,7 +165,7 @@ Standard_Real AIS_Trihedron::Size() const
 //function : Compute
 //purpose  :
 //=======================================================================
-void AIS_Trihedron::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+void AIS_Trihedron::Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                              const Handle(Prs3d_Presentation)& thePrs,
                              const Standard_Integer theMode)
 {
@@ -257,7 +257,7 @@ void AIS_Trihedron::ComputeSelection (const Handle(SelectMgr_Selection)& theSele
 //function : HilightOwnerWithColor
 //purpose  :
 //=======================================================================
-void AIS_Trihedron::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM,
+void AIS_Trihedron::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePM,
                                            const Handle(Prs3d_Drawer)& theStyle,
                                            const Handle(SelectMgr_EntityOwner)& theOwner)
 {
@@ -318,7 +318,7 @@ void AIS_Trihedron::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManag
 //function : HilightSelected
 //purpose  :
 //========================================================================
-void AIS_Trihedron::HilightSelected (const Handle(PrsMgr_PresentationManager3d)& thePM,
+void AIS_Trihedron::HilightSelected (const Handle(PrsMgr_PresentationManager)& thePM,
                                      const SelectMgr_SequenceOfOwner& theOwners)
 {
   if (theOwners.IsEmpty() || !HasInteractiveContext())
@@ -415,7 +415,7 @@ void AIS_Trihedron::ClearSelected()
 //function : computePresentation
 //purpose  :
 //=======================================================================
-void AIS_Trihedron::computePresentation (const Handle(PrsMgr_PresentationManager3d)& /*thePrsMgr*/,
+void AIS_Trihedron::computePresentation (const Handle(PrsMgr_PresentationManager)& /*thePrsMgr*/,
                                          const Handle(Prs3d_Presentation)& thePrs)
 {
   for (Standard_Integer aPartIter = 0; aPartIter < Prs3d_DatumParts_NB; ++aPartIter)

src/AIS/AIS_Trihedron.hxx

@@ -21,7 +21,7 @@
 #include <AIS_KindOfInteractive.hxx>
 #include <AIS_TrihedronSelectionMode.hxx>
 #include <Graphic3d_ArrayOfTriangles.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Prs3d_DatumAspect.hxx>
 #include <Prs3d_DatumMode.hxx>
 #include <Prs3d_DatumParts.hxx>
@@ -189,19 +189,19 @@ public:
   Standard_EXPORT virtual void ClearSelected() Standard_OVERRIDE;
 
   //! Method which draws selected owners ( for fast presentation draw ).
-  Standard_EXPORT virtual void HilightSelected (const Handle(PrsMgr_PresentationManager3d)& thePM,
+  Standard_EXPORT virtual void HilightSelected (const Handle(PrsMgr_PresentationManager)& thePM,
                                                 const SelectMgr_SequenceOfOwner& theOwners) Standard_OVERRIDE;
 
   //! Method which hilight an owner belonging to
   //! this selectable object  ( for fast presentation draw ).
-  Standard_EXPORT virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM,
+  Standard_EXPORT virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePM,
                                                       const Handle(Prs3d_Drawer)& theStyle,
                                                       const Handle(SelectMgr_EntityOwner)& theOwner) Standard_OVERRIDE;
 
 protected:
 
   //! Compute trihedron presentation.
-  Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                                 const Handle(Prs3d_Presentation)& thePrs,
                                 const Standard_Integer theMode) Standard_OVERRIDE;
 
@@ -219,7 +219,7 @@ protected:
                                                      const Handle(SelectMgr_EntityOwner)& theOwner) const;
 
   //! Computes presentation for display mode equal 1.
-  Standard_EXPORT void computePresentation (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  Standard_EXPORT void computePresentation (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                                             const Handle(Prs3d_Presentation)& thePrs);
 
   //! Returns own datum aspect of trihedron, create this aspect if it was not created yet.

src/AIS/AIS_TrihedronOwner.cxx

@@ -32,7 +32,7 @@ AIS_TrihedronOwner::AIS_TrihedronOwner (const Handle(SelectMgr_SelectableObject)
 // function : HilightWithColor
 // purpose  :
 // =======================================================================
-void AIS_TrihedronOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM,
+void AIS_TrihedronOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM,
                                            const Handle(Prs3d_Drawer)& theStyle,
                                            const Standard_Integer /*theMode*/)
 {

src/AIS/AIS_TrihedronOwner.hxx

@@ -34,7 +34,7 @@ public:
   Prs3d_DatumParts DatumPart() const { return myDatumPart; }
 
   //! Highlights selectable object's presentation.
-  Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM,
+  Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM,
                                                  const Handle(Prs3d_Drawer)& theStyle,
                                                  const Standard_Integer theMode) Standard_OVERRIDE;
 

src/AIS/AIS_ViewCube.cxx

@@ -563,7 +563,7 @@ void AIS_ViewCube::createBoxCornerTriangles (const Handle(Graphic3d_ArrayOfTrian
 //function : Compute
 //purpose  :
 //=======================================================================
-void AIS_ViewCube::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
+void AIS_ViewCube::Compute (const Handle(PrsMgr_PresentationManager)& ,
                             const Handle(Prs3d_Presentation)& thePrs,
                             const Standard_Integer theMode)
 {
@@ -1001,7 +1001,7 @@ void AIS_ViewCube::HandleClick (const Handle(AIS_ViewCubeOwner)& theOwner)
 //function : HilightOwnerWithColor
 //purpose  :
 //=======================================================================
-void AIS_ViewCube::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+void AIS_ViewCube::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                                           const Handle(Prs3d_Drawer)& theStyle,
                                           const Handle(SelectMgr_EntityOwner)& theOwner)
 {
@@ -1044,7 +1044,7 @@ void AIS_ViewCube::HilightOwnerWithColor (const Handle(PrsMgr_PresentationManage
 //function : HilightSelected
 //purpose  :
 //=======================================================================
-void AIS_ViewCube::HilightSelected (const Handle(PrsMgr_PresentationManager3d)& ,
+void AIS_ViewCube::HilightSelected (const Handle(PrsMgr_PresentationManager)& ,
                                     const SelectMgr_SequenceOfOwner& theSeq)
 {
   // this method should never be called since AIS_InteractiveObject::HandleClick() has been overridden

src/AIS/AIS_ViewCube.hxx

@@ -533,7 +533,7 @@ public: //! @name Presentation computation
   //! @param thePrs [in] input presentation that is to be filled with flat presentation primitives.
   //! @param theMode [in] display mode.
   //! @warning this object accept only 0 display mode.
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                                         const Handle(Prs3d_Presentation)& thePrs,
                                         const Standard_Integer theMode = 0) Standard_OVERRIDE;
 
@@ -555,12 +555,12 @@ public: //! @name Presentation computation
   //! @param thePM [in] presentation manager
   //! @param theStyle [in] style for dynamic highlighting.
   //! @param theOwner [in] input entity owner.
-  Standard_EXPORT virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM,
+  Standard_EXPORT virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePM,
                                                       const Handle(Prs3d_Drawer)& theStyle,
                                                       const Handle(SelectMgr_EntityOwner)& theOwner) Standard_OVERRIDE;
 
   //! Method which draws selected owners.
-  Standard_EXPORT virtual void HilightSelected (const Handle(PrsMgr_PresentationManager3d)& thePM,
+  Standard_EXPORT virtual void HilightSelected (const Handle(PrsMgr_PresentationManager)& thePM,
                                                 const SelectMgr_SequenceOfOwner& theSeq) Standard_OVERRIDE;
 
   //! Set default parameters for visual attributes

src/AIS/AIS_XRTrackedDevice.cxx

@@ -148,7 +148,7 @@ void AIS_XRTrackedDevice::computeLaserRay()
 //function : Compute
 //purpose  :
 //=======================================================================
-void AIS_XRTrackedDevice::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
+void AIS_XRTrackedDevice::Compute (const Handle(PrsMgr_PresentationManager)& ,
                                    const Handle(Prs3d_Presentation)& thePrs,
                                    const Standard_Integer theMode)
 {

src/AIS/AIS_XRTrackedDevice.hxx

@@ -62,7 +62,7 @@ protected:
   virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE { return theMode == 0; }
 
   //! Compute presentation.
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                                         const Handle(Prs3d_Presentation)& thePrs,
                                         const Standard_Integer theMode) Standard_OVERRIDE;
 

src/IVtkOCC/IVtkOCC_SelectableObject.hxx

@@ -64,7 +64,7 @@ private:
                                  const Standard_Integer theMode) Standard_OVERRIDE;
 
   //! Dummy.
-  virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& ,
+  virtual void Compute (const Handle(PrsMgr_PresentationManager)& ,
                         const Handle(Prs3d_Presentation)& ,
                         const Standard_Integer ) Standard_OVERRIDE {}
 

src/MeshVS/MeshVS_Mesh.cxx

@@ -43,7 +43,7 @@
 #include <Prs3d_PointAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_ShadingAspect.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Select3D_SensitiveBox.hxx>
 #include <Select3D_SensitiveGroup.hxx>
 #include <Select3D_SensitivePoint.hxx>
@@ -166,7 +166,7 @@ Standard_Boolean MeshVS_Mesh::AcceptDisplayMode (const Standard_Integer theMode)
 // Function : Compute
 // Purpose  :
 //================================================================
-void MeshVS_Mesh::Compute ( const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
+void MeshVS_Mesh::Compute ( const Handle(PrsMgr_PresentationManager)& thePrsMgr,
                             const Handle(Prs3d_Presentation)& thePresentation,
                             const Standard_Integer theMode )
 {
@@ -927,7 +927,7 @@ void MeshVS_Mesh::SetDataSource( const Handle(MeshVS_DataSource)& theDataSource
 // Function : HilightSelected
 // Purpose  :
 //================================================================
-void MeshVS_Mesh::HilightSelected ( const Handle(PrsMgr_PresentationManager3d)& thePM,
+void MeshVS_Mesh::HilightSelected ( const Handle(PrsMgr_PresentationManager)& thePM,
                                     const SelectMgr_SequenceOfOwner& theOwners )
 {
   if ( myHilighter.IsNull() )
@@ -1073,7 +1073,7 @@ void MeshVS_Mesh::HilightSelected ( const Handle(PrsMgr_PresentationManager3d)&
 // Function : HilightOwnerWithColor
 // Purpose  :
 //================================================================
-void MeshVS_Mesh::HilightOwnerWithColor ( const Handle(PrsMgr_PresentationManager3d)& thePM,
+void MeshVS_Mesh::HilightOwnerWithColor ( const Handle(PrsMgr_PresentationManager)& thePM,
                                           const Handle(Prs3d_Drawer)& theStyle,
                                           const Handle(SelectMgr_EntityOwner)& theOwner)
 {

src/MeshVS/MeshVS_Mesh.hxx

@@ -48,19 +48,23 @@ public:
 
   //! Computes presentation using builders added to sequence. Each builder computes
   //! own part of mesh presentation according to its type.
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& PM, const Handle(Prs3d_Presentation)& Prs, const Standard_Integer DisplayMode) Standard_OVERRIDE;
+  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
-  
+                                        const Handle(Prs3d_Presentation)& thePrs,
+                                        const Standard_Integer theDispMode) Standard_OVERRIDE;
+
   //! Computes selection according to SelectMode
-  Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& Sel, const Standard_Integer SelectMode) Standard_OVERRIDE;
+  Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSel,
-  
+                                                 const Standard_Integer theSelMode) Standard_OVERRIDE;
+
   //! Draw selected owners presentation
-  Standard_EXPORT virtual void HilightSelected (const Handle(PrsMgr_PresentationManager3d)& PM, const SelectMgr_SequenceOfOwner& Owners) Standard_OVERRIDE;
+  Standard_EXPORT virtual void HilightSelected (const Handle(PrsMgr_PresentationManager)& thePrsMgr,
-  
+                                                const SelectMgr_SequenceOfOwner& theOwners) Standard_OVERRIDE;
+
   //! Draw hilighted owner presentation
-  Standard_EXPORT virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM,
+  Standard_EXPORT virtual void HilightOwnerWithColor (const Handle(PrsMgr_PresentationManager)& thePM,
                                                       const Handle(Prs3d_Drawer)& theColor,
                                                       const Handle(SelectMgr_EntityOwner)& theOwner) Standard_OVERRIDE;
-  
+
   //! Clears internal selection presentation
   Standard_EXPORT virtual void ClearSelected() Standard_OVERRIDE;
   

src/MeshVS/MeshVS_MeshEntityOwner.cxx

@@ -18,7 +18,7 @@
 #include <MeshVS_Mesh.hxx>
 #include <MeshVS_MeshEntityOwner.hxx>
 #include <PrsMgr_PresentationManager.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <SelectMgr_SelectableObject.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_ListIteratorOfListOfReal.hxx>
@@ -91,7 +91,7 @@ Standard_Boolean MeshVS_MeshEntityOwner::IsHilighted ( const Handle(PrsMgr_Prese
 // Function : HilightWithColor
 // Purpose  :
 //================================================================
-void MeshVS_MeshEntityOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM,
+void MeshVS_MeshEntityOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM,
                                                const Handle(Prs3d_Drawer)& theStyle,
                                                const Standard_Integer /*theMode*/ )
 {

src/MeshVS/MeshVS_MeshEntityOwner.hxx

@@ -18,7 +18,7 @@
 
 #include <MeshVS_EntityType.hxx>
 #include <SelectMgr_EntityOwner.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <PrsMgr_PresentationManager.hxx>
 #include <Quantity_NameOfColor.hxx>
 class PrsMgr_PresentationManager;
 
@@ -54,9 +54,9 @@ public:
   Standard_EXPORT virtual Standard_Boolean IsHilighted (const Handle(PrsMgr_PresentationManager)& PM, const Standard_Integer Mode = 0) const Standard_OVERRIDE;
   
   //! Hilights owner with the certain color
-  Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM,
+  Standard_EXPORT virtual void HilightWithColor (const Handle(PrsMgr_PresentationManager)& thePM,
                                                  const Handle(Prs3d_Drawer)& theStyle,
-                                                 const Standard_Integer theMode = 0) Standard_OVERRIDE;
+                                                 const Standard_Integer theMode) Standard_OVERRIDE;
   
   //! Strip hilight of owner
   Standard_EXPORT virtual void Unhilight (const Handle(PrsMgr_PresentationManager)& PM, const Standard_Integer Mode = 0) Standard_OVERRIDE;