AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-08 13:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

CModelEditorWindow: Convert old signal/slot to modern style

Browse Source 
Turns out this was attached incorrectly.
This commit is contained in:
Lioncache
2025-12-07 09:43:27 -05:00
parent 2d0d3d03c6
commit 5d3086ec31
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Editor/ModelEditor/CModelEditorWindow.cpp
View File

@@ -118,7 +118,7 @@ CModelEditorWindow::CModelEditorWindow(CModel *pModel, QWidget *pParent)
connect(ui->TevKAlphaSelComboBox, &QComboBox::currentIndexChanged, this, qOverload<int>(&CModelEditorWindow::UpdateMaterial));
connect(ui->TevRasSelComboBox, &QComboBox::currentIndexChanged, this, qOverload<int>(&CModelEditorWindow::UpdateMaterial));
connect(ui->TexCoordSrcComboBox, &QComboBox::currentIndexChanged, this, qOverload<int>(&CModelEditorWindow::UpdateMaterial));
connect(ui->PassTextureResSelector, SIGNAL(ResourceChanged(QString)), this, SLOT(UpdateMaterial(QString)));
connect(ui->PassTextureResSelector, &CResourceSelector::ResourceChanged, this, qOverload<const CResourceEntry*>(&CModelEditorWindow::UpdateMaterial));
connect(ui->TevColor1ComboBox, &QComboBox::currentIndexChanged, this, qOverload<int>(&CModelEditorWindow::UpdateMaterial));
connect(ui->TevColor2ComboBox, &QComboBox::currentIndexChanged, this, qOverload<int>(&CModelEditorWindow::UpdateMaterial));
connect(ui->TevColor3ComboBox, &QComboBox::currentIndexChanged, this, qOverload<int>(&CModelEditorWindow::UpdateMaterial));
@@ -568,17 +568,23 @@ void CModelEditorWindow::UpdateMaterial(const QColor& Color)
}
}
void CModelEditorWindow::UpdateMaterial(const QString& Value)
void CModelEditorWindow::UpdateMaterial(const CResourceEntry* Entry)
{
// This function takes input from WResourceSelectors
if (!mpCurrentMat) return;
if (mIgnoreSignals) return;
if (!mpCurrentMat)
return;
if (mIgnoreSignals)
return;
EModelEditorWidget Widget = (EModelEditorWidget) sender()->property("ModelEditorWidgetType").toInt();
TResPtr<CTexture> pTex = gpResourceStore->LoadResource(TO_TSTRING(Value));
if (pTex->Type() != EResourceType::Texture) pTex = nullptr;
TResPtr<CTexture> pTex;
if (Entry)
{
pTex = gpResourceStore->LoadResource(Entry->ID());
if (pTex->Type() != EResourceType::Texture)
pTex = nullptr;
}
switch (Widget)
switch (static_cast<EModelEditorWidget>(sender()->property("ModelEditorWidgetType").toInt()))
{
case EModelEditorWidget::PassTextureResSelector:
mpCurrentPass->SetTexture(pTex);
@@ -587,7 +593,9 @@ void CModelEditorWindow::UpdateMaterial(const QString& Value)
case EModelEditorWidget::IndTextureResSelector:
mpCurrentMat->SetIndTexture(pTex);
break;
default: break;
default:
break;
}
}
void CModelEditorWindow::UpdateUI(int Value)

2
src/Editor/ModelEditor/CModelEditorWindow.h
View File

@@ -94,7 +94,7 @@ public slots:
void UpdateMaterial(double Value);
void UpdateMaterial(bool Value);
void UpdateMaterial(const QColor& Color);
void UpdateMaterial(const QString& Value);
void UpdateMaterial(const CResourceEntry* Entry);
void UpdateUI(int Value);
void UpdateAnimParamUI(EUVAnimMode Mode);