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

Fixed edge around parts list images.

Browse source
This commit is contained in:
Leonardo Zide 2021-01-08 15:11:02 -08:00
parent 6b6f7d60b1
commit 601eb56322
6 changed files with 35 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/lc_model.cpp
View file

@ -4425,6 +4425,18 @@ void lcModel::SetMinifig(const lcMinifig& Minifig)
SetSelectionAndFocus(Pieces, nullptr, 0, false);
}
void lcModel::SetPreviewPieceInfo(PieceInfo* Info, int ColorIndex)
{
DeleteModel();
lcPiece* Piece = new lcPiece(Info);
Piece->Initialize(lcMatrix44Identity(), 1);
Piece->SetColorIndex(ColorIndex);
AddPiece(Piece);
Piece->UpdatePosition(1);
}
void lcModel::UpdateInterface()
{
if (!gMainWindow)

5
common/lc_model.h
View file

@ -226,10 +226,7 @@ public:
}
void SetMinifig(const lcMinifig& Minifig);
void SetPreviewPiece(lcPiece* Piece)
{
AddPiece(Piece);
}
void SetPreviewPieceInfo(PieceInfo* Info, int ColorIndex);
void Cut();
void Copy();

47
common/lc_partselectionwidget.cpp
View file

@ -8,11 +8,10 @@
#include "lc_model.h"
#include "project.h"
#include "pieceinf.h"
#include "camera.h"
#include "lc_scene.h"
#include "lc_view.h"
#include "lc_glextensions.h"
#include "lc_viewwidget.h"
#include "lc_previewwidget.h"
#include "lc_category.h"
Q_DECLARE_METATYPE(QList<int>)
@ -67,6 +66,9 @@ lcPartSelectionListModel::lcPartSelectionListModel(QObject* Parent)
lcPartSelectionListModel::~lcPartSelectionListModel()
{
ClearRequests();
mView.reset();
mModel.reset();
}
void lcPartSelectionListModel::ClearRequests()
@ -395,10 +397,13 @@ void lcPartSelectionListModel::DrawPreview(int InfoIndex)
if (!mView)
{
mView = std::unique_ptr<lcView>(new lcView(lcViewType::PartsList, nullptr));
if (!mModel)
mModel = std::unique_ptr<lcModel>(new lcModel(QString(), nullptr, true));
mView = std::unique_ptr<lcView>(new lcView(lcViewType::PartsList, mModel.get()));
mView->SetOffscreenContext();
mView->MakeCurrent();
mView->SetSize(Width, Height);
if (!mView->BeginRenderToImage(Width, Height))
{
@ -410,34 +415,20 @@ void lcPartSelectionListModel::DrawPreview(int InfoIndex)
mView->MakeCurrent();
mView->BindRenderFramebuffer();
lcContext* Context = mView->mContext;
const uint BackgroundColor = mListView->palette().color(QPalette::Base).rgba();
mView->SetBackgroundColorOverride(LC_RGBA(qRed(BackgroundColor), qGreen(BackgroundColor), qBlue(BackgroundColor), 0));
const float Aspect = (float)Width / (float)Height;
Context->SetViewport(0, 0, Width, Height);
Context->SetDefaultState();
lcPiecesLibrary* Library = lcGetPiecesLibrary();
PieceInfo* Info = mParts[InfoIndex].first;
mModel->SetPreviewPieceInfo(Info, mColorIndex);
Context->ClearColorAndDepth(lcVector4(1.0f, 1.0f, 1.0f, 0.0f));
const lcVector3 Center = (Info->GetBoundingBox().Min + Info->GetBoundingBox().Max) / 2.0f;
const lcVector3 Position = Center + lcVector3(100.0f, -100.0f, 75.0f);
lcMatrix44 ProjectionMatrix, ViewMatrix;
mView->GetCamera()->SetViewpoint(Position, Center, lcVector3(0, 0, 1));
mView->GetCamera()->m_fovy = 20.0f;
mView->ZoomExtents();
Info->ZoomExtents(20.0f, Aspect, ProjectionMatrix, ViewMatrix);
Context->SetProjectionMatrix(ProjectionMatrix);
lcScene Scene;
Scene.SetAllowWireframe(false);
Scene.SetAllowLOD(false);
Scene.Begin(ViewMatrix);
Info->AddRenderMeshes(&Scene, lcMatrix44Identity(), mColorIndex, lcRenderMeshState::Default, false);
Scene.End();
Scene.Draw(Context);
mView->OnDraw();
mView->UnbindRenderFramebuffer();
@ -445,9 +436,7 @@ void lcPartSelectionListModel::DrawPreview(int InfoIndex)
mParts[InfoIndex].second = QPixmap::fromImage(Image).scaled(mIconSize, mIconSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
Library->ReleasePieceInfo(Info);
Context->ClearResources();
lcGetPiecesLibrary()->ReleasePieceInfo(Info);
emit dataChanged(index(InfoIndex, 0), index(InfoIndex, 0), QVector<int>() << Qt::DecorationRole);
}

1
common/lc_partselectionwidget.h
View file

@ -137,6 +137,7 @@ protected:
bool mShowPartAliases;
QByteArray mFilter;
std::unique_ptr<lcView> mView;
std::unique_ptr<lcModel> mModel;
};
class lcPartSelectionListView : public QListView

9
common/lc_previewwidget.cpp
View file

@ -115,14 +115,9 @@ bool lcPreview::SetCurrentPiece(const QString& PartType, int ColorCode)
Library->LoadPieceInfo(Info, false, true);
Library->WaitForLoadQueue();
lcStep CurrentStep = 1;
lcPiece* Piece = new lcPiece(nullptr);
mModel->SetPreviewPieceInfo(Info, lcGetColorIndex(ColorCode));
Piece->SetPieceInfo(Info, PartType, false);
Piece->Initialize(lcMatrix44Identity(), CurrentStep);
Piece->SetColorCode(ColorCode);
mModel->SetPreviewPiece(Piece);
Library->ReleasePieceInfo(Info);
}
else
{

1
common/lc_view.cpp
View file

@ -835,6 +835,7 @@ void lcView::OnDraw()
const bool DrawOverlays = mWidget != nullptr;
const bool DrawInterface = mWidget != nullptr && mViewType == lcViewType::View;
mScene->SetAllowWireframe(mWidget != nullptr);
mScene->SetAllowLOD(Preferences.mAllowLOD && mWidget != nullptr);
mScene->SetLODDistance(Preferences.mMeshLODDistance);