[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: 2010-12-31 18:32:07
Message-ID: 20101231183207.C27D7AC8AE () svn ! kde ! org
[Download RAW message or body]
SVN commit 1210497 by beschow:
allow base tiles to be displayed and make sure the attributes get properly initialized
M +6 -4 AbstractScanlineTextureMapper.cpp
--- trunk/KDE/kdeedu/marble/src/lib/AbstractScanlineTextureMapper.cpp #1210496:1210497
@@ -58,14 +58,14 @@
// As our tile resolution doubles with each level we calculate
// the tile level from tilesize and the globe radius via log(2)
- qreal linearLevel = ( 2.0 * (qreal)( radius )
+ qreal linearLevel = ( 4.0 * (qreal)( radius )
/ (qreal)( m_tileSize.width() ) );
int tileLevel = 0;
if ( linearLevel < 1.0 )
linearLevel = 1.0; // Dirty fix for invalid entry linearLevel
- qreal tileLevelF = log( linearLevel ) / log( 2.0 ) + 1.0;
+ qreal tileLevelF = log( linearLevel ) / log( 2.0 );
tileLevel = (int)( tileLevelF );
// mDebug() << "tileLevelF: " << tileLevelF << " tileLevel: " << tileLevel;
@@ -73,8 +73,7 @@
if ( tileLevel > m_tileLoader->maximumTileLevel() )
tileLevel = m_tileLoader->maximumTileLevel();
- if ( tileLevel != m_tileLevel ) {
- m_tileLoader->flush();
+ const bool changedTileLevel = tileLevel != m_tileLevel;
// mDebug() << "Texture Level was set to: " << tileLevel;
m_tileLevel = tileLevel;
@@ -95,6 +94,9 @@
m_toTileCoordinatesLon = (qreal)(m_globalWidth / 2 - m_tilePosX);
m_toTileCoordinatesLat = (qreal)(m_globalHeight / 2 - m_tilePosY);
+ if ( changedTileLevel ) {
+ m_tileLoader->flush();
+
emit tileLevelChanged( m_tileLevel );
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic