[Libreoffice-commits] .: 6 commits - tools/inc tools/source vcl/inc vcl/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Tue Jul 12 22:21:15 PDT 2011
tools/inc/tools/b3dtrans.hxx | 36 ----
tools/source/generic/b3dtrans.cxx | 295 --------------------------------------
vcl/inc/vcl/field.hxx | 9 -
vcl/source/control/field2.cxx | 103 -------------
4 files changed, 443 deletions(-)
New commits:
commit 11eb18825dba337e55ed7ae8e1c0a7028730fc57
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 12 23:24:44 2011 +0200
callcatcher: remove unused TimeFormatter::Foo
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index b921bf4..e92b7f6 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -475,8 +475,6 @@ public:
void SetTime( const Time& rNewTime );
void SetUserTime( const Time& rNewTime );
Time GetTime() const;
- Time GetRealTime() const;
- sal_Bool IsTimeModified() const;
void SetEmptyTime() { FormatterBase::SetEmptyFieldValue(); }
sal_Bool IsEmptyTime() const { return FormatterBase::IsEmptyFieldValue(); }
Time GetCorrectedTime() const { return maCorrectedTime; }
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index f038178..4be8476 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -3050,35 +3050,6 @@ Time TimeFormatter::GetTime() const
// -----------------------------------------------------------------------
-Time TimeFormatter::GetRealTime() const
-{
- Time aTime( 0, 0, 0 );
-
- if ( GetField() )
- {
- sal_Bool bAllowMailformed = ImplAllowMalformedInput();
- if ( !ImplTimeGetValue( GetField()->GetText(), aTime, GetFormat(), IsDuration(), ImplGetLocaleDataWrapper(), !bAllowMailformed ) )
- if ( bAllowMailformed )
- aTime = GetInvalidTime();
- }
-
- return aTime;
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool TimeFormatter::IsTimeModified() const
-{
- if ( ImplGetEmptyFieldValue() )
- return !IsEmptyTime();
- else if ( GetTime() != maFieldTime )
- return sal_True;
- else
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
void TimeFormatter::Reformat()
{
if ( !GetField() )
commit 5b6e518bd9488c7f78c9525eee79b218535b9928
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 12 23:23:04 2011 +0200
callcatcher: remove unused TimeBox::Foo
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index c268fe4..b921bf4 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -866,7 +866,6 @@ class VCL_DLLPUBLIC TimeBox : public ComboBox, public TimeFormatter
{
public:
TimeBox( Window* pParent, WinBits nWinStyle );
- TimeBox( Window* pParent, const ResId& rResId );
~TimeBox();
virtual long PreNotify( NotifyEvent& rNEvt );
@@ -876,12 +875,6 @@ public:
virtual void Modify();
virtual void ReformatAll();
-
- void InsertTime( const Time& rTime, sal_uInt16 nPos = COMBOBOX_APPEND );
- void RemoveTime( const Time& rTime );
- using TimeFormatter::GetTime;
- Time GetTime( sal_uInt16 nPos ) const;
- sal_uInt16 GetTimePos( const Time& rTime ) const;
};
#endif // _SV_FIELD_HXX
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index ad01095..f038178 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -3323,26 +3323,6 @@ TimeBox::TimeBox( Window* pParent, WinBits nWinStyle ) :
// -----------------------------------------------------------------------
-TimeBox::TimeBox( Window* pParent, const ResId& rResId ) :
- ComboBox( WINDOW_TIMEBOX )
-{
- rResId.SetRT( RSC_TIMEBOX );
- WinBits nStyle = ImplInitRes( rResId );
- ComboBox::ImplInit( pParent, nStyle );
- SetField( this );
- SetText( ImplGetLocaleDataWrapper().getTime( maFieldTime, sal_False, sal_False ) );
- ComboBox::ImplLoadRes( rResId );
- ResMgr* pMgr = rResId.GetResMgr();
- if( pMgr )
- TimeFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) );
- Reformat();
-
- if ( !(nStyle & WB_HIDE) )
- Show();
-}
-
-// -----------------------------------------------------------------------
-
TimeBox::~TimeBox()
{
}
@@ -3414,58 +3394,4 @@ void TimeBox::ReformatAll()
SetUpdateMode( sal_True );
}
-// -----------------------------------------------------------------------
-
-void TimeBox::InsertTime( const Time& rTime, sal_uInt16 nPos )
-{
- Time aTime = rTime;
- if ( aTime > GetMax() )
- aTime = GetMax();
- else if ( aTime < GetMin() )
- aTime = GetMin();
-
- sal_Bool bSec = sal_False;
- sal_Bool b100Sec = sal_False;
- if ( GetFormat() == TIMEF_SEC )
- bSec = sal_True;
- if ( GetFormat() == TIMEF_100TH_SEC || GetFormat() == TIMEF_SEC_CS )
- bSec = b100Sec = sal_True;
- ComboBox::InsertEntry( ImplGetLocaleDataWrapper().getTime( aTime, bSec, b100Sec ), nPos );
-}
-
-// -----------------------------------------------------------------------
-
-void TimeBox::RemoveTime( const Time& rTime )
-{
- sal_Bool bSec = sal_False;
- sal_Bool b100Sec = sal_False;
- if ( GetFormat() == TIMEF_SEC )
- bSec = sal_True;
- if ( GetFormat() == TIMEF_100TH_SEC || TIMEF_SEC_CS )
- bSec = b100Sec = sal_True;
- ComboBox::RemoveEntry( ImplGetLocaleDataWrapper().getTime( rTime, bSec, b100Sec ) );
-}
-
-// -----------------------------------------------------------------------
-
-Time TimeBox::GetTime( sal_uInt16 nPos ) const
-{
- Time aTime( 0, 0, 0 );
- ImplTimeGetValue( ComboBox::GetEntry( nPos ), aTime, GetFormat(), IsDuration(), ImplGetLocaleDataWrapper() );
- return aTime;
-}
-
-// -----------------------------------------------------------------------
-
-sal_uInt16 TimeBox::GetTimePos( const Time& rTime ) const
-{
- sal_Bool bSec = sal_False;
- sal_Bool b100Sec = sal_False;
- if ( GetFormat() == TIMEF_SEC )
- bSec = sal_True;
- if ( GetFormat() == TIMEF_100TH_SEC || TIMEF_SEC_CS )
- bSec = b100Sec = sal_True;
- return ComboBox::GetEntryPos( ImplGetLocaleDataWrapper().getTime( rTime, bSec, b100Sec ) );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit bda0a573ed7e7e77456220894d6963e810634585
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 12 23:15:16 2011 +0200
callcatcher: remove unused B3dCamera::Set*
diff --git a/tools/inc/tools/b3dtrans.hxx b/tools/inc/tools/b3dtrans.hxx
index af498f1..8987a11 100644
--- a/tools/inc/tools/b3dtrans.hxx
+++ b/tools/inc/tools/b3dtrans.hxx
@@ -294,22 +294,16 @@ public:
virtual ~B3dCamera();
// Positionen
- void SetPosition(const basegfx::B3DPoint& rNewPos);
const basegfx::B3DPoint& GetPosition() const { return aPosition; }
- void SetLookAt(const basegfx::B3DVector& rNewLookAt);
const basegfx::B3DVector& GetLookAt() const { return aLookAt; }
- void SetPositionAndLookAt(const basegfx::B3DPoint& rNewPos, const basegfx::B3DVector& rNewLookAt);
// Brennweite in mm
- void SetFocalLength(double fLen);
double GetFocalLength() const { return fFocalLength; }
// Neigung links/rechts
- void SetBankAngle(double fAngle);
double GetBankAngle() const { return fBankAngle; }
// FocalLength Flag
- void SetUseFocalLength(sal_Bool bNew);
sal_Bool GetUseFocalLength() const { return (sal_Bool)bUseFocalLength; }
protected:
diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx
index 9564e2c..8a531c2 100644
--- a/tools/source/generic/b3dtrans.cxx
+++ b/tools/source/generic/b3dtrans.cxx
@@ -649,81 +649,6 @@ B3dCamera::~B3dCamera()
{
}
-void B3dCamera::SetPosition(const basegfx::B3DPoint& rNewPos)
-{
- if(rNewPos != aPosition)
- {
- // Zuweisen
- aCorrectedPosition = aPosition = rNewPos;
-
- // Neuberechnung
- CalcNewViewportValues();
- }
-}
-
-void B3dCamera::SetLookAt(const basegfx::B3DVector& rNewLookAt)
-{
- if(rNewLookAt != aLookAt)
- {
- // Zuweisen
- aLookAt = rNewLookAt;
-
- // Neuberechnung
- CalcNewViewportValues();
- }
-}
-
-void B3dCamera::SetPositionAndLookAt(const basegfx::B3DPoint& rNewPos, const basegfx::B3DVector& rNewLookAt)
-{
- if(rNewPos != aPosition || rNewLookAt != aLookAt)
- {
- // Zuweisen
- aPosition = rNewPos;
- aLookAt = rNewLookAt;
-
- // Neuberechnung
- CalcNewViewportValues();
- }
-}
-
-void B3dCamera::SetFocalLength(double fLen)
-{
- if(fLen != fFocalLength)
- {
- // Zuweisen
- if(fLen < 5.0)
- fLen = 5.0;
- fFocalLength = fLen;
-
- // Neuberechnung
- CalcNewViewportValues();
- }
-}
-
-void B3dCamera::SetBankAngle(double fAngle)
-{
- if(fAngle != fBankAngle)
- {
- // Zuweisen
- fBankAngle = fAngle;
-
- // Neuberechnung
- CalcNewViewportValues();
- }
-}
-
-void B3dCamera::SetUseFocalLength(sal_Bool bNew)
-{
- if(bNew != (sal_Bool)bUseFocalLength)
- {
- // Zuweisen
- bUseFocalLength = bNew;
-
- // Neuberechnung
- CalcNewViewportValues();
- }
-}
-
void B3dCamera::DeviceRectangleChange()
{
// call parent
commit 821f03cbaeeddfdbafb05b16669fe7b6cd8f7319
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 12 23:13:12 2011 +0200
callcatcher: remove unused B3dViewport::Set*
diff --git a/tools/inc/tools/b3dtrans.hxx b/tools/inc/tools/b3dtrans.hxx
index eb44d43..af498f1 100644
--- a/tools/inc/tools/b3dtrans.hxx
+++ b/tools/inc/tools/b3dtrans.hxx
@@ -254,8 +254,6 @@ public:
B3dViewport();
virtual ~B3dViewport();
- void SetVRP(const basegfx::B3DPoint& rNewVRP);
- void SetVPN(const basegfx::B3DVector& rNewVPN);
void SetVUV(const basegfx::B3DVector& rNewVUV);
void SetViewportValues(
const basegfx::B3DPoint& rNewVRP,
diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx
index cae6487..9564e2c 100644
--- a/tools/source/generic/b3dtrans.cxx
+++ b/tools/source/generic/b3dtrans.cxx
@@ -603,18 +603,6 @@ B3dViewport::~B3dViewport()
{
}
-void B3dViewport::SetVRP(const basegfx::B3DPoint& rNewVRP)
-{
- aVRP = rNewVRP;
- CalcOrientation();
-}
-
-void B3dViewport::SetVPN(const basegfx::B3DVector& rNewVPN)
-{
- aVPN = rNewVPN;
- CalcOrientation();
-}
-
void B3dViewport::SetVUV(const basegfx::B3DVector& rNewVUV)
{
aVUV = rNewVUV;
commit 7a774b15d134c9c723517d804ae7f516878c6e8e
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 12 23:11:54 2011 +0200
callcatcher: remove unused B3dTransformationSet various Get/Set methods
diff --git a/tools/inc/tools/b3dtrans.hxx b/tools/inc/tools/b3dtrans.hxx
index 61d4e46..eb44d43 100644
--- a/tools/inc/tools/b3dtrans.hxx
+++ b/tools/inc/tools/b3dtrans.hxx
@@ -147,7 +147,6 @@ public:
void Reset();
// ObjectTrans
- void SetObjectTrans(const basegfx::B3DHomMatrix& rObj);
const basegfx::B3DHomMatrix& GetObjectTrans() { return maObjectTrans; }
const basegfx::B3DHomMatrix& GetInvObjectTrans() { return maInvObjectTrans; }
@@ -156,7 +155,6 @@ public:
basegfx::B3DPoint aVRP = basegfx::B3DPoint(0.0,0.0,1.0),
basegfx::B3DVector aVPN = basegfx::B3DVector(0.0,0.0,1.0),
basegfx::B3DVector aVUP = basegfx::B3DVector(0.0,1.0,0.0));
- void SetOrientation(basegfx::B3DHomMatrix& mOrient);
const basegfx::B3DHomMatrix& GetOrientation() { return maOrientation; }
const basegfx::B3DHomMatrix& GetInvOrientation() { return maInvOrientation; }
@@ -166,20 +164,15 @@ public:
const basegfx::B3DHomMatrix& GetInvProjection();
// Texture
- void SetTexture(const basegfx::B2DHomMatrix& rTxt);
const basegfx::B2DHomMatrix& GetTexture() { return maTexture; }
// Seitenverhaeltnis und Modus zu dessen Aufrechterhaltung
double GetRatio() { return mfRatio; }
void SetRatio(double fNew=1.0);
Base3DRatio GetRatioMode() { return meRatio; }
- void SetRatioMode(Base3DRatio eNew=Base3DRatioGrow);
// Parameter der ViewportTransformation
void SetDeviceRectangle(double fL=-1.0, double fR=1.0, double fB=-1.0, double fT=1.0, sal_Bool bBroadCastChange=sal_True);
- void SetDeviceVolume(const basegfx::B3DRange& rVol, sal_Bool bBroadCastChange=sal_True);
- void GetDeviceRectangle(double &fL, double &fR, double& fB, double& fT);
- basegfx::B3DRange GetDeviceVolume();
double GetDeviceRectangleWidth() const { return mfRightBound - mfLeftBound; }
double GetDeviceRectangleHeight() const { return mfTopBound - mfBottomBound; }
void SetFrontClippingPlane(double fF=0.0);
@@ -193,9 +186,6 @@ public:
const Rectangle& GetViewportRectangle() { return maViewportRectangle; }
void CalcViewport();
- // Spezielle Matritzen anfordern
- basegfx::B3DHomMatrix GetMatFromObjectToView();
-
// Transponierte Inverse fuer Vectortransformationen
const basegfx::B3DHomMatrix& GetInvTransObjectToEye();
@@ -207,7 +197,6 @@ public:
const basegfx::B3DHomMatrix& GetInvMatFromWorldToView();
// Bounds des Viewports lesen
- const Rectangle& GetLogicalViewportBounds();
const basegfx::B3DVector& GetScale();
const basegfx::B3DVector& GetTranslate();
diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx
index 5bb03d0..cae6487 100644
--- a/tools/source/generic/b3dtrans.cxx
+++ b/tools/source/generic/b3dtrans.cxx
@@ -182,16 +182,6 @@ void B3dTransformationSet::Reset()
|*
\************************************************************************/
-void B3dTransformationSet::SetObjectTrans(const basegfx::B3DHomMatrix& rObj)
-{
- maObjectTrans = rObj;
-
- mbObjectToDeviceValid = sal_False;
- mbInvTransObjectToEyeValid = sal_False;
-
- PostSetObjectTrans();
-}
-
void B3dTransformationSet::PostSetObjectTrans()
{
// Zuweisen und Inverse bestimmen
@@ -217,17 +207,6 @@ void B3dTransformationSet::SetOrientation( basegfx::B3DPoint aVRP, basegfx::B3DV
PostSetOrientation();
}
-void B3dTransformationSet::SetOrientation(basegfx::B3DHomMatrix& mOrient)
-{
- maOrientation = mOrient;
-
- mbInvTransObjectToEyeValid = sal_False;
- mbObjectToDeviceValid = sal_False;
- mbWorldToViewValid = sal_False;
-
- PostSetOrientation();
-}
-
void B3dTransformationSet::PostSetOrientation()
{
// Zuweisen und Inverse bestimmen
@@ -278,12 +257,6 @@ void B3dTransformationSet::PostSetProjection()
|*
\************************************************************************/
-void B3dTransformationSet::SetTexture(const basegfx::B2DHomMatrix& rTxt)
-{
- maTexture = rTxt;
- PostSetTexture();
-}
-
void B3dTransformationSet::PostSetTexture()
{
}
@@ -425,17 +398,6 @@ void B3dTransformationSet::SetRatio(double fNew)
}
}
-void B3dTransformationSet::SetRatioMode(Base3DRatio eNew)
-{
- if(meRatio != eNew)
- {
- meRatio = eNew;
- mbProjectionValid = sal_False;
- mbObjectToDeviceValid = sal_False;
- mbWorldToViewValid = sal_False;
- }
-}
-
void B3dTransformationSet::SetDeviceRectangle(double fL, double fR, double fB, double fT,
sal_Bool bBroadCastChange)
{
@@ -456,39 +418,10 @@ void B3dTransformationSet::SetDeviceRectangle(double fL, double fR, double fB, d
}
}
-void B3dTransformationSet::SetDeviceVolume(const basegfx::B3DRange& rVol, sal_Bool bBroadCastChange)
-{
- SetDeviceRectangle(rVol.getMinX(), rVol.getMaxX(), rVol.getMinY(), rVol.getMaxY(), bBroadCastChange);
- SetFrontClippingPlane(rVol.getMinZ());
- SetBackClippingPlane(rVol.getMaxZ());
-}
-
void B3dTransformationSet::DeviceRectangleChange()
{
}
-void B3dTransformationSet::GetDeviceRectangle(double &fL, double &fR, double& fB, double& fT)
-{
- fL = mfLeftBound;
- fR = mfRightBound;
- fB = mfBottomBound;
- fT = mfTopBound;
-
- mbProjectionValid = sal_False;
- mbObjectToDeviceValid = sal_False;
- mbWorldToViewValid = sal_False;
-}
-
-basegfx::B3DRange B3dTransformationSet::GetDeviceVolume()
-{
- basegfx::B3DRange aRet;
-
- aRet.expand(basegfx::B3DTuple(mfLeftBound, mfBottomBound, mfNearBound));
- aRet.expand(basegfx::B3DTuple(mfRightBound, mfTopBound, mfFarBound));
-
- return aRet;
-}
-
void B3dTransformationSet::SetFrontClippingPlane(double fF)
{
if(mfNearBound != fF)
@@ -539,13 +472,6 @@ void B3dTransformationSet::PostSetViewport()
{
}
-const Rectangle& B3dTransformationSet::GetLogicalViewportBounds()
-{
- if(!mbProjectionValid)
- CalcViewport();
- return maSetBound;
-}
-
const basegfx::B3DVector& B3dTransformationSet::GetScale()
{
if(!mbProjectionValid)
@@ -609,18 +535,6 @@ const basegfx::B3DHomMatrix& B3dTransformationSet::GetInvTransObjectToEye()
return maInvTransObjectToEye;
}
-basegfx::B3DHomMatrix B3dTransformationSet::GetMatFromObjectToView()
-{
- basegfx::B3DHomMatrix aFromObjectToView = GetObjectToDevice();
-
- const basegfx::B3DVector& rScale(GetScale());
- aFromObjectToView.scale(rScale.getX(), rScale.getY(), rScale.getZ());
- const basegfx::B3DVector& rTranslate(GetTranslate());
- aFromObjectToView.translate(rTranslate.getX(), rTranslate.getY(), rTranslate.getZ());
-
- return aFromObjectToView;
-}
-
void B3dTransformationSet::CalcMatFromWorldToView()
{
maMatFromWorldToView = maOrientation;
commit 446f8f75c465b57677acce27e110f8903d15f0a1
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 12 23:03:54 2011 +0200
callcatcher: remove unused B3dTransformationSet transformations
diff --git a/tools/inc/tools/b3dtrans.hxx b/tools/inc/tools/b3dtrans.hxx
index e7a7d7a..61d4e46 100644
--- a/tools/inc/tools/b3dtrans.hxx
+++ b/tools/inc/tools/b3dtrans.hxx
@@ -214,23 +214,6 @@ public:
// Direkter Zugriff auf verschiedene Transformationen
const basegfx::B3DPoint WorldToEyeCoor(const basegfx::B3DPoint& rVec);
const basegfx::B3DPoint EyeToWorldCoor(const basegfx::B3DPoint& rVec);
- const basegfx::B3DPoint EyeToViewCoor(const basegfx::B3DPoint& rVec);
- const basegfx::B3DPoint ViewToEyeCoor(const basegfx::B3DPoint& rVec);
- const basegfx::B3DPoint WorldToViewCoor(const basegfx::B3DPoint& rVec);
- const basegfx::B3DPoint ViewToWorldCoor(const basegfx::B3DPoint& rVec);
- const basegfx::B3DPoint DeviceToViewCoor(const basegfx::B3DPoint& rVec);
- const basegfx::B3DPoint ViewToDeviceCoor(const basegfx::B3DPoint& rVec);
- const basegfx::B3DPoint ObjectToWorldCoor(const basegfx::B3DPoint& rVec);
- const basegfx::B3DPoint WorldToObjectCoor(const basegfx::B3DPoint& rVec);
- const basegfx::B3DPoint ObjectToViewCoor(const basegfx::B3DPoint& rVec);
- const basegfx::B3DPoint ViewToObjectCoor(const basegfx::B3DPoint& rVec);
- const basegfx::B3DPoint ObjectToEyeCoor(const basegfx::B3DPoint& rVec);
- const basegfx::B3DPoint EyeToObjectCoor(const basegfx::B3DPoint& rVec);
- const basegfx::B3DPoint DeviceToEyeCoor(const basegfx::B3DPoint& rVec);
- const basegfx::B3DPoint EyeToDeviceCoor(const basegfx::B3DPoint& rVec);
-
- const basegfx::B3DPoint InvTransObjectToEye(const basegfx::B3DPoint& rVec);
- const basegfx::B2DPoint TransTextureCoor(const basegfx::B2DPoint& rVec);
static void Frustum(
basegfx::B3DHomMatrix& rTarget,
diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx
index 8fb7594..5bb03d0 100644
--- a/tools/source/generic/b3dtrans.cxx
+++ b/tools/source/generic/b3dtrans.cxx
@@ -670,128 +670,6 @@ const basegfx::B3DPoint B3dTransformationSet::EyeToWorldCoor(const basegfx::B3DP
return aVec;
}
-const basegfx::B3DPoint B3dTransformationSet::EyeToViewCoor(const basegfx::B3DPoint& rVec)
-{
- basegfx::B3DPoint aVec(rVec);
- aVec *= GetProjection();
- aVec *= GetScale();
- aVec += GetTranslate();
- return aVec;
-}
-
-const basegfx::B3DPoint B3dTransformationSet::ViewToEyeCoor(const basegfx::B3DPoint& rVec)
-{
- basegfx::B3DPoint aVec(rVec);
- aVec -= GetTranslate();
- aVec = aVec / GetScale();
- aVec *= GetInvProjection();
- return aVec;
-}
-
-const basegfx::B3DPoint B3dTransformationSet::WorldToViewCoor(const basegfx::B3DPoint& rVec)
-{
- basegfx::B3DPoint aVec(rVec);
- aVec *= GetMatFromWorldToView();
- return aVec;
-}
-
-const basegfx::B3DPoint B3dTransformationSet::ViewToWorldCoor(const basegfx::B3DPoint& rVec)
-{
- basegfx::B3DPoint aVec(rVec);
- aVec *= GetInvMatFromWorldToView();
- return aVec;
-}
-
-const basegfx::B3DPoint B3dTransformationSet::DeviceToViewCoor(const basegfx::B3DPoint& rVec)
-{
- basegfx::B3DPoint aVec(rVec);
- aVec *= GetScale();
- aVec += GetTranslate();
- return aVec;
-}
-
-const basegfx::B3DPoint B3dTransformationSet::ViewToDeviceCoor(const basegfx::B3DPoint& rVec)
-{
- basegfx::B3DPoint aVec(rVec);
- aVec -= GetTranslate();
- aVec = aVec / GetScale();
- return aVec;
-}
-
-const basegfx::B3DPoint B3dTransformationSet::ObjectToWorldCoor(const basegfx::B3DPoint& rVec)
-{
- basegfx::B3DPoint aVec(rVec);
- aVec *= GetObjectTrans();
- return aVec;
-}
-
-const basegfx::B3DPoint B3dTransformationSet::WorldToObjectCoor(const basegfx::B3DPoint& rVec)
-{
- basegfx::B3DPoint aVec(rVec);
- aVec *= GetInvObjectTrans();
- return aVec;
-}
-
-const basegfx::B3DPoint B3dTransformationSet::ObjectToViewCoor(const basegfx::B3DPoint& rVec)
-{
- basegfx::B3DPoint aVec(rVec);
- aVec *= GetObjectTrans();
- aVec *= GetMatFromWorldToView();
- return aVec;
-}
-
-const basegfx::B3DPoint B3dTransformationSet::ViewToObjectCoor(const basegfx::B3DPoint& rVec)
-{
- basegfx::B3DPoint aVec(rVec);
- aVec *= GetInvMatFromWorldToView();
- aVec *= GetInvObjectTrans();
- return aVec;
-}
-
-const basegfx::B3DPoint B3dTransformationSet::ObjectToEyeCoor(const basegfx::B3DPoint& rVec)
-{
- basegfx::B3DPoint aVec(rVec);
- aVec *= GetObjectTrans();
- aVec *= GetOrientation();
- return aVec;
-}
-
-const basegfx::B3DPoint B3dTransformationSet::EyeToObjectCoor(const basegfx::B3DPoint& rVec)
-{
- basegfx::B3DPoint aVec(rVec);
- aVec *= GetInvOrientation();
- aVec *= GetInvObjectTrans();
- return aVec;
-}
-
-const basegfx::B3DPoint B3dTransformationSet::DeviceToEyeCoor(const basegfx::B3DPoint& rVec)
-{
- basegfx::B3DPoint aVec(rVec);
- aVec *= GetInvProjection();
- return aVec;
-}
-
-const basegfx::B3DPoint B3dTransformationSet::EyeToDeviceCoor(const basegfx::B3DPoint& rVec)
-{
- basegfx::B3DPoint aVec(rVec);
- aVec *= GetProjection();
- return aVec;
-}
-
-const basegfx::B3DPoint B3dTransformationSet::InvTransObjectToEye(const basegfx::B3DPoint& rVec)
-{
- basegfx::B3DPoint aVec(rVec);
- aVec *= GetInvTransObjectToEye();
- return aVec;
-}
-
-const basegfx::B2DPoint B3dTransformationSet::TransTextureCoor(const basegfx::B2DPoint& rVec)
-{
- basegfx::B2DPoint aVec(rVec);
- aVec *= GetTexture();
- return aVec;
-}
-
/*************************************************************************
|*
|* Konstruktor B3dViewport
More information about the Libreoffice-commits
mailing list