Skip to content
Snippets Groups Projects
Commit 6d62c1d9 authored by Tobias Pietzsch's avatar Tobias Pietzsch
Browse files

Remove unnecessary null check

ordering can never be null at this point.
parent cdf1ace7
Branches
No related tags found
No related merge requests found
......@@ -724,37 +724,35 @@ public class MultiResolutionRenderer
final SetCacheHints sls = SetCacheHints.class.isInstance( spimSource ) ?
( SetCacheHints ) spimSource : SetCacheHints.empty;
if ( ordering != null )
{
final AffineTransform3D screenTransform = new AffineTransform3D();
viewerState.getViewerTransform( screenTransform );
screenTransform.preConcatenate( screenScaleTransform );
final MipmapHints hints = ordering.getMipmapHints( screenTransform, t, previousTimepoint );
final List< Level > levels = hints.getLevels();
final AffineTransform3D screenTransform = new AffineTransform3D();
viewerState.getViewerTransform( screenTransform );
screenTransform.preConcatenate( screenScaleTransform );
final MipmapHints hints = ordering.getMipmapHints( screenTransform, t, previousTimepoint );
final List< Level > levels = hints.getLevels();
if ( prefetchCells )
if ( prefetchCells )
{
Collections.sort( levels, MipmapOrdering.prefetchOrderComparator );
for ( final Level l : levels )
{
Collections.sort( levels, MipmapOrdering.prefetchOrderComparator );
for ( final Level l : levels )
if ( l.getPrefetchCacheHints() == null || l.getPrefetchCacheHints().getLoadingStrategy() != LoadingStrategy.DONTLOAD )
{
if ( l.getPrefetchCacheHints() == null || l.getPrefetchCacheHints().getLoadingStrategy() != LoadingStrategy.DONTLOAD )
{
sls.setCacheHints( l.getMipmapLevel(), l.getPrefetchCacheHints() );
prefetch( viewerState, spimSource, screenScaleTransform, l.getMipmapLevel(), screenImage );
}
sls.setCacheHints( l.getMipmapLevel(), l.getPrefetchCacheHints() );
prefetch( viewerState, spimSource, screenScaleTransform, l.getMipmapLevel(), screenImage );
}
}
}
Collections.sort( levels, MipmapOrdering.renderOrderComparator );
for ( final Level l : levels )
{
sls.setCacheHints( l.getMipmapLevel(), l.getRenderCacheHints() );
renderList.add( getTransformedSource( viewerState, spimSource, screenScaleTransform, l.getMipmapLevel() ) );
}
if ( hints.renewHintsAfterPaintingOnce() )
newFrameRequest = true;
Collections.sort( levels, MipmapOrdering.renderOrderComparator );
for ( final Level l : levels )
{
sls.setCacheHints( l.getMipmapLevel(), l.getRenderCacheHints() );
renderList.add( getTransformedSource( viewerState, spimSource, screenScaleTransform, l.getMipmapLevel() ) );
}
if ( hints.renewHintsAfterPaintingOnce() )
newFrameRequest = true;
return new VolatileHierarchyProjector<>( renderList, source.getConverter(), screenImage, maskArray, numRenderingThreads, renderingExecutorService );
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment