summaryrefslogtreecommitdiff
path: root/svx/source/engine3d
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-07-22 21:59:29 +0200
committerThomas Arnhold <thomas@arnhold.org>2011-07-25 15:12:21 +0200
commitb42bed0fa29712dfe669e400edcb6f01379b1f35 (patch)
tree4bdd242c8a195ad4c92d0ad8cc6d1a2521ce9249 /svx/source/engine3d
parent63c959cb88effbb90b9aa3b4506f1de0659f5ff4 (diff)
callcatcher: remove unused E3D stuff
Diffstat (limited to 'svx/source/engine3d')
-rw-r--r--svx/source/engine3d/cube3d.cxx9
-rw-r--r--svx/source/engine3d/lathe3d.cxx12
-rw-r--r--svx/source/engine3d/obj3d.cxx28
-rw-r--r--svx/source/engine3d/polygn3d.cxx30
-rw-r--r--svx/source/engine3d/scene3d.cxx14
-rw-r--r--svx/source/engine3d/sphere3d.cxx11
-rw-r--r--svx/source/engine3d/view3d.cxx124
7 files changed, 0 insertions, 228 deletions
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 46feb2ded38f..6bcee0bc0f67 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -119,15 +119,6 @@ void E3dCubeObj::SetPosIsCenter(sal_Bool bNew)
}
}
-void E3dCubeObj::SetSideFlags(sal_uInt16 nNew)
-{
- if(nSideFlags != nNew)
- {
- nSideFlags = nNew;
- ActionChanged();
- }
-}
-
// Get the name of the object (singular)
void E3dCubeObj::TakeObjNameSingul(XubString& rName) const
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 3af96e0a2cec..9f6c5273f9f1 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -131,18 +131,6 @@ SdrObject *E3dLatheObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
return NULL;
}
-void E3dLatheObj::ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs)
-{
- if ((nHSegs != GetHorizontalSegments() || nVSegs != GetVerticalSegments()) &&
- (nHSegs != 0 || nVSegs != 0))
- {
- GetProperties().SetObjectItemDirect(Svx3DHorizontalSegmentsItem(nHSegs));
- GetProperties().SetObjectItemDirect(Svx3DVerticalSegmentsItem(nVSegs));
-
- ActionChanged();
- }
-}
-
// Set Local parameters set to re-create geometry
void E3dLatheObj::SetPolyPoly2D(const basegfx::B2DPolyPolygon& rNew)
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 68996657aa26..ce11cc1813f5 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -955,34 +955,6 @@ E3dCompoundObject* E3dCompoundObject::Clone() const
return CloneHelper< E3dCompoundObject >();
}
-void E3dCompoundObject::SetCreateNormals(sal_Bool bNew)
-{
- if(bCreateNormals != bNew)
- {
- bCreateNormals = bNew;
- ActionChanged();
- }
-}
-
-void E3dCompoundObject::SetCreateTexture(sal_Bool bNew)
-{
- if(bCreateTexture != bNew)
- {
- bCreateTexture = bNew;
- ActionChanged();
- }
-}
-
-// Material of the object
-
-void E3dCompoundObject::SetMaterialAmbientColor(const Color& rColor)
-{
- if(aMaterialAmbientColor != rColor)
- {
- aMaterialAmbientColor = rColor;
- }
-}
-
// convert given basegfx::B3DPolyPolygon to screen coor
basegfx::B2DPolyPolygon E3dCompoundObject::TransformToScreenCoor(const basegfx::B3DPolyPolygon& rCandidate)
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index 008ab42bf165..24283fdcb9d2 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -63,36 +63,6 @@ E3dPolygonObj::E3dPolygonObj(
CreateDefaultTexture();
}
-E3dPolygonObj::E3dPolygonObj(
- E3dDefaultAttributes& rDefault,
- const basegfx::B3DPolyPolygon& rPolyPoly3D,
- const basegfx::B3DPolyPolygon& rPolyNormals3D,
- sal_Bool bLinOnly)
-: E3dCompoundObject(rDefault),
- bLineOnly(bLinOnly)
-{
- // Set geometry and the normal
- SetPolyPolygon3D(rPolyPoly3D);
- SetPolyNormals3D(rPolyNormals3D);
-
- // Create default texture coordinates
- CreateDefaultTexture();
-}
-
-E3dPolygonObj::E3dPolygonObj(
- E3dDefaultAttributes& rDefault,
- const basegfx::B3DPolyPolygon& rPolyPoly3D,
- const basegfx::B3DPolyPolygon& rPolyNormals3D,
- const basegfx::B2DPolyPolygon& rPolyTexture2D,
- sal_Bool bLinOnly)
-: E3dCompoundObject(rDefault),
- bLineOnly(bLinOnly)
-{
- SetPolyPolygon3D(rPolyPoly3D);
- SetPolyNormals3D(rPolyNormals3D);
- SetPolyTexture2D(rPolyTexture2D);
-}
-
E3dPolygonObj::E3dPolygonObj()
: E3dCompoundObject(),
bLineOnly(false) // added missing initialisation
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 1708fad29b4f..52745a03fb16 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -696,20 +696,6 @@ sal_Bool E3dScene::IsBreakObjPossible()
return sal_True;
}
-basegfx::B3DVector E3dScene::GetShadowPlaneDirection() const
-{
- double fWink = (double)GetShadowSlant() * F_PI180;
- basegfx::B3DVector aShadowPlaneDir(0.0, sin(fWink), cos(fWink));
- aShadowPlaneDir.normalize();
- return aShadowPlaneDir;
-}
-
-void E3dScene::SetShadowPlaneDirection(const basegfx::B3DVector& rVec)
-{
- sal_uInt16 nSceneShadowSlant = (sal_uInt16)((atan2(rVec.getY(), rVec.getZ()) / F_PI180) + 0.5);
- GetProperties().SetObjectItemDirect(Svx3DShadowSlantItem(nSceneShadowSlant));
-}
-
basegfx::B2DPolyPolygon E3dScene::TakeCreatePoly(const SdrDragStat& /*rDrag*/) const
{
return TakeXorPoly();
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 3b6ce894a9be..acc2986e6a87 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -120,17 +120,6 @@ SdrObject *E3dSphereObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
return NULL;
}
-void E3dSphereObj::ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs)
-{
- if((nHSegs != GetHorizontalSegments() || nVSegs != GetVerticalSegments()) && (nHSegs != 0 || nVSegs != 0))
- {
- GetProperties().SetObjectItemDirect(Svx3DHorizontalSegmentsItem(nHSegs));
- GetProperties().SetObjectItemDirect(Svx3DVerticalSegmentsItem(nVSegs));
-
- ActionChanged();
- }
-}
-
E3dSphereObj* E3dSphereObj::Clone() const
{
return CloneHelper< E3dSphereObj >();
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 08b2dc3ce4c0..c3cf8139868a 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -1303,22 +1303,6 @@ sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
return SdrView::BegDragObj(rPnt, pOut, pHdl, nMinMov, pForcedMeth);
}
-sal_Bool E3dView::HasMarkedScene()
-{
- return (GetMarkedScene() != NULL);
-}
-
-E3dScene* E3dView::GetMarkedScene()
-{
- sal_uIntPtr nCnt = GetMarkedObjectCount();
-
- for ( sal_uIntPtr i = 0; i < nCnt; i++ )
- if ( GetMarkedObjectByIndex(i)->ISA(E3dScene) )
- return (E3dScene*) GetMarkedObjectByIndex(i);
-
- return NULL;
-}
-
// Set current 3D drawing object, create the scene for this
E3dScene* E3dView::SetCurrent3DObj(E3dObject* p3DObj)
@@ -1640,114 +1624,6 @@ void E3dView::BreakSingle3DObj(E3dObject* pObj)
}
}
-void E3dView::MergeScenes ()
-{
- sal_uIntPtr nCount = GetMarkedObjectCount();
-
- if (nCount > 0)
- {
- sal_uIntPtr nObj = 0;
- SdrObject *pObj = GetMarkedObjectByIndex(nObj);
- E3dScene *pScene = new E3dPolyScene(Get3DDefaultAttributes());
- basegfx::B3DRange aBoundVol;
- Rectangle aAllBoundRect (GetMarkedObjBoundRect ());
- Point aCenter (aAllBoundRect.Center());
-
- while (pObj)
- {
- if (pObj->ISA(E3dScene))
- {
- // It is a 3D-Scene or 3D-PolyScene
- SdrObjList* pSubList = ((E3dObject*) pObj)->GetSubList();
-
- SdrObjListIter aIter(*pSubList, IM_FLAT);
-
- while (aIter.IsMore())
- {
- // Search for Lathe objects
- SdrObject* pSubObj = aIter.Next();
-
- E3dObject *pNewObj = 0;
-
- switch (pSubObj->GetObjIdentifier())
- {
- case E3D_CUBEOBJ_ID :
- pNewObj = new E3dCubeObj;
- *(E3dCubeObj*)pNewObj = *(E3dCubeObj*)pSubObj;
- break;
-
- case E3D_SPHEREOBJ_ID:
- pNewObj = new E3dSphereObj;
- *(E3dSphereObj*)pNewObj = *(E3dSphereObj*)pSubObj;
- break;
-
- case E3D_EXTRUDEOBJ_ID:
- pNewObj = new E3dExtrudeObj;
- *(E3dExtrudeObj*)pNewObj = *(E3dExtrudeObj*)pSubObj;
- break;
-
- case E3D_LATHEOBJ_ID:
- pNewObj = new E3dLatheObj;
- *(E3dLatheObj*)pNewObj = *(E3dLatheObj*)pSubObj;
- break;
-
- case E3D_COMPOUNDOBJ_ID:
- pNewObj = new E3dCompoundObject;
- *(E3dCompoundObject*)pNewObj = *(E3dCompoundObject*)pSubObj;
- break;
- }
-
- Rectangle aBoundRect = pSubObj->GetCurrentBoundRect();
-
- basegfx::B3DHomMatrix aMatrix;
- aMatrix.translate(aBoundRect.Left() - aCenter.getX(), aCenter.getY(), 0.0);
- pNewObj->SetTransform(aMatrix * pNewObj->GetTransform());
-
- if (pNewObj) aBoundVol.expand(pNewObj->GetBoundVolume());
- pScene->Insert3DObj (pNewObj);
- }
- }
-
- nObj++;
-
- if (nObj < nCount)
- {
- pObj = GetMarkedObjectByIndex(nObj);
- }
- else
- {
- pObj = NULL;
- }
- }
-
- double fW = aAllBoundRect.GetWidth();
- double fH = aAllBoundRect.GetHeight();
- Rectangle aRect(0,0, (long) fW, (long) fH);
-
- InitScene(pScene, fW, fH, aBoundVol.getMaxZ() + + ((fW + fH) / 4.0));
- pScene->NbcSetSnapRect(aRect);
-
- Camera3D &aCamera = (Camera3D&) pScene->GetCamera ();
- basegfx::B3DPoint aMinVec(aBoundVol.getMinimum());
- basegfx::B3DPoint aMaxVec(aBoundVol.getMaximum());
- double fDeepth(fabs(aMaxVec.getZ() - aMinVec.getZ()));
-
- aCamera.SetPRP(basegfx::B3DPoint(0.0, 0.0, 1000.0));
- double fDefaultCamPosZ(GetDefaultCamPosZ());
- aCamera.SetPosition(basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ + fDeepth / 2.0));
- aCamera.SetFocalLength(GetDefaultCamFocal());
- pScene->SetCamera (aCamera);
-
- // Invalid SnapRects of Objects
- pScene->SetRectsDirty();
-
- InsertObjectAtView(pScene, *(GetSdrPageViewOfMarkedByIndex(0)));
-
- // Invalid SnapRects of Objects
- pScene->SetRectsDirty();
- }
-}
-
void E3dView::CheckPossibilities()
{
// call parent