Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-18 22:26:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use offscreen context for the parts list.

Browse source
This commit is contained in:
Leonardo Zide 2020-12-29 12:23:36 -08:00
parent 1367a5d6f4
commit 6cc91c0f20
5 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
common/lc_partselectionwidget.cpp
View file

@ -387,14 +387,34 @@ void lcPartSelectionListModel::PartLoaded(PieceInfo* Info)
void lcPartSelectionListModel::DrawPreview(int InfoIndex)
{
const int Width = mIconSize * 2;
const int Height = mIconSize * 2;
#ifdef LC_USE_QOPENGLWIDGET
if (mView && (mView->GetWidth() != Width || mView->GetHeight() != Height))
mView.reset();
if (!mView)
{
mView = std::unique_ptr<lcView>(new lcView(lcViewType::PartsList, nullptr));
if (!mView->BeginRenderToImage(Width, Height))
{
mView.reset();
return;
}
}
mView->MakeCurrent();
lcContext* Context = mView->mContext;
#else
lcView* ActiveView = gMainWindow->GetActiveView();
if (!ActiveView)
return;
ActiveView->MakeCurrent();
lcContext* Context = ActiveView->mContext;
int Width = mIconSize * 2;
int Height = mIconSize * 2;
if (mRenderFramebuffer.first.mWidth != Width || mRenderFramebuffer.first.mHeight != Height)
{
@ -405,11 +425,13 @@ void lcPartSelectionListModel::DrawPreview(int InfoIndex)
if (!mRenderFramebuffer.first.IsValid())
return;
float Aspect = (float)Width / (float)Height;
Context->BindFramebuffer(mRenderFramebuffer.first);
#endif
const float Aspect = (float)Width / (float)Height;
Context->SetViewport(0, 0, Width, Height);
Context->SetDefaultState();
Context->BindFramebuffer(mRenderFramebuffer.first);
lcPiecesLibrary* Library = lcGetPiecesLibrary();
PieceInfo* Info = mParts[InfoIndex].first;
@ -434,11 +456,17 @@ void lcPartSelectionListModel::DrawPreview(int InfoIndex)
Scene.Draw(Context);
mParts[InfoIndex].second = QPixmap::fromImage(Context->GetRenderFramebufferImage(mRenderFramebuffer)).scaled(mIconSize, mIconSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
#ifdef LC_USE_QOPENGLWIDGET
QImage Image = mView->GetRenderFramebufferImage().convertToFormat(QImage::Format_ARGB32);
#else
QImage Image = Context->GetRenderFramebufferImage(mRenderFramebuffer);
Context->ClearFramebuffer();
#endif
mParts[InfoIndex].second = QPixmap::fromImage(Image).scaled(mIconSize, mIconSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
Library->ReleasePieceInfo(Info);
Context->ClearFramebuffer();
Context->ClearResources();
#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))

4
common/lc_partselectionwidget.h
View file

@ -136,7 +136,11 @@ protected:
bool mShowDecoratedParts;
bool mShowPartAliases;
QByteArray mFilter;
#ifdef LC_USE_QOPENGLWIDGET
std::unique_ptr<lcView> mView;
#else
std::pair<lcFramebuffer, lcFramebuffer> mRenderFramebuffer;
#endif
};
class lcPartSelectionListView : public QListView

1
common/lc_view.cpp
View file

@ -1093,6 +1093,7 @@ void lcView::DrawAxes() const
break;
case lcViewType::Minifig:
case lcViewType::PartsList:
case lcViewType::Count:
return;
}

1
common/lc_view.h
View file

@ -86,6 +86,7 @@ enum class lcViewType
View,
Preview,
Minifig,
PartsList,
Count
};

1
common/lc_viewsphere.cpp
View file

@ -40,6 +40,7 @@ void lcViewSphere::UpdateSettings()
break;
case lcViewType::Minifig:
case lcViewType::PartsList:
case lcViewType::Count:
break;
}