From 2108a68f57615e6defb7770268231f7ce5e1252d Mon Sep 17 00:00:00 2001 From: duv Date: Wed, 9 Apr 2014 13:40:07 +0400 Subject: [PATCH] Cosmetic fixes. --- src/Graphic3d/Graphic3d.cdl | 2 +- src/OpenGl/OpenGl_GraphicDriver.hxx | 2 +- src/OpenGl/OpenGl_GraphicDriver_7.cxx | 2 +- src/OpenGl/OpenGl_Layer.cxx | 24 ++++-------------- src/OpenGl/OpenGl_Layer.hxx | 36 +++++---------------------- src/OpenGl/OpenGl_View_2.cxx | 9 +------ src/V3d/V3d_Viewer.cxx | 2 +- src/Visual3d/Visual3d_View.cxx | 2 +- src/Visual3d/Visual3d_ViewManager.cxx | 10 +++++--- 9 files changed, 24 insertions(+), 65 deletions(-) diff --git a/src/Graphic3d/Graphic3d.cdl b/src/Graphic3d/Graphic3d.cdl index ed7d272b58..2502412e3f 100644 --- a/src/Graphic3d/Graphic3d.cdl +++ b/src/Graphic3d/Graphic3d.cdl @@ -419,7 +419,7 @@ is primitive Mat4; primitive Mat4d; - primitive ZLayerSettings; + imported ZLayerSettings; -------------------- -- Category: Classes diff --git a/src/OpenGl/OpenGl_GraphicDriver.hxx b/src/OpenGl/OpenGl_GraphicDriver.hxx index f91b4f58c9..f77cdc7bed 100644 --- a/src/OpenGl/OpenGl_GraphicDriver.hxx +++ b/src/OpenGl/OpenGl_GraphicDriver.hxx @@ -308,7 +308,7 @@ public: //! Sets the settings for a single Z layer of specified view. Standard_EXPORT void SetZLayerSettings (const Graphic3d_CView& theCView, const Standard_Integer theLayerId, - const Graphic3d_ZLayerSettings theSettings); + const Graphic3d_ZLayerSettings& theSettings); public: diff --git a/src/OpenGl/OpenGl_GraphicDriver_7.cxx b/src/OpenGl/OpenGl_GraphicDriver_7.cxx index 16ad66dfcc..2e9c74a5b0 100644 --- a/src/OpenGl/OpenGl_GraphicDriver_7.cxx +++ b/src/OpenGl/OpenGl_GraphicDriver_7.cxx @@ -632,7 +632,7 @@ void OpenGl_GraphicDriver::RemoveZLayer (const Graphic3d_CView& theCView, //======================================================================= Standard_EXPORT void OpenGl_GraphicDriver::SetZLayerSettings (const Graphic3d_CView& theCView, const Standard_Integer theLayerId, - const Graphic3d_ZLayerSettings theSettings) + const Graphic3d_ZLayerSettings& theSettings) { const OpenGl_CView* aCView = (const OpenGl_CView* )theCView.ptrView; if (aCView) diff --git a/src/OpenGl/OpenGl_Layer.cxx b/src/OpenGl/OpenGl_Layer.cxx index bbaa546612..9b1bb6852a 100644 --- a/src/OpenGl/OpenGl_Layer.cxx +++ b/src/OpenGl/OpenGl_Layer.cxx @@ -17,20 +17,6 @@ #include -//======================================================================= -//function : OpenGl_LayerSettings -//purpose : -//======================================================================= -OpenGl_LayerSettings::OpenGl_LayerSettings() - : DepthOffsetFactor (1.0f), - DepthOffsetUnits (1.0f), - Flags (OpenGl_LayerDepthTest - | OpenGl_LayerDepthWrite - | OpenGl_LayerDepthClear) -{ - // -} - //======================================================================= //function : OpenGl_Layer //purpose : @@ -48,13 +34,13 @@ OpenGl_Layer::OpenGl_Layer (const Standard_Integer theNbPriorities) void OpenGl_Layer::Render (const Handle(OpenGl_Workspace) &AWorkspace) const { // separate depth buffers - if (IsSettingEnabled (OpenGl_LayerDepthClear)) + if (IsSettingEnabled (Graphic3d_ZLayerDepthClear)) { glClear (GL_DEPTH_BUFFER_BIT); } // handle depth test - if (IsSettingEnabled (OpenGl_LayerDepthTest)) + if (IsSettingEnabled (Graphic3d_ZLayerDepthTest)) { glDepthFunc (GL_LESS); } @@ -64,17 +50,17 @@ void OpenGl_Layer::Render (const Handle(OpenGl_Workspace) &AWorkspace) const } // handle depth offset - if (IsSettingEnabled (OpenGl_LayerDepthOffset)) + if (IsSettingEnabled (Graphic3d_ZLayerDepthOffset)) { glPolygonOffset (myLayerSettings.DepthOffsetFactor, myLayerSettings.DepthOffsetUnits); } else { - glPolygonOffset (0.f, 0.f); + glPolygonOffset (0.0f, 0.0f); } // handle depth write - if (IsSettingEnabled (OpenGl_LayerDepthWrite)) + if (IsSettingEnabled (Graphic3d_ZLayerDepthWrite)) { glDepthMask (GL_TRUE); } diff --git a/src/OpenGl/OpenGl_Layer.hxx b/src/OpenGl/OpenGl_Layer.hxx index d36fd9af2a..81235aff7c 100644 --- a/src/OpenGl/OpenGl_Layer.hxx +++ b/src/OpenGl/OpenGl_Layer.hxx @@ -17,34 +17,10 @@ #define _OpenGl_Layer_Header #include +#include class Handle(OpenGl_Workspace); -enum OpenGl_LayerSetting -{ - OpenGl_LayerDepthTest = 1, - OpenGl_LayerDepthWrite = 2, - OpenGl_LayerDepthClear = 4, - OpenGl_LayerDepthOffset = 8 -}; - -struct OpenGl_LayerSettings -{ - //! Initializes settings - OpenGl_LayerSettings(); - - //! Returns true if theSetting is enabled. - const Standard_Boolean IsSettingEnabled (const OpenGl_LayerSetting theSetting) const - { - return (Flags & theSetting) == theSetting; - } - - Standard_ShortReal DepthOffsetFactor; //!< Factor argument value for OpenGl glPolygonOffset function. - Standard_ShortReal DepthOffsetUnits; //!< Units argument value for OpenGl glPolygonOffset function. - - Standard_Integer Flags; //!< Storage field for settings. -}; - class OpenGl_Layer { public: @@ -53,16 +29,16 @@ public: OpenGl_Layer (const Standard_Integer theNbPriorities = 11); //! Returns settings of the layer object. - const OpenGl_LayerSettings LayerSettings() const { return myLayerSettings; }; + const Graphic3d_ZLayerSettings LayerSettings() const { return myLayerSettings; }; //! Sets settings of the layer object. - void SetLayerSettings (OpenGl_LayerSettings theSettings) + void SetLayerSettings (Graphic3d_ZLayerSettings theSettings) { myLayerSettings = theSettings; } //! Returns true if theSetting is enabled for the layer. - const Standard_Boolean IsSettingEnabled (const OpenGl_LayerSetting theSetting) const + const Standard_Boolean IsSettingEnabled (const Graphic3d_ZLayerSetting theSetting) const { return myLayerSettings.IsSettingEnabled (theSetting); } @@ -77,8 +53,8 @@ public: private: - OpenGl_PriorityList myPriorityList; //!< Associated priority list object. + OpenGl_PriorityList myPriorityList; //!< Associated priority list object. - OpenGl_LayerSettings myLayerSettings; //!< Layer setting flags. + Graphic3d_ZLayerSettings myLayerSettings; //!< Layer setting flags. }; #endif //_OpenGl_Layer_Header diff --git a/src/OpenGl/OpenGl_View_2.cxx b/src/OpenGl/OpenGl_View_2.cxx index 5e13a9886f..59ac16829b 100644 --- a/src/OpenGl/OpenGl_View_2.cxx +++ b/src/OpenGl/OpenGl_View_2.cxx @@ -1518,13 +1518,6 @@ void OpenGl_View::ChangeZLayer (const OpenGl_Structure *theStructure, void OpenGl_View::SetZLayerSettings (const Standard_Integer theLayerId, const Graphic3d_ZLayerSettings theSettings) { - // Convert Graphic3d_ZLayerSettings to OpenGl_LayerSettings - OpenGl_LayerSettings aConvertedSettings; - - aConvertedSettings.DepthOffsetFactor = theSettings.DepthOffsetFactor; - aConvertedSettings.DepthOffsetUnits = theSettings.DepthOffsetUnits; - aConvertedSettings.Flags = theSettings.Flags; - - myZLayers.Layer (theLayerId).SetLayerSettings (aConvertedSettings); + myZLayers.Layer (theLayerId).SetLayerSettings (theSettings); } diff --git a/src/V3d/V3d_Viewer.cxx b/src/V3d/V3d_Viewer.cxx index f4df8ddc41..254ed231d3 100644 --- a/src/V3d/V3d_Viewer.cxx +++ b/src/V3d/V3d_Viewer.cxx @@ -359,7 +359,7 @@ void V3d_Viewer::DelView( const Handle(V3d_View)& TheView ) { //======================================================================= void V3d_Viewer::SetZLayerSettings (const Standard_Integer theLayerId, - const Graphic3d_ZLayerSettings theSettings) + const Graphic3d_ZLayerSettings& theSettings) { MyViewer->SetZLayerSettings (theLayerId, theSettings); } diff --git a/src/Visual3d/Visual3d_View.cxx b/src/Visual3d/Visual3d_View.cxx index 021091f02b..4b52723ffe 100644 --- a/src/Visual3d/Visual3d_View.cxx +++ b/src/Visual3d/Visual3d_View.cxx @@ -3676,7 +3676,7 @@ Standard_Boolean Visual3d_View::Export (const Standard_CString theFileName //======================================================================= void Visual3d_View::SetZLayerSettings (const Standard_Integer theLayerId, - const Graphic3d_ZLayerSettings theSettings) + const Graphic3d_ZLayerSettings& theSettings) { MyGraphicDriver->SetZLayerSettings (MyCView, theLayerId, theSettings); } diff --git a/src/Visual3d/Visual3d_ViewManager.cxx b/src/Visual3d/Visual3d_ViewManager.cxx index 3d13bc9e0b..1d795a0727 100644 --- a/src/Visual3d/Visual3d_ViewManager.cxx +++ b/src/Visual3d/Visual3d_ViewManager.cxx @@ -1207,12 +1207,14 @@ Standard_Integer Visual3d_ViewManager::GetZLayer (const Handle(Graphic3d_Structu //purpose : //======================================================================= void Visual3d_ViewManager::SetZLayerSettings (const Standard_Integer theLayerId, - const Graphic3d_ZLayerSettings theSettings) + const Graphic3d_ZLayerSettings& theSettings) { - // tell all managed views to set zlayer settings display layers + // tell all managed views to set zlayer settings Visual3d_SetIteratorOfSetOfView aViewIt (MyDefinedView); - for ( ; aViewIt.More (); aViewIt.Next ()) + for (; aViewIt.More (); aViewIt.Next ()) + { (aViewIt.Value ())->SetZLayerSettings (theLayerId, theSettings); + } if (myMapOfZLayerSettings.IsBound (theLayerId)) { @@ -1232,7 +1234,9 @@ void Visual3d_ViewManager::SetZLayerSettings (const Standard_Integer theLayerId, Graphic3d_ZLayerSettings Visual3d_ViewManager::ZLayerSettings (const Standard_Integer theLayerId) { if (!myLayerIds.Contains (theLayerId)) + { return Graphic3d_ZLayerSettings(); + } return myMapOfZLayerSettings.Find (theLayerId); }