From c97e9d139175e6370405bd366fc1e48bbec8d72d Mon Sep 17 00:00:00 2001 From: aba Date: Fri, 5 Jul 2019 15:46:47 +0300 Subject: [PATCH] 0030268: Inspectors - fixed compilation errors --- src/SelectMgr/SelectMgr_SelectableObjectSet.cxx | 6 ++++++ src/SelectMgr/SelectMgr_ViewerSelector.cxx | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/SelectMgr/SelectMgr_SelectableObjectSet.cxx b/src/SelectMgr/SelectMgr_SelectableObjectSet.cxx index 6550bc6123..2cc4053c81 100644 --- a/src/SelectMgr/SelectMgr_SelectableObjectSet.cxx +++ b/src/SelectMgr/SelectMgr_SelectableObjectSet.cxx @@ -370,7 +370,9 @@ void SelectMgr_SelectableObjectSet::UpdateBVH (const Handle(Graphic3d_Camera)& t // ----------------------------------------- if (!IsEmpty (BVHSubset_3d) && myIsDirty[BVHSubset_3d]) { +#ifdef REPORT_SELECTION_BUILD MESSAGE_INFO ("Check and update 3D BVH", "", &aPerfMeter, NULL); +#endif // construct adaptor over private fields to provide direct access for the BVH builder BVHBuilderAdaptorRegular anAdaptor (myObjects[BVHSubset_3d], myDisabledZLayers); @@ -392,7 +394,9 @@ void SelectMgr_SelectableObjectSet::UpdateBVH (const Handle(Graphic3d_Camera)& t if (!IsEmpty (BVHSubset_3dPersistent) && (myIsDirty[BVHSubset_3dPersistent] || myLastViewState.IsChanged (theViewState) || isWindowSizeChanged)) { +#ifdef REPORT_SELECTION_BUILD MESSAGE_INFO ("Check and update 3D persistence BVH tree", "", &aPerfMeter, NULL); +#endif // construct adaptor over private fields to provide direct access for the BVH builder BVHBuilderAdaptorPersistent anAdaptor (myObjects[BVHSubset_3dPersistent], myDisabledZLayers, theCamera, theProjectionMat, theWorldViewMat, theViewportWidth, theViewportHeight); @@ -407,7 +411,9 @@ void SelectMgr_SelectableObjectSet::UpdateBVH (const Handle(Graphic3d_Camera)& t if (!IsEmpty (BVHSubset_2dPersistent) && (myIsDirty[BVHSubset_2dPersistent] || myLastViewState.IsProjectionChanged (theViewState) || isWindowSizeChanged)) { +#ifdef REPORT_SELECTION_BUILD MESSAGE_INFO ("Check and update 2D persistence BVH tree", "", &aPerfMeter, NULL); +#endif // construct adaptor over private fields to provide direct access for the BVH builder BVHBuilderAdaptorPersistent anAdaptor (myObjects[BVHSubset_2dPersistent], myDisabledZLayers, theCamera, theProjectionMat, SelectMgr_SelectableObjectSet_THE_IDENTITY_MAT, theViewportWidth, theViewportHeight); diff --git a/src/SelectMgr/SelectMgr_ViewerSelector.cxx b/src/SelectMgr/SelectMgr_ViewerSelector.cxx index 59b719e92a..788603fc61 100644 --- a/src/SelectMgr/SelectMgr_ViewerSelector.cxx +++ b/src/SelectMgr/SelectMgr_ViewerSelector.cxx @@ -628,7 +628,9 @@ void SelectMgr_ViewerSelector::TraverseSensitives() Standard_Integer aWidth; Standard_Integer aHeight; mySelectingVolumeMgr.WindowSize (aWidth, aHeight); +#ifdef REPORT_SELECTION_BUILD MESSAGE_INFO ("UpdateBVH", "", &aPerfMeter, aParentAlert); +#endif mySelectableObjects.UpdateBVH (mySelectingVolumeMgr.Camera(), mySelectingVolumeMgr.ProjectionMatrix(), mySelectingVolumeMgr.WorldViewMatrix(), @@ -766,8 +768,9 @@ void SelectMgr_ViewerSelector::TraverseSensitives() } } } - +#ifdef REPORT_SELECTION_BUILD MESSAGE_INFO ("SortResult", "", &aPerfMeter, aParentAlert); +#endif SortResult(); #ifdef REPORT_SELECTION_BUILD Standard_SStream aStreamDone; -- 2.39.5