StelToast.cpp   StelToast.cpp 
skipping to change at line 180 skipping to change at line 180
} }
else else
{ {
sPainter->setBlending(false); sPainter->setBlending(false);
sPainter->setColor(1, 1, 1, 1); sPainter->setColor(1, 1, 1, 1);
} }
Q_ASSERT(vertexArray.size() == textureArray.size()); Q_ASSERT(vertexArray.size() == textureArray.size());
sPainter->setCullFace(true); sPainter->setCullFace(true);
// sPainter.drawArrays(GL_TRIANGLES, vertexArray.size(), vertexArray .data(), textureArray.data(), NULL, NULL, indexArray.size(), indexArray.con stData()); // sPainter.drawArrays(GL_TRIANGLES, vertexArray.size(), vertexArray .data(), textureArray.data(), Q_NULLPTR, Q_NULLPTR, indexArray.size(), inde xArray.constData());
sPainter->setArrays(vertexArray.constData(), textureArray.constData( )); sPainter->setArrays(vertexArray.constData(), textureArray.constData( ));
sPainter->drawFromArray(StelPainter::Triangles, indexArray.size(), 0 , true, indexArray.constData()); sPainter->drawFromArray(StelPainter::Triangles, indexArray.size(), 0 , true, indexArray.constData());
// SphericalConvexPolygon poly(getGrid()->getPolygon(level, x, y)); // SphericalConvexPolygon poly(getGrid()->getPolygon(level, x, y));
// sPainter->enableTexture2d(false); // sPainter->enableTexture2d(false);
// sPainter->drawSphericalRegion(&poly, StelPainter::SphericalPolygonDr awModeBoundary); // sPainter->drawSphericalRegion(&poly, StelPainter::SphericalPolygonDr awModeBoundary);
} }
void ToastTile::draw(StelPainter* sPainter, const SphericalCap& viewportSha pe, int maxVisibleLevel) void ToastTile::draw(StelPainter* sPainter, const SphericalCap& viewportSha pe, int maxVisibleLevel)
{ {
skipping to change at line 226 skipping to change at line 226
/////// ToastSurvey methods //////////// /////// ToastSurvey methods ////////////
ToastSurvey::ToastSurvey(const QString& path, int amaxLevel) ToastSurvey::ToastSurvey(const QString& path, int amaxLevel)
: grid(amaxLevel), path(path), maxLevel(amaxLevel), toastCache(200) : grid(amaxLevel), path(path), maxLevel(amaxLevel), toastCache(200)
{ {
rootTile = new ToastTile(this, 0, 0, 0); rootTile = new ToastTile(this, 0, 0, 0);
} }
ToastSurvey::~ToastSurvey() ToastSurvey::~ToastSurvey()
{ {
delete rootTile; delete rootTile;
rootTile = NULL; rootTile = Q_NULLPTR;
} }
QString ToastSurvey::getTilePath(int level, int x, int y) const QString ToastSurvey::getTilePath(int level, int x, int y) const
{ {
QString ret = path; QString ret = path;
ret.replace("{level}", QString::number(level)); ret.replace("{level}", QString::number(level));
ret.replace("{x}", QString::number(x)); ret.replace("{x}", QString::number(x));
ret.replace("{y}", QString::number(y)); ret.replace("{y}", QString::number(y));
return ret; return ret;
} }
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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/