From 208dc370ac74ba20fd70bdad5e763d43243d17e5 Mon Sep 17 00:00:00 2001 From: kgv Date: Fri, 9 Aug 2019 13:00:30 +0300 Subject: [PATCH] 0030863: Visualization, SelectMgr_ViewerSelector - disabling of View clipping planes is ignored for transformed objects SelectMgr_ViewerSelector::computeFrustum() - fixed lost clipping planes when creating a new frustum. --- .../SelectMgr_RectangularFrustum.hxx | 6 ++++ .../SelectMgr_SelectingVolumeManager.cxx | 15 ++++++++ .../SelectMgr_SelectingVolumeManager.hxx | 3 ++ src/SelectMgr/SelectMgr_ViewerSelector.cxx | 34 +++++++++++-------- src/SelectMgr/SelectMgr_ViewerSelector.hxx | 13 ++++--- 5 files changed, 50 insertions(+), 21 deletions(-) diff --git a/src/SelectMgr/SelectMgr_RectangularFrustum.hxx b/src/SelectMgr/SelectMgr_RectangularFrustum.hxx index 41f340c613..3d8ad31e89 100644 --- a/src/SelectMgr/SelectMgr_RectangularFrustum.hxx +++ b/src/SelectMgr/SelectMgr_RectangularFrustum.hxx @@ -109,6 +109,12 @@ public: Standard_EXPORT virtual void SetViewClipping (const Handle(Graphic3d_SequenceOfHClipPlane)& theViewPlanes, const Handle(Graphic3d_SequenceOfHClipPlane)& theObjPlanes) Standard_OVERRIDE; + //! Return clipping range. + const SelectMgr_ViewClipRange& ViewClipRanges() const { return myViewClipRange; } + + //! Set clipping range. + void SetViewClipRanges (const SelectMgr_ViewClipRange& theRange) { myViewClipRange = theRange; } + //! A set of helper functions that return rectangular selecting frustum data inline const gp_Pnt* GetVertices() const { return myVertices; } diff --git a/src/SelectMgr/SelectMgr_SelectingVolumeManager.cxx b/src/SelectMgr/SelectMgr_SelectingVolumeManager.cxx index a3a43fda9a..b98a255dc2 100644 --- a/src/SelectMgr/SelectMgr_SelectingVolumeManager.cxx +++ b/src/SelectMgr/SelectMgr_SelectingVolumeManager.cxx @@ -465,3 +465,18 @@ void SelectMgr_SelectingVolumeManager::SetViewClipping (const Handle(Graphic3d_S mySelectingVolumes[Frustum]->SetViewClipping (theViewPlanes, theObjPlanes); } + +//======================================================================= +// function : SetViewClipping +// purpose : +//======================================================================= +void SelectMgr_SelectingVolumeManager::SetViewClipping (const SelectMgr_SelectingVolumeManager& theOther) +{ + myViewClipPlanes = theOther.ViewClipping(); + myObjectClipPlanes = theOther.ObjectClipping(); + if (myActiveSelectionType != Point) + return; + + const SelectMgr_RectangularFrustum* aFrOther = reinterpret_cast(theOther.mySelectingVolumes[Frustum].get()); + reinterpret_cast(mySelectingVolumes[Frustum].get())->SetViewClipRanges (aFrOther->ViewClipRanges()); +} diff --git a/src/SelectMgr/SelectMgr_SelectingVolumeManager.hxx b/src/SelectMgr/SelectMgr_SelectingVolumeManager.hxx index 87a9206cbd..1c8bda3485 100644 --- a/src/SelectMgr/SelectMgr_SelectingVolumeManager.hxx +++ b/src/SelectMgr/SelectMgr_SelectingVolumeManager.hxx @@ -178,6 +178,9 @@ public: Standard_EXPORT void SetViewClipping (const Handle(Graphic3d_SequenceOfHClipPlane)& theViewPlanes, const Handle(Graphic3d_SequenceOfHClipPlane)& theObjPlanes); + //! Copy clipping planes from another volume manager. + Standard_EXPORT void SetViewClipping (const SelectMgr_SelectingVolumeManager& theOther); + //! A set of helper functions that return rectangular selecting frustum data Standard_EXPORT const gp_Pnt* GetVertices() const; diff --git a/src/SelectMgr/SelectMgr_ViewerSelector.cxx b/src/SelectMgr/SelectMgr_ViewerSelector.cxx index e80ff644df..262f704f5e 100644 --- a/src/SelectMgr/SelectMgr_ViewerSelector.cxx +++ b/src/SelectMgr/SelectMgr_ViewerSelector.cxx @@ -250,15 +250,14 @@ void SelectMgr_ViewerSelector::checkOverlap (const Handle(Select3D_SensitiveEnti //======================================================================= // function: computeFrustum -// purpose : Internal function that checks if a current selecting frustum -// needs to be scaled and transformed for the entity and performs -// necessary calculations +// purpose : //======================================================================= void SelectMgr_ViewerSelector::computeFrustum (const Handle(Select3D_SensitiveEntity)& theEnt, - const SelectMgr_SelectingVolumeManager& theMgr, - const gp_GTrsf& theInvTrsf, - SelectMgr_FrustumCache& theCachedMgrs, - SelectMgr_SelectingVolumeManager& theResMgr) + const SelectMgr_SelectingVolumeManager& theMgrGlobal, + const SelectMgr_SelectingVolumeManager& theMgrObject, + const gp_GTrsf& theInvTrsf, + SelectMgr_FrustumCache& theCachedMgrs, + SelectMgr_SelectingVolumeManager& theResMgr) { Standard_Integer aScale = isToScaleFrustum (theEnt) ? sensitivity (theEnt) : 1; const gp_GTrsf aTrsfMtr = theEnt->HasInitLocation() ? theEnt->InvInitLocation() * theInvTrsf : theInvTrsf; @@ -266,19 +265,26 @@ void SelectMgr_ViewerSelector::computeFrustum (const Handle(Select3D_SensitiveEn const Standard_Boolean toTransform = aTrsfMtr.Form() != gp_Identity; if (toScale && toTransform) { - theResMgr = theMgr.ScaleAndTransform (aScale, aTrsfMtr, NULL); + theResMgr = theMgrGlobal.ScaleAndTransform (aScale, aTrsfMtr, NULL); + theResMgr.SetViewClipping (theMgrObject); } else if (toScale) { - if (!theCachedMgrs.IsBound (aScale)) + if (!theCachedMgrs.Find (aScale, theResMgr)) { - theCachedMgrs.Bind (aScale, theMgr.ScaleAndTransform (aScale, gp_Trsf(), NULL)); + theResMgr = theMgrGlobal.ScaleAndTransform (aScale, gp_Trsf(), NULL); + theCachedMgrs.Bind (aScale, theResMgr); } - theResMgr = theCachedMgrs.Find (aScale); + theResMgr.SetViewClipping (theMgrObject); } else if (toTransform) { - theResMgr = theMgr.ScaleAndTransform (1, aTrsfMtr, NULL); + theResMgr = theMgrGlobal.ScaleAndTransform (1, aTrsfMtr, NULL); + theResMgr.SetViewClipping (theMgrObject); + } + else + { + theResMgr = theMgrObject; } } @@ -408,6 +414,7 @@ void SelectMgr_ViewerSelector::traverseObject (const Handle(SelectMgr_Selectable Standard_Integer aHead = -1; Standard_Integer aNode = 0; // a root node SelectMgr_FrustumCache aScaledTrnsfFrustums; + SelectMgr_SelectingVolumeManager aTmpMgr; for (;;) { if (!aSensitivesTree->IsOuter (aNode)) @@ -484,8 +491,7 @@ void SelectMgr_ViewerSelector::traverseObject (const Handle(SelectMgr_Selectable if (aSensitive->IsActiveForSelection()) { const Handle(Select3D_SensitiveEntity)& anEnt = aSensitive->BaseSensitive(); - SelectMgr_SelectingVolumeManager aTmpMgr = aMgr; - computeFrustum (anEnt, theMgr, aInversedTrsf, aScaledTrnsfFrustums, aTmpMgr); + computeFrustum (anEnt, theMgr, aMgr, aInversedTrsf, aScaledTrnsfFrustums, aTmpMgr); checkOverlap (anEnt, aInversedTrsf, aTmpMgr); } } diff --git a/src/SelectMgr/SelectMgr_ViewerSelector.hxx b/src/SelectMgr/SelectMgr_ViewerSelector.hxx index c776afbc2e..70b032cd1c 100644 --- a/src/SelectMgr/SelectMgr_ViewerSelector.hxx +++ b/src/SelectMgr/SelectMgr_ViewerSelector.hxx @@ -290,14 +290,13 @@ private: //! removes a Selection from the Selector void Remove (const Handle(SelectMgr_Selection)& aSelection); - //! Internal function that checks if a current selecting frustum - //! needs to be scaled and transformed for the entity and performs - //! necessary calculations + //! Internal function that checks if a current selecting frustum needs to be scaled and transformed for the entity and performs necessary calculations. void computeFrustum (const Handle(Select3D_SensitiveEntity)& theEnt, - const SelectMgr_SelectingVolumeManager& theMgr, - const gp_GTrsf& theInvTrsf, - SelectMgr_FrustumCache& theCachedMgrs, - SelectMgr_SelectingVolumeManager& theResMgr); + const SelectMgr_SelectingVolumeManager& theMgrGlobal, + const SelectMgr_SelectingVolumeManager& theMgrObject, + const gp_GTrsf& theInvTrsf, + SelectMgr_FrustumCache& theCachedMgrs, + SelectMgr_SelectingVolumeManager& theResMgr); private: // implementation of deprecated methods