Skip to content

Remove superfluous std::sort from atlas generation #64435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nyalldawson merged 3 commits into from
Jan 7, 2026
Merged

Remove superfluous std::sort from atlas generation #64435

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c32fd95
Remove superfluous std::sort
geneotech Jan 4, 2026
9bf9046
Remove superfluous member: QgsTextureRect::id
geneotech Jan 7, 2026
421bca6
Remove unused variable: index = 0
geneotech Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions src/3d/qgstextureatlasgenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@
class QgsTextureRect
{
public:
QgsTextureRect( const rectpack2D::rect_xywh &rect, int id, const QImage &image = QImage() )
QgsTextureRect( const rectpack2D::rect_xywh &rect, const QImage &image = QImage() )
: rect( rect )
, id( id )
, image( image )
{
}
Expand All @@ -50,7 +49,6 @@ class QgsTextureRect
}

rectpack2D::rect_xywh rect;
int id = 0;
QImage image;
};

Expand Down Expand Up @@ -127,10 +125,9 @@ QgsTextureAtlas QgsTextureAtlasGenerator::createFromRects( const QVector<QRect>
{
std::vector< QgsTextureRect > rects;
rects.reserve( rectangles.size() );
int index = 0;
for ( const QRect &rect : rectangles )
{
rects.emplace_back( QgsTextureRect( rectpack2D::rect_xywh( 0, 0, rect.width(), rect.height() ), index++ ) );
rects.emplace_back( QgsTextureRect( rectpack2D::rect_xywh( 0, 0, rect.width(), rect.height() ) ) );
}
return generateAtlas( std::move( rects ), maxSide );
}
Expand All @@ -139,10 +136,9 @@ QgsTextureAtlas QgsTextureAtlasGenerator::createFromImages( const QVector<QImage
{
std::vector< QgsTextureRect > rects;
rects.reserve( images.size() );
int index = 0;
for ( const QImage &image : images )
{
rects.emplace_back( QgsTextureRect( rectpack2D::rect_xywh( 0, 0, image.width(), image.height() ), index++, image ) );
rects.emplace_back( QgsTextureRect( rectpack2D::rect_xywh( 0, 0, image.width(), image.height() ), image ) );
}
return generateAtlas( std::move( rects ), maxSide );
}
Expand Down Expand Up @@ -182,12 +178,6 @@ QgsTextureAtlas QgsTextureAtlasGenerator::generateAtlas( std::vector< QgsTexture
if ( !result )
return QgsTextureAtlas();

// rectpack2D::find_best_packing will have rearranged rects. Sort it back to the original order
// so that we can retrieve the results by their original indices.
std::sort( rects.begin(), rects.end(), []( const QgsTextureRect &a, const QgsTextureRect &b ) {
return a.id < b.id;
} );

QgsTextureAtlas res;
res.mRects = std::move( rects );
res.mAtlasSize = QSize( resultSize.w, resultSize.h );
Expand Down