[Libreoffice-commits] .: svx/inc svx/source

[Thomas Arnhold]

 svx/inc/svx/viewpt3d.hxx          |   10 ----
 svx/source/engine3d/viewpt3d2.cxx |   78 --------------------------------------
 2 files changed, 88 deletions(-)

New commits:
commit 0aee09b43a2ad276cccf5944ed2ce54356f2b97c
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue Jul 12 23:35:24 2011 +0200

    callcatcher: remove unused Viewport3D:::Foo

diff --git a/svx/inc/svx/viewpt3d.hxx b/svx/inc/svx/viewpt3d.hxx
index 2090a5b..429fe4f 100644
--- a/svx/inc/svx/viewpt3d.hxx
+++ b/svx/inc/svx/viewpt3d.hxx
@@ -94,8 +94,6 @@ class SVX_DLLPUBLIC Viewport3D
     void SetVUV(const basegfx::B3DVector& rNewVUV);
     void SetPRP(const basegfx::B3DPoint& rNewPRP);
     void SetVPD(double fNewVPD);
-    void SetNearClipDist(double fNewNCD);
-    void SetFarClipDist(double fNewFCD);
 
     const basegfx::B3DPoint&	GetVRP() const	{ return aVRP; }
     const basegfx::B3DVector&	GetVPN() const	{ return aVPN; }
@@ -114,20 +112,12 @@ class SVX_DLLPUBLIC Viewport3D
     AspectMapType GetAspectMapping() { return eAspectMapping; }
 
     void SetViewWindow(double fX, double fY, double fW, double fH);
-    void GetViewWindow(double& rX, double& rY, double& rW, double& rH) const;
 
     void SetDeviceWindow(const Rectangle& rRect);
     const Rectangle& GetDeviceWindow() const { return aDeviceRect; }
 
     // Beobachterstandpunkt in Weltkoordinaten zurueckgeben
     const basegfx::B3DPoint&	GetViewPoint();
-
-    // View-Transformationen
-    const basegfx::B3DHomMatrix&	GetViewTransform();
-
-    // Projektion und Mapping
-    basegfx::B3DPoint DoProjection(const basegfx::B3DPoint& rVec) const;
-    basegfx::B3DPoint	MapToDevice(const basegfx::B3DPoint& rVec) const;
 };
 
 #endif		// _VIEWPT3D_HXX
diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx
index 6caddbb..9758e9e 100644
--- a/svx/source/engine3d/viewpt3d2.cxx
+++ b/svx/source/engine3d/viewpt3d2.cxx
@@ -66,15 +66,6 @@ void Viewport3D::SetViewWindow(double fX, double fY, double fW, double fH)
     fHRatio = aDeviceRect.GetHeight() / aViewWin.H;
 }
 
-void Viewport3D::GetViewWindow(double& rX, double& rY,
-                               double& rW, double& rH) const
-{
-    rX = aViewWin.X;
-    rY = aViewWin.Y;
-    rW = aViewWin.W;
-    rH = aViewWin.H;
-}
-
 // Returns observer position (PRP) in world coordinates
 
 const basegfx::B3DPoint& Viewport3D::GetViewPoint()
@@ -84,15 +75,6 @@ const basegfx::B3DPoint& Viewport3D::GetViewPoint()
     return aViewPoint;
 }
 
-// Returns transformations matrix
-
-const basegfx::B3DHomMatrix& Viewport3D::GetViewTransform()
-{
-    MakeTransform();
-
-    return aViewTf;
-}
-
 // Calculate View transformations matrix
 
 void Viewport3D::MakeTransform(void)
@@ -205,48 +187,6 @@ void Viewport3D::SetDeviceWindow(const Rectangle& rRect)
     aDeviceRect = rRect;
 }
 
-// Project the  3D pointon the View plane
-
-basegfx::B3DPoint Viewport3D::DoProjection(const basegfx::B3DPoint& rVec) const
-{
-    basegfx::B3DPoint aVec(rVec);
-
-    if ( eProjection == PR_PERSPECTIVE )
-    {
-        double fPrDist = fVPD - aPRP.getZ();
-
-        if ( aPRP.getZ() == rVec.getZ() )
-        {
-            aVec.setX(0.0);
-            aVec.setY(0.0);
-        }
-        else
-        {
-            // This is the version for any PRP, but not used due to 
-            // performance reasons
-            fPrDist /= aVec.getZ() - aPRP.getZ();
-            aVec.setX(aVec.getX() * fPrDist);
-            aVec.setY(aVec.getY() * fPrDist);
-        }
-    }
-
-    return aVec;
-}
-
-// Mapp 3D point to device coordinates
-
-basegfx::B3DPoint Viewport3D::MapToDevice(const basegfx::B3DPoint& rVec) const
-{
-    basegfx::B3DPoint aRetval;
-
-    // Subtract Y-coordinate, since the device Y-Axis runs from top to bottom
-    aRetval.setX((double)aDeviceRect.Left() + ((rVec.getX() - aViewWin.X) * fWRatio));
-    aRetval.setY((double)aDeviceRect.Bottom() - ((rVec.getY() - aViewWin.Y) * fHRatio));
-    aRetval.setZ(rVec.getZ());
-
-    return aRetval;
-}
-
 // Set View Reference Point
 
 void Viewport3D::SetVRP(const basegfx::B3DPoint& rNewVRP)
@@ -290,22 +230,4 @@ void Viewport3D::SetVPD(double fNewVPD)
     bTfValid = sal_False;
 }
 
-// Set distance of the front Clipping plane
-
-void Viewport3D::SetNearClipDist(double fNewNCD)
-{
-    fNearClipDist = fNewNCD;
-    bTfValid = sal_False;
-}
-
-// Set distance of the rear Clipping plane
-
-void Viewport3D::SetFarClipDist(double fNewFCD)
-{
-    fFarClipDist = fNewFCD;
-    bTfValid = sal_False;
-}
-
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */