0025190: Visualization - class OpenGl_StructureShadow is defined as local in OpenGl_S...

Created OpenGl_StructureShadow.hxx and OpenGl_StructureShadow.cxx

Edited OpenGl/FILES

diff --git a/src/OpenGl/FILES b/src/OpenGl/FILES
index 3991fff2aad1aa0aa4aac7cc86a7d1881bc2bdec..bf9ffb2615e48ec425e264c5f71228c35382fd1f 100755 (executable)
--- a/src/OpenGl/FILES
+++ b/src/OpenGl/FILES
@@ -20,6 +20,8 @@ OpenGl_Group.hxx
 OpenGl_Group.cxx
 OpenGl_Structure.hxx
 OpenGl_Structure.cxx
+OpenGl_StructureShadow.hxx
+OpenGl_StructureShadow.cxx
 OpenGl_Element.hxx
 OpenGl_Element.cxx
 OpenGl_Text.hxx

diff --git a/src/OpenGl/OpenGl_Structure.cxx b/src/OpenGl/OpenGl_Structure.cxx
index d9c27b1c7b980fb9e463cec9f074738f39254638..f7393125593bf26f92dec1b391aac140e3d23a7a 100644 (file)
--- a/src/OpenGl/OpenGl_Structure.cxx
+++ b/src/OpenGl/OpenGl_Structure.cxx
@@ -19,7 +19,7 @@
 #include <OpenGl_GraphicDriver.hxx>
 #include <OpenGl_ShaderManager.hxx>
 #include <OpenGl_ShaderProgram.hxx>
-#include <OpenGl_Structure.hxx>
+#include <OpenGl_StructureShadow.hxx>
 #include <OpenGl_telem_util.hxx>
 #include <OpenGl_Vec.hxx>
 #include <OpenGl_View.hxx>
@@ -892,61 +892,6 @@ Standard_Integer OpenGl_Structure::GetZLayer () const
   return myZLayer;
 }
 
-//! Dummy structure which just redirects to groups of another structure.
-class OpenGl_StructureShadow : public OpenGl_Structure
-{
-
-public:
-
-  //! Create empty structure
-  OpenGl_StructureShadow (const Handle(Graphic3d_StructureManager)& theManager,
-                          const Handle(OpenGl_Structure)&           theStructure);
-
-  virtual const Graphic3d_SequenceOfGroup& DrawGroups() const { return myParent->DrawGroups(); }
-
-private:
-
-  Handle(OpenGl_Structure) myParent;
-
-public:
-
-  DEFINE_STANDARD_RTTI(OpenGl_StructureShadow) // Type definition
-
-};
-
-DEFINE_STANDARD_HANDLE(OpenGl_StructureShadow, OpenGl_Structure)
-
-IMPLEMENT_STANDARD_HANDLE (OpenGl_StructureShadow, OpenGl_Structure)
-IMPLEMENT_STANDARD_RTTIEXT(OpenGl_StructureShadow, OpenGl_Structure)
-
-//=======================================================================
-//function : OpenGl_StructureShadow
-//purpose  :
-//=======================================================================
-OpenGl_StructureShadow::OpenGl_StructureShadow (const Handle(Graphic3d_StructureManager)& theManager,
-                                                const Handle(OpenGl_Structure)&           theStructure)
-: OpenGl_Structure (theManager)
-{
-  Handle(OpenGl_StructureShadow) aShadow = Handle(OpenGl_StructureShadow)::DownCast (theStructure);
-  myParent = aShadow.IsNull() ? theStructure : aShadow->myParent;
-
-
-  Composition   = myParent->Composition;
-  ContainsFacet = myParent->ContainsFacet;
-  IsInfinite    = myParent->IsInfinite;
-  for (Standard_Integer i = 0; i <= 3; ++i)
-  {
-    for (Standard_Integer j = 0; j <= 3; ++j)
-    {
-      Graphic3d_CStructure::Transformation[i][j] = myParent->Graphic3d_CStructure::Transformation[i][j];
-    }
-  }
-
-  TransformPersistence.IsSet = myParent->TransformPersistence.IsSet;
-  TransformPersistence.Flag  = myParent->TransformPersistence.Flag;
-  TransformPersistence.Point = myParent->TransformPersistence.Point;
-}
-
 //=======================================================================
 //function : ShadowLink
 //purpose  :

diff --git a/src/OpenGl/OpenGl_StructureShadow.cxx b/src/OpenGl/OpenGl_StructureShadow.cxx
new file mode 100644 (file)
index 0000000..9cfe62b
--- /dev/null
+++ b/src/OpenGl/OpenGl_StructureShadow.cxx
@@ -0,0 +1,48 @@
+// Created on: 2014-09-01
+// Created by: Ivan SAZONOV
+// Copyright (c) 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.
+
+#include <OpenGl_StructureShadow.hxx>
+
+
+IMPLEMENT_STANDARD_HANDLE (OpenGl_StructureShadow, OpenGl_Structure)
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_StructureShadow, OpenGl_Structure)
+
+//=======================================================================
+//function : OpenGl_StructureShadow
+//purpose  :
+//=======================================================================
+OpenGl_StructureShadow::OpenGl_StructureShadow (const Handle(Graphic3d_StructureManager)& theManager,
+                                                const Handle(OpenGl_Structure)&           theStructure)
+: OpenGl_Structure (theManager)
+{
+  Handle(OpenGl_StructureShadow) aShadow = Handle(OpenGl_StructureShadow)::DownCast (theStructure);
+  myParent = aShadow.IsNull() ? theStructure : aShadow->myParent;
+
+
+  Composition   = myParent->Composition;
+  ContainsFacet = myParent->ContainsFacet;
+  IsInfinite    = myParent->IsInfinite;
+  for (Standard_Integer i = 0; i <= 3; ++i)
+  {
+    for (Standard_Integer j = 0; j <= 3; ++j)
+    {
+      Graphic3d_CStructure::Transformation[i][j] = myParent->Graphic3d_CStructure::Transformation[i][j];
+    }
+  }
+
+  TransformPersistence.IsSet = myParent->TransformPersistence.IsSet;
+  TransformPersistence.Flag  = myParent->TransformPersistence.Flag;
+  TransformPersistence.Point = myParent->TransformPersistence.Point;
+}

diff --git a/src/OpenGl/OpenGl_StructureShadow.hxx b/src/OpenGl/OpenGl_StructureShadow.hxx
new file mode 100644 (file)
index 0000000..2a5fb88
--- /dev/null
+++ b/src/OpenGl/OpenGl_StructureShadow.hxx
@@ -0,0 +1,45 @@
+// Created on: 2014-09-01
+// Created by: Ivan SAZONOV
+// Copyright (c) 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.
+
+#ifndef OpenGl_StructureShadow_Header
+#define OpenGl_StructureShadow_Header
+
+#include <OpenGl_Structure.hxx>
+
+//! Dummy structure which just redirects to groups of another structure.
+class OpenGl_StructureShadow : public OpenGl_Structure
+{
+
+public:
+
+  //! Create empty structure
+  Standard_EXPORT OpenGl_StructureShadow (const Handle(Graphic3d_StructureManager)& theManager,
+                                          const Handle(OpenGl_Structure)&           theStructure);
+
+  virtual const Graphic3d_SequenceOfGroup& DrawGroups() const { return myParent->DrawGroups(); }
+
+private:
+
+  Handle(OpenGl_Structure) myParent;
+
+public:
+
+  DEFINE_STANDARD_RTTI(OpenGl_StructureShadow) // Type definition
+
+};
+
+DEFINE_STANDARD_HANDLE(OpenGl_StructureShadow, OpenGl_Structure)
+
+#endif // OpenGl_StructureShadow_Header