[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu/marble/src/lib
From: Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date: 2011-03-31 15:30:56
Message-ID: 20110331153056.D0AB6AC8CD () svn ! kde ! org
[Download RAW message or body]
SVN commit 1226641 by beschow:
remove download usage parameter from StackedTileLoader::loadTile, since it is always \
set to DownloadBrowse
* In general, stacked tiles can (at least currently) be considered to be used for \
browsing. Therefore, the parameter seems redundant.
M +2 -2 AbstractScanlineTextureMapper.cpp
M +2 -2 StackedTileLoader.cpp
M +1 -1 StackedTileLoader.h
M +2 -2 TileScalingTextureMapper.cpp
--- trunk/KDE/kdeedu/marble/src/lib/AbstractScanlineTextureMapper.cpp \
#1226640:1226641 @@ -492,7 +492,7 @@
int tileCol = lon / m_tileSize.width();
int tileRow = lat / m_tileSize.height();
- m_tile = m_tileLoader->loadTile( TileId( 0, m_tileLevel, tileCol, tileRow ), \
DownloadBrowse ); + m_tile = m_tileLoader->loadTile( TileId( 0, m_tileLevel, \
tileCol, tileRow ) ); m_tile->setUsed( true );
// Update position variables:
@@ -532,7 +532,7 @@
int tileCol = lon / m_tileSize.width();
int tileRow = lat / m_tileSize.height();
- m_tile = m_tileLoader->loadTile( TileId( 0, m_tileLevel, tileCol, tileRow ), \
DownloadBrowse ); + m_tile = m_tileLoader->loadTile( TileId( 0, m_tileLevel, \
tileCol, tileRow ) ); m_tile->setUsed( true );
// Update position variables:
--- trunk/KDE/kdeedu/marble/src/lib/StackedTileLoader.cpp #1226640:1226641
@@ -182,7 +182,7 @@
d->m_tilesOnDisplay.clear();
}
-StackedTile* StackedTileLoader::loadTile( TileId const & stackedTileId, \
DownloadUsage const usage ) +StackedTile* StackedTileLoader::loadTile( TileId const & \
stackedTileId ) {
// check if the tile is in the hash
StackedTile * stackedTile = d->m_tilesOnDisplay.value( stackedTileId, 0 );
@@ -223,7 +223,7 @@
mDebug() << "StackedTileLoader::loadTile: tile" << textureLayer->sourceDir()
<< tileId.toString() << textureLayer->tileSize();
QSharedPointer<TextureTile> const tile = d->m_tileLoader->loadTile( \
stackedTileId, tileId,
- usage );
+ \
DownloadBrowse ); if ( tile ) {
tile->setBlending( textureLayer->blending() );
tiles.append( tile );
--- trunk/KDE/kdeedu/marble/src/lib/StackedTileLoader.h #1226640:1226641
@@ -91,7 +91,7 @@
* @param stackedTileId The Id of the requested tile, containing the x and y \
coordinate
* and the zoom level.
*/
- StackedTile* loadTile( TileId const &stackedTileId, DownloadUsage const );
+ StackedTile* loadTile( TileId const &stackedTileId );
StackedTile* reloadTile( TileId const & stackedTileId, DownloadUsage const \
); void downloadTile( TileId const & stackedTileId );
--- trunk/KDE/kdeedu/marble/src/lib/TileScalingTextureMapper.cpp #1226640:1226641
@@ -123,7 +123,7 @@
const QRectF rect = QRectF( QPointF( xLeft, yTop ), QPointF( xRight, \
yBottom ) );
const TileId stackedId = TileId( 0, tileZoomLevel(), ( ( tileX % \
numTilesX ) + numTilesX ) % numTilesX, tileY );
- StackedTile *const tile = m_tileLoader->loadTile( stackedId, \
DownloadBrowse ); + StackedTile *const tile = m_tileLoader->loadTile( \
stackedId ); tile->setUsed( true );
painter.drawImage( rect, *tile->resultTile() );
@@ -146,7 +146,7 @@
const QRectF rect = QRectF( QPointF( xLeft, yTop ), QPointF( xRight, \
yBottom ) );
const TileId stackedId = TileId( 0, tileZoomLevel(), ( ( tileX % \
numTilesX ) + numTilesX ) % numTilesX, tileY );
- StackedTile *const tile = m_tileLoader->loadTile( stackedId, \
DownloadBrowse ); + StackedTile *const tile = m_tileLoader->loadTile( \
stackedId ); tile->setUsed( true );
const QSize size = QSize( qCeil( rect.right() - rect.left() ), \
qCeil( rect.bottom() - rect.top() ) );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic