Landscape.cpp   Landscape.cpp 
skipping to change at line 56 skipping to change at line 56
, rows(20) , rows(20)
, cols(40) , cols(40)
, angleRotateZ(0.) , angleRotateZ(0.)
, angleRotateZOffset(0.) , angleRotateZOffset(0.)
, sinMinAltitudeLimit(-0.035) //sin(-2 degrees)) , sinMinAltitudeLimit(-0.035) //sin(-2 degrees))
, defaultBortleIndex(-1) , defaultBortleIndex(-1)
, defaultFogSetting(-1) , defaultFogSetting(-1)
, defaultExtinctionCoefficient(-1.) , defaultExtinctionCoefficient(-1.)
, defaultTemperature(-1000.) , defaultTemperature(-1000.)
, defaultPressure(-2.) , defaultPressure(-2.)
, horizonPolygon(NULL) , horizonPolygon(Q_NULLPTR)
, fontSize(18) , fontSize(18)
{ {
} }
Landscape::~Landscape() Landscape::~Landscape()
{} {}
// Load attributes common to all landscapes // Load attributes common to all landscapes
void Landscape::loadCommon(const QSettings& landscapeIni, const QString& la ndscapeId) void Landscape::loadCommon(const QSettings& landscapeIni, const QString& la ndscapeId)
{ {
skipping to change at line 341 skipping to change at line 341
// in case of gravityLabels, we cannot shift-adjust centered placename, sorry! // in case of gravityLabels, we cannot shift-adjust centered placename, sorry!
if (prj->getFlagGravityLabels()) if (prj->getFlagGravityLabels())
{ {
painter->drawText(landscapeLabels.at(i).labelPoint, landscapeLabels.at(i).name, 0, 0, 0, false); painter->drawText(landscapeLabels.at(i).labelPoint, landscapeLabels.at(i).name, 0, 0, 0, false);
} }
else else
{ {
int textWidth=fm.width(landscapeLabels.at(i).name); int textWidth=fm.width(landscapeLabels.at(i).name);
painter->drawText(landscapeLabels.at(i).labelPoint, landscapeLabels.at(i).name, 0, -textWidth/2, 2, true); painter->drawText(landscapeLabels.at(i).labelPoint, landscapeLabels.at(i).name, 0, -textWidth/2, 2, true);
} }
painter->drawGreatCircleArc(landscapeLabels.at(i).featurePoi nt, landscapeLabels.at(i).labelPoint, NULL); painter->drawGreatCircleArc(landscapeLabels.at(i).featurePoi nt, landscapeLabels.at(i).labelPoint, Q_NULLPTR);
} }
painter->setLineSmooth(false); painter->setLineSmooth(false);
painter->setBlending(false); painter->setBlending(false);
} }
LandscapeOldStyle::LandscapeOldStyle(float _radius) LandscapeOldStyle::LandscapeOldStyle(float _radius)
: Landscape(_radius) : Landscape(_radius)
, sideTexs(NULL) , sideTexs(Q_NULLPTR)
, nbSideTexs(0) , nbSideTexs(0)
, nbSide(0) , nbSide(0)
, sides(NULL) , sides(Q_NULLPTR)
, nbDecorRepeat(0) , nbDecorRepeat(0)
, fogAltAngle(0.) , fogAltAngle(0.)
, fogAngleShift(0.) , fogAngleShift(0.)
, decorAltAngle(0.) , decorAltAngle(0.)
, decorAngleShift(0.) , decorAngleShift(0.)
, groundAngleShift(0.) , groundAngleShift(0.)
, groundAngleRotateZ(0.) , groundAngleRotateZ(0.)
, drawGroundFirst(0) , drawGroundFirst(0)
, tanMode(false) , tanMode(false)
, calibrated(false) , calibrated(false)
, memorySize(sizeof(LandscapeOldStyle)) // start with just the known entries. , memorySize(sizeof(LandscapeOldStyle)) // start with just the known entries.
{} {}
LandscapeOldStyle::~LandscapeOldStyle() LandscapeOldStyle::~LandscapeOldStyle()
{ {
if (sideTexs) if (sideTexs)
{ {
delete [] sideTexs; delete [] sideTexs;
sideTexs = NULL; sideTexs = Q_NULLPTR;
} }
if (sides) delete [] sides; if (sides) delete [] sides;
if (sidesImages.size()>0) if (sidesImages.size()>0)
{ {
qDeleteAll(sidesImages); qDeleteAll(sidesImages);
sidesImages.clear(); sidesImages.clear();
} }
landscapeLabels.clear(); landscapeLabels.clear();
} }
skipping to change at line 704 skipping to change at line 704
if (drawLight) if (drawLight)
sPainter.setColor(illumFader.getInterstate()*lightScapeBrigh tness, illumFader.getInterstate()*lightScapeBrightness, illumFader.getInter state()*lightScapeBrightness, landFader.getInterstate()); sPainter.setColor(illumFader.getInterstate()*lightScapeBrigh tness, illumFader.getInterstate()*lightScapeBrightness, illumFader.getInter state()*lightScapeBrightness, landFader.getInterstate());
else else
sPainter.setColor(landscapeBrightness, landscapeBrightness, landscapeBrightness, landFader.getInterstate()); sPainter.setColor(landscapeBrightness, landscapeBrightness, landscapeBrightness, landFader.getInterstate());
foreach (const LOSSide& side, precomputedSides) foreach (const LOSSide& side, precomputedSides)
{ {
if (side.light==drawLight) if (side.light==drawLight)
{ {
side.tex->bind(); side.tex->bind();
sPainter.drawSphericalTriangles(side.arr, true, fals e, NULL, false); sPainter.drawSphericalTriangles(side.arr, true, fals e, Q_NULLPTR, false);
} }
} }
} }
// Draw the ground // Draw the ground
void LandscapeOldStyle::drawGround(StelCore* core, StelPainter& sPainter) c onst void LandscapeOldStyle::drawGround(StelCore* core, StelPainter& sPainter) c onst
{ {
if (!landFader.getInterstate()) if (!landFader.getInterstate())
return; return;
const float vshift = radius * ((tanMode || calibrated) ? std::tan(gr oundAngleShift) : std::sin(groundAngleShift)); const float vshift = radius * ((tanMode || calibrated) ? std::tan(gr oundAngleShift) : std::sin(groundAngleShift));
skipping to change at line 892 skipping to change at line 892
/////////////////////////////////////////////////////////////////////////// ///////////// /////////////////////////////////////////////////////////////////////////// /////////////
// LandscapeFisheye // LandscapeFisheye
// //
LandscapeFisheye::LandscapeFisheye(float _radius) LandscapeFisheye::LandscapeFisheye(float _radius)
: Landscape(_radius) : Landscape(_radius)
, mapTex(StelTextureSP()) , mapTex(StelTextureSP())
, mapTexFog(StelTextureSP()) , mapTexFog(StelTextureSP())
, mapTexIllum(StelTextureSP()) , mapTexIllum(StelTextureSP())
, mapImage(NULL) , mapImage(Q_NULLPTR)
, texFov(360.) , texFov(360.)
, memorySize(0) , memorySize(0)
{} {}
LandscapeFisheye::~LandscapeFisheye() LandscapeFisheye::~LandscapeFisheye()
{ {
if (mapImage) delete mapImage; if (mapImage) delete mapImage;
landscapeLabels.clear(); landscapeLabels.clear();
} }
skipping to change at line 1047 skipping to change at line 1047
: Landscape(_radius) : Landscape(_radius)
, mapTex(StelTextureSP()) , mapTex(StelTextureSP())
, mapTexFog(StelTextureSP()) , mapTexFog(StelTextureSP())
, mapTexIllum(StelTextureSP()) , mapTexIllum(StelTextureSP())
, mapTexTop(0.) , mapTexTop(0.)
, mapTexBottom(0.) , mapTexBottom(0.)
, fogTexTop(0.) , fogTexTop(0.)
, fogTexBottom(0.) , fogTexBottom(0.)
, illumTexTop(0.) , illumTexTop(0.)
, illumTexBottom(0.) , illumTexBottom(0.)
, mapImage(NULL) , mapImage(Q_NULLPTR)
, memorySize(sizeof(LandscapeSpherical)) , memorySize(sizeof(LandscapeSpherical))
{} {}
LandscapeSpherical::~LandscapeSpherical() LandscapeSpherical::~LandscapeSpherical()
{ {
if (mapImage) delete mapImage; if (mapImage) delete mapImage;
landscapeLabels.clear(); landscapeLabels.clear();
} }
void LandscapeSpherical::load(const QSettings& landscapeIni, const QString& landscapeId) void LandscapeSpherical::load(const QSettings& landscapeIni, const QString& landscapeId)
 End of changes. 8 change blocks. 
8 lines changed or deleted 8 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/