Differential D2282 Diff 5489 src/lib/marble/layers/TextureLayer.cpp

Changeset View

Standalone View

View Options

src/lib/marble/layers/TextureLayer.cpp

Show First 20 Lines • Show All 258 Lines • ▼ Show 20 Line(s)
259TextureLayer::~TextureLayer() 259​TextureLayer::~TextureLayer()
260{ 260​{
261 qDeleteAll(d->m_customTextures); 261​ qDeleteAll(d->m_customTextures);
262 delete d->m_texmapper; 262​ delete d->m_texmapper;
263 delete d->m_texcolorizer; 263​ delete d->m_texcolorizer;
264 delete d; 264​ delete d;
265} 265​}
266 266​
267QStringList TextureLayer::renderPosition() const 267​RenderPositions TextureLayer::renderPositions() const
268{ 268​{
269 return QStringList() << "SURFACE"; 269​ return SurfaceRenderPosition;
270} 270​}
271 271​
272void TextureLayer::addSeaDocument( const GeoDataDocument *seaDocument ) 272​void TextureLayer::addSeaDocument( const GeoDataDocument *seaDocument )
273{ 273​{
274 if( d->m_texcolorizer ) { 274​ if( d->m_texcolorizer ) {
275 d->m_texcolorizer->addSeaDocument( seaDocument ); 275​ d->m_texcolorizer->addSeaDocument( seaDocument );
276 reset(); 276​ reset();
277 } 277​ }
Show All 17 Lines294{
295 return d->m_layerDecorator.showSunShading(); 295​ return d->m_layerDecorator.showSunShading();
296} 296​}
297 297​
298bool TextureLayer::showCityLights() const 298​bool TextureLayer::showCityLights() const
299{ 299​{
300 return d->m_layerDecorator.showCityLights(); 300​ return d->m_layerDecorator.showCityLights();
301} 301​}
302 302​
303bool TextureLayer::render( GeoPainter *painter, ViewportParams *viewport, 303​bool TextureLayer::render(GeoPainter *painter, ViewportParams *viewport,
304 const QString &renderPos, GeoSceneLayer *layer ) 304​ RenderPosition renderPos, GeoSceneLayer *layer)
305{ 305​{
306 Q_UNUSED( renderPos ); 306​ Q_UNUSED( renderPos );
307 Q_UNUSED( layer ); 307​ Q_UNUSED( layer );
308 d->m_renderState = RenderState( "Texture Tiles" ); 308​ d->m_renderState = RenderState( "Texture Tiles" );
309 309​
310 // Stop repaint timer if it is already running 310​ // Stop repaint timer if it is already running
311 d->m_repaintTimer.stop(); 311​ d->m_repaintTimer.stop();
312 312​
▲ Show 20 Lines • Show All 278 Lines • Show Last 20 Lines