0025575: Visualization - remove V3d_Static.hxx

diff --git a/src/V3d/FILES b/src/V3d/FILES
index 92b2a777918fd674463279ae167fbe68ffc8db02..e50a4dc9fb918e401365cd42e3efa3cf10fe792c 100755 (executable)
--- a/src/V3d/FILES
+++ b/src/V3d/FILES
@@ -1,5 +1,4 @@
 EXTERNLIB
-V3d_Static.hxx
 V3d_View_1.cxx
 V3d_View_2.cxx
 V3d_View_3.cxx

diff --git a/src/V3d/V3d_Static.hxx b/src/V3d/V3d_Static.hxx
deleted file mode 100644 (file)
index 19e7ca6..0000000
--- a/src/V3d/V3d_Static.hxx
+++ /dev/null
@@ -1,26 +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.
-
-//static Standard_Real MyXwindowCenter ;
-//static Standard_Real MyYwindowCenter ;
-//static Standard_Real MyWindowWidth ;
-//static Standard_Real MyWindowHeight ;
-static Graphic3d_Vector MyXscreenAxis ;
-static Graphic3d_Vector MyYscreenAxis ;
-static Graphic3d_Vector MyZscreenAxis ;
-static Graphic3d_Vector MyViewReferencePlane ;
-static Graphic3d_Vector MyViewReferenceUp ;
-static Graphic3d_Vector MyViewAxis ;
-static Graphic3d_Vertex MyViewReferencePoint ;
-static Graphic3d_Vertex MyGravityReferencePoint ;
-static Graphic3d_Vertex MyProjReferencePoint ;

diff --git a/src/V3d/V3d_View.cdl b/src/V3d/V3d_View.cdl
index a1a8a6ddbafe7f7a06a97d3b73fc7f81173f7032..2bc996a5097a1020752b398e791965a0d1ea5501 100644 (file)
--- a/src/V3d/V3d_View.cdl
+++ b/src/V3d/V3d_View.cdl
@@ -1635,7 +1635,6 @@ fields
         myZscreenAxis           : Vector from Graphic3d;
         myViewAxis              : Vector from Graphic3d;
         myGravityReferencePoint : Vertex from Graphic3d;
-        myCamProjectionShift    : Pnt from gp;
 
 friends
 

diff --git a/src/V3d/V3d_View_2.cxx b/src/V3d/V3d_View_2.cxx
index c1a41ffd22e286bbfdfd4af24dbcf05366aa6b12..10c28cdfe63d919c48787fe8f879ab35440cc3bb 100644 (file)
--- a/src/V3d/V3d_View_2.cxx
+++ b/src/V3d/V3d_View_2.cxx
@@ -39,7 +39,6 @@
 #include <V3d_View.jxx>
 #include <Visual3d_View.hxx>
 #include <Visual3d_Light.hxx>
-#include <V3d_Static.hxx>
 #include <V3d.hxx>
 
 /*----------------------------------------------------------------------*/

diff --git a/src/V3d/V3d_View_3.cxx b/src/V3d/V3d_View_3.cxx
index 49489db17592f60aaaab3e807cd21d9e1a15d155..f437825c954b223846afbcb18ce36ce61a770326 100644 (file)
--- a/src/V3d/V3d_View_3.cxx
+++ b/src/V3d/V3d_View_3.cxx
@@ -11,32 +11,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-/***********************************************************************
- 
-     FONCTION :
-     ----------
-        Classe V3d_View_3.cxx :
- 
-     HISTORIQUE DES MODIFICATIONS   :
-     --------------------------------
-     00-09-92 : GG  ; Creation.
-     24-12-97 : FMN ; Suppression de GEOMLITE
-     13-06-98 : FMN ; PRO14896: Correction sur la gestion de la perspective (cf Programming Guide)
-
-************************************************************************/
-
-#define IMP020300       //GG Don't use ZFitAll in during Rotation
-//                      for perf improvment
-
-/*----------------------------------------------------------------------*/
-/*
- * Includes
- */
-
 #include <V3d_View.jxx>
-#include <V3d_Static.hxx>
-
-#define Zmargin 1.
 
 /*----------------------------------------------------------------------*/
 
@@ -48,7 +23,7 @@ void V3d_View::Move(const Standard_Real Dx, const Standard_Real Dy, const Standa
 
     gp_Dir aReferencePlane (myCamera->Direction().Reversed());
     gp_Dir anUp (myCamera->Up());
-    if (!ScreenAxis (aReferencePlane, anUp, MyXscreenAxis, MyYscreenAxis, MyZscreenAxis))
+    if (!ScreenAxis (aReferencePlane, anUp, myXscreenAxis, myYscreenAxis, myZscreenAxis))
     {
           V3d_BadValue::Raise ("V3d_View::Translate, alignment of Eye,At,Up");
     }
@@ -56,9 +31,9 @@ void V3d_View::Move(const Standard_Real Dx, const Standard_Real Dy, const Standa
 
   Standard_Real XX, XY, XZ, YX, YY, YZ, ZX, ZY, ZZ;
 
-  MyXscreenAxis.Coord (XX,XY,XZ); 
-  MyYscreenAxis.Coord (YX,YY,YZ); 
-  MyZscreenAxis.Coord (ZX,ZY,ZZ);
+  myXscreenAxis.Coord (XX,XY,XZ);
+  myYscreenAxis.Coord (YX,YY,YZ);
+  myZscreenAxis.Coord (ZX,ZY,ZZ);
 
   myCamera->SetEye (myCamStartOpEye);
 
@@ -117,15 +92,15 @@ void V3d_View::Translate(const Standard_Real Dx, const Standard_Real Dy, const S
     gp_Dir aReferencePlane (myCamera->Direction().Reversed());
     gp_Dir anUp (myCamera->Up());
     if (!ScreenAxis (aReferencePlane, anUp,
-                 MyXscreenAxis,MyYscreenAxis,MyZscreenAxis))
+                 myXscreenAxis,myYscreenAxis,myZscreenAxis))
              V3d_BadValue::Raise ("V3d_View::Translate, alignment of Eye,At,Up");
   }
 
   Standard_Real XX, XY, XZ, YX, YY, YZ, ZX, ZY, ZZ;
 
-  MyXscreenAxis.Coord (XX,XY,XZ); 
-  MyYscreenAxis.Coord (YX,YY,YZ); 
-  MyZscreenAxis.Coord (ZX,ZY,ZZ);
+  myXscreenAxis.Coord (XX,XY,XZ);
+  myYscreenAxis.Coord (YX,YY,YZ);
+  myZscreenAxis.Coord (ZX,ZY,ZZ);
 
   myCamera->SetEye (myCamStartOpEye);
   myCamera->SetCenter (myCamStartOpCenter);