Skip to content

C
core
Kaydet (Commit) b42bed0f authored tarafından Thomas Arnhold's avatar Thomas Arnhold
Dosyalara gözat
Seçenekler

callcatcher: remove unused E3D stuff

üst 63c959cb
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 252 deletions
svx/inc/svx/cube3d.hxx
Dosyayı görüntüle @ b42bed0f
......@@ -85,7 +85,6 @@ public:
void SetPosIsCenter(sal_Bool bNew);
sal_Bool GetPosIsCenter() { return (sal_Bool)bPosIsCenter; }
void SetSideFlags(sal_uInt16 nNew);
sal_uInt16 GetSideFlags() { return nSideFlags; }
// TakeObjName...() is for the display in the UI, for example "3 frames selected".
......
svx/inc/svx/lathe3d.hxx
Dosyayı görüntüle @ b42bed0f
......@@ -100,7 +100,6 @@ private:
{ return ((const Svx3DCloseBackItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK)).GetValue(); }
virtual sal_uInt16 GetObjIdentifier() const;
void ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs);
virtual E3dLatheObj* Clone() const;
......
svx/inc/svx/obj3d.hxx
Dosyayı görüntüle @ b42bed0f
......@@ -312,16 +312,13 @@ public :
// set/get parameters for geometry creation
sal_Bool GetCreateNormals() const { return bCreateNormals; }
void SetCreateNormals(sal_Bool bNew);
sal_Bool GetCreateTexture() const { return bCreateTexture; }
void SetCreateTexture(sal_Bool bNew);
virtual E3dCompoundObject* Clone() const;
// material of the object
const Color& GetMaterialAmbientColor() const { return aMaterialAmbientColor; }
void SetMaterialAmbientColor(const Color& rColor);
sal_Bool IsAOrdNumRemapCandidate(E3dScene*& prScene) const;
};
......
svx/inc/svx/polygn3d.hxx
Dosyayı görüntüle @ b42bed0f
......@@ -58,17 +58,6 @@ public:
E3dDefaultAttributes& rDefault,
const basegfx::B3DPolyPolygon& rPolyPoly3D,
sal_Bool bLinOnly=sal_False);
E3dPolygonObj(
E3dDefaultAttributes& rDefault,
const basegfx::B3DPolyPolygon& rPolyPoly3D,
const basegfx::B3DPolyPolygon& rPolyNormals3D,
sal_Bool bLinOnly=sal_False);
E3dPolygonObj(
E3dDefaultAttributes& rDefault,
const basegfx::B3DPolyPolygon& rPolyPoly3D,
const basegfx::B3DPolyPolygon& rPolyNormals3D,
const basegfx::B2DPolyPolygon& rPolyTexture2D,
sal_Bool bLinOnly=sal_False);
E3dPolygonObj();
virtual ~E3dPolygonObj();
......
svx/inc/svx/scene3d.hxx
Dosyayı görüntüle @ b42bed0f
......@@ -233,9 +233,6 @@ public:
// break up
virtual sal_Bool IsBreakObjPossible();
basegfx::B3DVector GetShadowPlaneDirection() const;
void SetShadowPlaneDirection(const basegfx::B3DVector& rVec);
// polygon which is built during creation
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const;
......
svx/inc/svx/sphere3d.hxx
Dosyayı görüntüle @ b42bed0f
......@@ -73,7 +73,6 @@ public:
virtual E3dSphereObj* Clone() const;
void ReSegment(sal_uInt32 nHorzSegments, sal_uInt32 nVertSegments);
const basegfx::B3DPoint& Center() const { return aCenter; }
const basegfx::B3DVector& Size() const { return aSize; }
......
svx/inc/svx/view3d.hxx
Dosyayı görüntüle @ b42bed0f
......@@ -117,9 +117,6 @@ public:
// #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...)
sal_Bool ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset);
sal_Bool HasMarkedScene();
E3dScene* GetMarkedScene();
sal_Bool IsConvertTo3DObjPossible() const;
void ConvertMarkedObjTo3D(sal_Bool bExtrude=sal_True, basegfx::B2DPoint aPnt1 = basegfx::B2DPoint(0.0, 0.0), basegfx::B2DPoint aPnt2 = basegfx::B2DPoint(0.0, 1.0));
......@@ -270,7 +267,6 @@ public:
return bDoubleSided;
}
void MergeScenes();
SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False) const;
void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False);
};
......
svx/source/engine3d/cube3d.cxx
Dosyayı görüntüle @ b42bed0f
......@@ -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
......
svx/source/engine3d/lathe3d.cxx
Dosyayı görüntüle @ b42bed0f
......@@ -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)
......
svx/source/engine3d/obj3d.cxx
Dosyayı görüntüle @ b42bed0f
......@@ -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)
......
svx/source/engine3d/polygn3d.cxx
Dosyayı görüntüle @ b42bed0f
......@@ -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
......
svx/source/engine3d/scene3d.cxx
Dosyayı görüntüle @ b42bed0f
......@@ -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();
......
svx/source/engine3d/sphere3d.cxx
Dosyayı görüntüle @ b42bed0f
......@@ -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 >();
......
svx/source/engine3d/view3d.cxx
Dosyayı görüntüle @ b42bed0f
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment