diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-07-22 23:38:52 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-07-25 15:12:21 +0200 |
commit | f6b2ace597e23fcdec27c8d2560cb407e0b8dea5 (patch) | |
tree | b00d4301536235b557534fce578073be191210ee /svx | |
parent | 6e33eee41ddfa8c3bace8886ca6b7ab1529f9964 (diff) |
callcatcher: remove unused methods
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/svx/camera3d.hxx | 10 | ||||
-rw-r--r-- | svx/source/engine3d/camera3d.cxx | 120 |
2 files changed, 0 insertions, 130 deletions
diff --git a/svx/inc/svx/camera3d.hxx b/svx/inc/svx/camera3d.hxx index 3775adbc4be2..5c4cc51bb370 100644 --- a/svx/inc/svx/camera3d.hxx +++ b/svx/inc/svx/camera3d.hxx @@ -58,9 +58,6 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D double fFocalLen = 35.0, double fBankAng = 0); Camera3D(); - // Reset to default values - void Reset(); - void SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt, double fFocalLen = 35.0, double fBankAng = 0); @@ -74,19 +71,12 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D // Focal length in mm void SetFocalLength(double fLen); - void SetFocalLengthWithCorrect(double fLen); double GetFocalLength() const { return fFocalLength; } // Bank angle links/rechts void SetBankAngle(double fAngle); double GetBankAngle() const { return fBankAngle; } - // For rotating the camera position. Changes LookAt. - void Rotate(double fHAngle, double fVAngle); - - // For changing the point of view. Changes the position. - void RotateAroundLookAt(double fHAngle, double fVAngle); - void SetAutoAdjustProjection(bool bAdjust = true) { bAutoAdjustProjection = bAdjust; } bool IsAutoAdjustProjection() const { return bAutoAdjustProjection; } diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx index e353c2623c1c..4c671cb0ab67 100644 --- a/svx/source/engine3d/camera3d.cxx +++ b/svx/source/engine3d/camera3d.cxx @@ -52,15 +52,6 @@ Camera3D::Camera3D() Camera3D(aVector3D, basegfx::B3DPoint()); } -void Camera3D::Reset() -{ - SetVPD(0); - fBankAngle = fResetBankAngle; - SetPosition(aResetPos); - SetLookAt(aResetLookAt); - SetFocalLength(fResetFocalLength); -} - // Set default values for reset void Camera3D::SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt, @@ -212,115 +203,4 @@ void Camera3D::SetFocalLength(double fLen) fFocalLength = fLen; } -// To rotate the camera position, this changes LookAt - -void Camera3D::Rotate(double fHAngle, double fVAngle) -{ - basegfx::B3DHomMatrix aTf; - basegfx::B3DVector aDiff(aLookAt - aPosition); - const double fV(sqrt(aDiff.getX() * aDiff.getX() + aDiff.getZ() * aDiff.getZ())); - - if ( fV != 0.0 ) - { - basegfx::B3DHomMatrix aTemp; - const double fSin(aDiff.getZ() / fV); - const double fCos(aDiff.getX() / fV); - - aTemp.set(0, 0, fCos); - aTemp.set(2, 2, fCos); - aTemp.set(0, 2, fSin); - aTemp.set(2, 0, -fSin); - - aTf *= aTemp; - } - - { - aTf.rotate(0.0, 0.0, fVAngle); - } - - if ( fV != 0.0 ) - { - basegfx::B3DHomMatrix aTemp; - const double fSin(-aDiff.getZ() / fV); - const double fCos(aDiff.getX() / fV); - - aTemp.set(0, 0, fCos); - aTemp.set(2, 2, fCos); - aTemp.set(0, 2, fSin); - aTemp.set(2, 0, -fSin); - - aTf *= aTemp; - } - - { - aTf.rotate(0.0, fHAngle, 0.0); - } - - aDiff *= aTf; - SetLookAt(aPosition + aDiff); -} - -// To rotate the view point, this changes the position - -void Camera3D::RotateAroundLookAt(double fHAngle, double fVAngle) -{ - basegfx::B3DHomMatrix aTf; - basegfx::B3DVector aDiff(aPosition - aLookAt); - const double fV(sqrt(aDiff.getX() * aDiff.getX() + aDiff.getZ() * aDiff.getZ())); - - if ( fV != 0.0 ) - { - basegfx::B3DHomMatrix aTemp; - const double fSin(aDiff.getZ() / fV); - const double fCos(aDiff.getX() / fV); - - aTemp.set(0, 0, fCos); - aTemp.set(2, 2, fCos); - aTemp.set(0, 2, fSin); - aTemp.set(2, 0, -fSin); - - aTf *= aTemp; - } - - { - aTf.rotate(0.0, 0.0, fVAngle); - } - - if ( fV != 0.0 ) - { - basegfx::B3DHomMatrix aTemp; - const double fSin(-aDiff.getZ() / fV); - const double fCos(aDiff.getX() / fV); - - aTemp.set(0, 0, fCos); - aTemp.set(2, 2, fCos); - aTemp.set(0, 2, fSin); - aTemp.set(2, 0, -fSin); - - aTf *= aTemp; - } - - { - aTf.rotate(0.0, fHAngle, 0.0); - } - - aDiff *= aTf; - SetPosition(aLookAt + aDiff); -} - -// ??? this probably sets the projection plane in a certain depth - -void Camera3D::SetFocalLengthWithCorrect(double fLen) -{ - if ( fLen < 5.0 ) - { - fLen = 5.0; - } - - SetPRP(basegfx::B3DPoint(0.0, 0.0, aPRP.getZ() * fLen / fFocalLength)); - fFocalLength = fLen; -} - -// eof - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |