Skip to content

C
core
Kaydet (Commit) 747de983 authored tarafından Armin Weiss's avatar Armin Weiss
Dosyalara gözat
Seçenekler

#i39532# changes after resync to m185

üst 4db120a0
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 33 deletions
drawinglayer/source/animation/animationtiming.cxx
Dosyayı görüntüle @ 747de983
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: animationtiming.cxx,v $ * $RCSfile: animationtiming.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: aw $ $Date: 2006-08-09 16:47:02 $ * last change: $Author: aw $ $Date: 2006-09-27 16:32:56 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -88,7 +88,7 @@ namespace drawinglayer ...@@ -88,7 +88,7 @@ namespace drawinglayer
return mfDuration; return mfDuration;
} }
double animationEntryFixed::getStateAtTime(double fTime) const double animationEntryFixed::getStateAtTime(double /*fTime*/) const
{ {
return mfState; return mfState;
} }
......
drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
Dosyayı görüntüle @ 747de983
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: polygontubeprimitive3d.cxx,v $ * $RCSfile: polygontubeprimitive3d.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: aw $ $Date: 2006-08-09 16:51:15 $ * last change: $Author: aw $ $Date: 2006-09-27 16:33:17 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -191,7 +191,7 @@ namespace drawinglayer ...@@ -191,7 +191,7 @@ namespace drawinglayer
sal_uInt32 nSegments, sal_uInt32 nSegments,
const attribute::materialAttribute3D& rMaterial, const attribute::materialAttribute3D& rMaterial,
double fAngle, double fAngle,
double fDegreeStepWidth, double /*fDegreeStepWidth*/,
double fMiterMinimumAngle, double fMiterMinimumAngle,
basegfx::tools::B2DLineJoin aLineJoin) basegfx::tools::B2DLineJoin aLineJoin)
{ {
......
drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
Dosyayı görüntüle @ 747de983
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: sdrextrudelathetools3d.cxx,v $ * $RCSfile: sdrextrudelathetools3d.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: aw $ $Date: 2006-08-09 16:51:15 $ * last change: $Author: aw $ $Date: 2006-09-27 16:33:18 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -160,8 +160,8 @@ namespace ...@@ -160,8 +160,8 @@ namespace
if(nPointCount) if(nPointCount)
{ {
const sal_uInt32 nEdgeCount(aSubA.isClosed() ? nPointCount : nPointCount - 1L); const sal_uInt32 nEdgeCount(aSubA.isClosed() ? nPointCount : nPointCount - 1L);
double fTexHorMultiplicatorA, fTexHorMultiplicatorB; double fTexHorMultiplicatorA(0.0), fTexHorMultiplicatorB(0.0);
double fPolygonPosA, fPolygonPosB; double fPolygonPosA(0.0), fPolygonPosB(0.0);
if(bCreateTextureCoordinates) if(bCreateTextureCoordinates)
{ {
...@@ -170,8 +170,6 @@ namespace ...@@ -170,8 +170,6 @@ namespace
const double fPolygonLengthB(basegfx::tools::getLength(aSubB)); const double fPolygonLengthB(basegfx::tools::getLength(aSubB));
fTexHorMultiplicatorB = basegfx::fTools::equalZero(fPolygonLengthB) ? 1.0 : 1.0 / fPolygonLengthB; fTexHorMultiplicatorB = basegfx::fTools::equalZero(fPolygonLengthB) ? 1.0 : 1.0 / fPolygonLengthB;
fPolygonPosA = fPolygonPosB = 0.0;
} }
for(sal_uInt32 b(0L); b < nEdgeCount; b++) for(sal_uInt32 b(0L); b < nEdgeCount; b++)
......
drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
Dosyayı görüntüle @ 747de983
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: sdrsphereprimitive3d.cxx,v $ * $RCSfile: sdrsphereprimitive3d.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: aw $ $Date: 2006-08-09 16:51:16 $ * last change: $Author: aw $ $Date: 2006-09-27 16:33:18 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -105,7 +105,7 @@ namespace drawinglayer ...@@ -105,7 +105,7 @@ namespace drawinglayer
if(bSphereX || bObjectSpecificX || bSphereY || bObjectSpecificY) if(bSphereX || bObjectSpecificX || bSphereY || bObjectSpecificY)
{ {
double fRelativeAngle; double fRelativeAngle(0.0);
if(bObjectSpecificX) if(bObjectSpecificX)
{ {
......
drawinglayer/source/processor3d/defaultprocessor3d.cxx
Dosyayı görüntüle @ 747de983
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: defaultprocessor3d.cxx,v $ * $RCSfile: defaultprocessor3d.cxx,v $
* *
* $Revision: 1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: aw $ $Date: 2006-08-09 16:57:47 $ * last change: $Author: aw $ $Date: 2006-09-27 16:33:27 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -431,6 +431,10 @@ namespace basegfx ...@@ -431,6 +431,10 @@ namespace basegfx
{ {
} }
virtual ~B3DPolyPolygonRasterConverter()
{
}
void addPolygon(const B3DPolygon& rPolygon, const B3DHomMatrix& rInvEyeToView) void addPolygon(const B3DPolygon& rPolygon, const B3DHomMatrix& rInvEyeToView)
{ {
const sal_uInt32 nPointCount(rPolygon.count()); const sal_uInt32 nPointCount(rPolygon.count());
...@@ -879,7 +883,6 @@ namespace drawinglayer ...@@ -879,7 +883,6 @@ namespace drawinglayer
} }
else else
{ {
const sal_uInt32 nScanlineIndexLine(mrBuffer.getIndexFromXY(0L, (sal_uInt32)nLine));
double fZStart(rEntry.getZInterpolator().getVal()); double fZStart(rEntry.getZInterpolator().getVal());
double fZStop(fZStart + rEntry.getZInterpolator().getInc()); double fZStop(fZStart + rEntry.getZInterpolator().getInc());
...@@ -973,12 +976,12 @@ namespace drawinglayer ...@@ -973,12 +976,12 @@ namespace drawinglayer
&& mfOpacity == pCompare->mfOpacity); && mfOpacity == pCompare->mfOpacity);
} }
void geoTexSvxMono::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const void geoTexSvxMono::modifyBColor(const basegfx::B2DPoint& /*rUV*/, basegfx::BColor& rBColor, double& /*rfOpacity*/) const
{ {
rBColor = maSingleColor; rBColor = maSingleColor;
} }
void geoTexSvxMono::modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const void geoTexSvxMono::modifyOpacity(const basegfx::B2DPoint& /*rUV*/, double& rfOpacity) const
{ {
rfOpacity = mfOpacity; rfOpacity = mfOpacity;
} }
...@@ -1743,7 +1746,7 @@ namespace drawinglayer ...@@ -1743,7 +1746,7 @@ namespace drawinglayer
// directdraw of polygonHairlinePrimitive3D // directdraw of polygonHairlinePrimitive3D
const primitive3d::polygonHairlinePrimitive3D& rPrimitive = static_cast< const primitive3d::polygonHairlinePrimitive3D& >(rCandidate.getBasePrimitive()); const primitive3d::polygonHairlinePrimitive3D& rPrimitive = static_cast< const primitive3d::polygonHairlinePrimitive3D& >(rCandidate.getBasePrimitive());
if(mbProcessTransparent == (0L != mpTransparenceGeoTexSvx)) if((bool)mbProcessTransparent == (0L != mpTransparenceGeoTexSvx))
{ {
impRender_POH3(rPrimitive); impRender_POH3(rPrimitive);
} }
...@@ -1756,7 +1759,7 @@ namespace drawinglayer ...@@ -1756,7 +1759,7 @@ namespace drawinglayer
// directdraw of polyPolygonMaterialPrimitive3D // directdraw of polyPolygonMaterialPrimitive3D
const primitive3d::polyPolygonMaterialPrimitive3D& rPrimitive = static_cast< const primitive3d::polyPolygonMaterialPrimitive3D& >(rCandidate.getBasePrimitive()); const primitive3d::polyPolygonMaterialPrimitive3D& rPrimitive = static_cast< const primitive3d::polyPolygonMaterialPrimitive3D& >(rCandidate.getBasePrimitive());
if(mbProcessTransparent == (0L != mpTransparenceGeoTexSvx)) if((bool)mbProcessTransparent == (0L != mpTransparenceGeoTexSvx))
{ {
impRender_POM3(rPrimitive); impRender_POM3(rPrimitive);
} }
......
drawinglayer/source/texture/texture.cxx
Dosyayı görüntüle @ 747de983
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: texture.cxx,v $ * $RCSfile: texture.cxx,v $
* *
* $Revision: 1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: aw $ $Date: 2006-08-09 16:58:20 $ * last change: $Author: aw $ $Date: 2006-09-27 16:33:43 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -55,18 +55,18 @@ namespace drawinglayer ...@@ -55,18 +55,18 @@ namespace drawinglayer
{ {
} }
bool geoTexSvx::operator==(const geoTexSvx& rGeoTexSvx) const bool geoTexSvx::operator==(const geoTexSvx& /*rGeoTexSvx*/) const
{ {
// default implementation says yes (no data -> no difference) // default implementation says yes (no data -> no difference)
return true; return true;
} }
void geoTexSvx::appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices) void geoTexSvx::appendTransformations(::std::vector< basegfx::B2DHomMatrix >& /*rMatrices*/)
{ {
// default implementation does nothing // default implementation does nothing
} }
void geoTexSvx::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const void geoTexSvx::modifyBColor(const basegfx::B2DPoint& /*rUV*/, basegfx::BColor& rBColor, double& /*rfOpacity*/) const
{ {
// base implementation creates random color (for testing only, may also be pure virtual) // base implementation creates random color (for testing only, may also be pure virtual)
rBColor.setRed((rand() & 0x7fff) / 32767.0); rBColor.setRed((rand() & 0x7fff) / 32767.0);
...@@ -236,7 +236,7 @@ namespace drawinglayer ...@@ -236,7 +236,7 @@ namespace drawinglayer
} }
} }
void geoTexSvxGradientLinear::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const void geoTexSvxGradientLinear::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const
{ {
const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV); const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV);
...@@ -363,7 +363,7 @@ namespace drawinglayer ...@@ -363,7 +363,7 @@ namespace drawinglayer
} }
} }
void geoTexSvxGradientAxial::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const void geoTexSvxGradientAxial::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const
{ {
const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV); const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV);
const double fAbsY(fabs(aCoor.getY())); const double fAbsY(fabs(aCoor.getY()));
...@@ -483,7 +483,7 @@ namespace drawinglayer ...@@ -483,7 +483,7 @@ namespace drawinglayer
impAppendColorsRadial(rColors); impAppendColorsRadial(rColors);
} }
void geoTexSvxGradientRadial::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const void geoTexSvxGradientRadial::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const
{ {
const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV); const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV);
const double fDist(aCoor.getX() * aCoor.getX() + aCoor.getY() * aCoor.getY()); const double fDist(aCoor.getX() * aCoor.getX() + aCoor.getY() * aCoor.getY());
...@@ -613,7 +613,7 @@ namespace drawinglayer ...@@ -613,7 +613,7 @@ namespace drawinglayer
impAppendColorsRadial(rColors); impAppendColorsRadial(rColors);
} }
void geoTexSvxGradientElliptical::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const void geoTexSvxGradientElliptical::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const
{ {
const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV); const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV);
const double fDist(aCoor.getX() * aCoor.getX() + aCoor.getY() * aCoor.getY()); const double fDist(aCoor.getX() * aCoor.getX() + aCoor.getY() * aCoor.getY());
...@@ -758,7 +758,7 @@ namespace drawinglayer ...@@ -758,7 +758,7 @@ namespace drawinglayer
impAppendColorsRadial(rColors); impAppendColorsRadial(rColors);
} }
void geoTexSvxGradientSquare::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const void geoTexSvxGradientSquare::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const
{ {
const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV); const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV);
const double fAbsX(fabs(aCoor.getX())); const double fAbsX(fabs(aCoor.getX()));
...@@ -896,7 +896,7 @@ namespace drawinglayer ...@@ -896,7 +896,7 @@ namespace drawinglayer
impAppendColorsRadial(rColors); impAppendColorsRadial(rColors);
} }
void geoTexSvxGradientRect::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const void geoTexSvxGradientRect::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& /*rfOpacity*/) const
{ {
const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV); const basegfx::B2DPoint aCoor(maBackTextureTransform * rUV);
const double fAbsX(fabs(aCoor.getX())); const double fAbsX(fabs(aCoor.getX()));
......
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