0027972: Visualization - remove unused and not implemented property V3d_View::EnableG...

diff --git a/src/Graphic3d/Graphic3d_CView.cxx b/src/Graphic3d/Graphic3d_CView.cxx
index db561f40d562857b1ccdb79d6dcb868c2b70e190..416450a13745b3fb7f99bc992a346f4dc7369afa 100644 (file)
--- a/src/Graphic3d/Graphic3d_CView.cxx
+++ b/src/Graphic3d/Graphic3d_CView.cxx
@@ -1123,7 +1123,6 @@ void Graphic3d_CView::CopySettings (const Handle(Graphic3d_CView)& theOther)
   SetShadingModel          (theOther->ShadingModel());
   SetBackfacingModel       (theOther->BackfacingModel());
   SetCamera                (new Graphic3d_Camera (theOther->Camera()));
-  SetGLLightEnabled        (theOther->IsGLLightEnabled());
   SetLights                (theOther->Lights());
   SetClipPlanes            (theOther->ClipPlanes());
 }

diff --git a/src/Graphic3d/Graphic3d_CView.hxx b/src/Graphic3d/Graphic3d_CView.hxx
index cb9b3d4f77a1bcc545f981323096716b6daab003..bad8edd29bc0e93b2754f0655cac3821d9063334 100644 (file)
--- a/src/Graphic3d/Graphic3d_CView.hxx
+++ b/src/Graphic3d/Graphic3d_CView.hxx
@@ -420,12 +420,6 @@ public:
   //! Sets camera used by the view.
   virtual void SetCamera (const Handle(Graphic3d_Camera)& theCamera) = 0;
 
-  //! Returns true if GL lighting is enabled.
-  virtual Standard_Boolean IsGLLightEnabled() const = 0;
-
-  //! Sets GL lighting enabled or disable state.
-  virtual void SetGLLightEnabled (const Standard_Boolean theIsEnabled) = 0;
-
   //! Returns list of lights of the view.
   virtual const Graphic3d_ListOfCLight& Lights() const = 0;
 

diff --git a/src/OpenGl/OpenGl_View.cxx b/src/OpenGl/OpenGl_View.cxx
index d11d483c41ec7c3c2caa1ab30a1c60bdbfec736c..a616d3079dfae3535f674381c23d2c8f3b32a7ef 100644 (file)
--- a/src/OpenGl/OpenGl_View.cxx
+++ b/src/OpenGl/OpenGl_View.cxx
@@ -58,7 +58,6 @@ OpenGl_View::OpenGl_View (const Handle(Graphic3d_StructureManager)& theMgr,
   myBackfacing     (Graphic3d_TOBM_AUTOMATIC),
   myBgColor        (Quantity_NOC_BLACK),
   myCamera         (new Graphic3d_Camera()),
-  myUseGLLight     (Standard_True),
   myToShowGradTrihedron  (false),
   myStateCounter         (theCounter),
   myLastLightSourceState (0, 0),

diff --git a/src/OpenGl/OpenGl_View.hxx b/src/OpenGl/OpenGl_View.hxx
index 701d42d3916bf3199584795b5de8c3caa8952d44..3b641fb2c563e6c30da797e862feb3c3817a22bf 100644 (file)
--- a/src/OpenGl/OpenGl_View.hxx
+++ b/src/OpenGl/OpenGl_View.hxx
@@ -271,12 +271,6 @@ public:
   //! Sets camera used by the view.
   virtual void SetCamera (const Handle(Graphic3d_Camera)& theCamera) Standard_OVERRIDE { myCamera = theCamera; }
 
-  //! Returns true if GL lighting is enabled.
-  virtual Standard_Boolean IsGLLightEnabled() const Standard_OVERRIDE { return myUseGLLight; }
-
-  //! Sets GL lighting enabled or disable state.
-  virtual void SetGLLightEnabled (const Standard_Boolean theIsEnabled) Standard_OVERRIDE { myUseGLLight = theIsEnabled; }
-
   //! Returns list of lights of the view.
   virtual const Graphic3d_ListOfCLight& Lights() const Standard_OVERRIDE { return myLights; }
 
@@ -460,7 +454,6 @@ protected:
   Handle(Graphic3d_SequenceOfHClipPlane) myClipPlanes;
   Handle(Graphic3d_Camera)        myCamera;
   Handle(OpenGl_FrameBuffer)      myFBO;
-  Standard_Boolean                myUseGLLight;
   Standard_Boolean                myToShowGradTrihedron;
   TCollection_AsciiString         myBackgroundImagePath;
   Handle(Graphic3d_TextureEnv)    myTextureEnvData;

diff --git a/src/OpenGl/OpenGl_Workspace.cxx b/src/OpenGl/OpenGl_Workspace.cxx
index a0e76563af24887329482627b437a5c33fc5eb7e..3e23c00524fd32124c972c910587015e647b5965 100644 (file)
--- a/src/OpenGl/OpenGl_Workspace.cxx
+++ b/src/OpenGl/OpenGl_Workspace.cxx
@@ -135,7 +135,6 @@ OpenGl_Workspace::OpenGl_Workspace (OpenGl_View* theView, const Handle(OpenGl_Wi
   myGlContext (!theWindow.IsNull() ? theWindow->GetGlContext() : NULL),
   myUseZBuffer    (Standard_True),
   myUseDepthWrite (Standard_True),
-  myUseGLLight (Standard_True),
   //
   myAspectLineSet (&myDefaultAspectLine),
   myAspectFaceSet (&myDefaultAspectFace),
@@ -963,15 +962,6 @@ Standard_Integer OpenGl_Workspace::Height() const
   return !myView->GlWindow().IsNull() ? myView->GlWindow()->Height() : 0;
 }
 
-// =======================================================================
-// function : UseGLLight
-// purpose  :
-// =======================================================================
-Standard_Boolean OpenGl_Workspace::UseGLLight() const
-{
-  return myView->IsGLLightEnabled();
-}
-
 // =======================================================================
 // function : IsCullingEnabled
 // purpose  :

diff --git a/src/OpenGl/OpenGl_Workspace.hxx b/src/OpenGl/OpenGl_Workspace.hxx
index 26d2afc86181fcbf0cc0d3911c10d16f80741511..77780926a9b277b41ae085c14b1f935a954c4dfb 100644 (file)
--- a/src/OpenGl/OpenGl_Workspace.hxx
+++ b/src/OpenGl/OpenGl_Workspace.hxx
@@ -155,9 +155,6 @@ public:
   //! @return true if depth writing is enabled.
   Standard_Boolean& UseDepthWrite() { return myUseDepthWrite; }
 
-  //! @return true if usage of GL light is enabled.
-  Standard_EXPORT Standard_Boolean  UseGLLight() const;
-
   //! @return true if clipping algorithm enabled
   Standard_EXPORT Standard_Boolean IsCullingEnabled() const;
 
@@ -355,7 +352,6 @@ protected: //! @name protected fields
   Handle(OpenGl_Context)           myGlContext;
   Standard_Boolean                 myUseZBuffer;
   Standard_Boolean                 myUseDepthWrite;
-  Standard_Boolean                 myUseGLLight;
   Handle(OpenGl_CappingAlgoFilter) myDefaultCappingAlgoFilter;
   OpenGl_AspectFace                myNoneCulling;
   OpenGl_AspectFace                myFrontCulling;

diff --git a/src/V3d/FILES b/src/V3d/FILES
index cd825a44733f34b2c90151fbdfacb5f11d44ea28..335e70ad346649467f3cfcda217a55b4c0d77747 100755 (executable)
--- a/src/V3d/FILES
+++ b/src/V3d/FILES
@@ -44,7 +44,6 @@ V3d_View.hxx
 V3d_View_2.cxx
 V3d_View_3.cxx
 V3d_View_4.cxx
-V3d_View_5.cxx
 V3d_Viewer.cxx
 V3d_Viewer.hxx
 V3d_Viewer_3.cxx

diff --git a/src/V3d/V3d_View.cxx b/src/V3d/V3d_View.cxx
index 9fd107027217164f0e7ec2d87e162c5575b3b77c..987fa3920619acd9fb59cb3d66f38f78e4094470 100644 (file)
--- a/src/V3d/V3d_View.cxx
+++ b/src/V3d/V3d_View.cxx
@@ -3334,3 +3334,21 @@ void V3d_View::DiagnosticInformation (TColStd_IndexedDataMapOfStringString& theD
 {
   myView->DiagnosticInformation (theDict, theFlags);
 }
+
+//=============================================================================
+//function : RenderingParams
+//purpose  :
+//=============================================================================
+const Graphic3d_RenderingParams& V3d_View::RenderingParams() const
+{
+  return myView->RenderingParams();
+}
+
+//=============================================================================
+//function : ChangeRenderingParams
+//purpose  :
+//=============================================================================
+Graphic3d_RenderingParams& V3d_View::ChangeRenderingParams()
+{
+  return myView->ChangeRenderingParams();
+}

diff --git a/src/V3d/V3d_View.hxx b/src/V3d/V3d_View.hxx
index db5456ad1af7157bdfdfca0b7dcc0d0984c697ae..1e722508b475eded760ebed0d2e01ef4d65d7c4b 100644 (file)
--- a/src/V3d/V3d_View.hxx
+++ b/src/V3d/V3d_View.hxx
@@ -853,13 +853,6 @@ public:
   //! Returns current state of the back faces display
   Standard_EXPORT V3d_TypeOfBackfacingModel BackFacingModel() const;
 
-  //! turns on/off opengl lighting, currently used in triedron displaying
-  Standard_EXPORT void EnableGLLight (const Standard_Boolean theIsEnabled = Standard_True) const;
-
-  //! returns the current state of the gl lighting
-  //! currently used in triedron displaying
-  Standard_EXPORT Standard_Boolean IsGLLightEnabled() const;
-
   //! Adds clip plane to the view. The composition of clip planes truncates the
   //! rendering space to convex volume. Number of supported clip planes can be consulted
   //! by PlaneLimit method of associated Graphic3d_GraphicDriver.

diff --git a/src/V3d/V3d_View_5.cxx b/src/V3d/V3d_View_5.cxx
deleted file mode 100644 (file)
index 43379e5..0000000
--- a/src/V3d/V3d_View_5.cxx
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-/***********************************************************************
-     FONCTION :
-     ----------
-        Classe V3d_View :
-     HISTORIQUE DES MODIFICATIONS   :
-     --------------------------------
-      22-10-01 : SAV ; Created
-************************************************************************/
-/*----------------------------------------------------------------------*/
-/*
- * Includes
- */
-
-#include <Aspect_GradientBackground.hxx>
-#include <Aspect_Grid.hxx>
-#include <Aspect_Window.hxx>
-#include <Bnd_Box.hxx>
-#include <gp_Ax3.hxx>
-#include <gp_Dir.hxx>
-#include <Graphic3d_Group.hxx>
-#include <Graphic3d_Structure.hxx>
-#include <Graphic3d_TextureEnv.hxx>
-#include <Graphic3d_Vector.hxx>
-#include <Quantity_Color.hxx>
-#include <Standard_MultiplyDefined.hxx>
-#include <Standard_TypeMismatch.hxx>
-#include <V3d_BadValue.hxx>
-#include <V3d_Light.hxx>
-#include <V3d_UnMapped.hxx>
-#include <V3d_View.hxx>
-#include <V3d_Viewer.hxx>
-
-//=============================================================================
-//function : EnableGLLight
-//purpose  :
-//=============================================================================
-void V3d_View::EnableGLLight (const Standard_Boolean theIsEnabled) const
-{
-  myView->SetGLLightEnabled (theIsEnabled);
-}
-
-//=============================================================================
-//function : IsGLLightEnabled
-//purpose  :
-//=============================================================================
-Standard_Boolean V3d_View::IsGLLightEnabled() const
-{
-  return myView->IsGLLightEnabled();
-}
-
-//=============================================================================
-//function : RenderingParams
-//purpose  :
-//=============================================================================
-const Graphic3d_RenderingParams& V3d_View::RenderingParams() const
-{
-  return myView->RenderingParams();
-}
-
-//=============================================================================
-//function : ChangeRenderingParams
-//purpose  :
-//=============================================================================
-Graphic3d_RenderingParams& V3d_View::ChangeRenderingParams()
-{
-  return myView->ChangeRenderingParams();
-}