birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding tone mapping option to Material Editor

Browse Source
This commit is contained in:
mnaumov
2021-04-29 16:51:32 -07:00
parent f1c5d4c801
commit 3ae4bb22df
11 changed files with 134 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp
+62 -12
View File
@@ -38,7 +38,7 @@ namespace MaterialEditor
m_toggleGrid->setCheckable(true);
connect(m_toggleGrid, &QAction::triggered, [this]() {
MaterialViewportRequestBus::Broadcast(&MaterialViewportRequestBus::Events::SetGridEnabled, m_toggleGrid->isChecked());
});
});
bool enableGrid = false;
MaterialViewportRequestBus::BroadcastResult(enableGrid, &MaterialViewportRequestBus::Events::GetGridEnabled);
m_toggleGrid->setChecked(enableGrid);
@@ -49,7 +49,7 @@ namespace MaterialEditor
connect(m_toggleShadowCatcher, &QAction::triggered, [this]() {
MaterialViewportRequestBus::Broadcast(
&MaterialViewportRequestBus::Events::SetShadowCatcherEnabled, m_toggleShadowCatcher->isChecked());
});
});
bool enableShadowCatcher = false;
MaterialViewportRequestBus::BroadcastResult(enableShadowCatcher, &MaterialViewportRequestBus::Events::GetShadowCatcherEnabled);
m_toggleShadowCatcher->setChecked(enableShadowCatcher);
@@ -58,22 +58,44 @@ namespace MaterialEditor
//[GFX TODO][ATOM-3992]
QToolButton* toneMappingButton = new QToolButton(this);
QMenu* toneMappingMenu = new QMenu(toneMappingButton);
toneMappingMenu->addAction("None", [this]() {
MaterialEditorSettingsRequestBus::Broadcast(&MaterialEditorSettingsRequests::SetStringProperty, "toneMapping", "None");
});
toneMappingMenu->addAction("Gamma2.2", [this]() {
MaterialEditorSettingsRequestBus::Broadcast(&MaterialEditorSettingsRequests::SetStringProperty, "toneMapping", "Gamma2.2");
});
toneMappingMenu->addAction("ACES", [this]() {
MaterialEditorSettingsRequestBus::Broadcast(&MaterialEditorSettingsRequests::SetStringProperty, "toneMapping", "ACES");
});
m_aces = toneMappingMenu->addAction("Aces", [this]() {
MaterialViewportRequestBus::Broadcast(
&MaterialViewportRequestBus::Events::SetDisplayMapperOperationType,
AZ::Render::DisplayMapperOperationType::Aces);
});
m_aces->setCheckable(true);
m_aces->setChecked(true);
m_acesLut = toneMappingMenu->addAction("AcesLut", [this]() {
MaterialViewportRequestBus::Broadcast(
&MaterialViewportRequestBus::Events::SetDisplayMapperOperationType,
AZ::Render::DisplayMapperOperationType::AcesLut);
});
m_acesLut->setCheckable(true);
m_passthrough = toneMappingMenu->addAction("Passthrough", [this]() {
MaterialViewportRequestBus::Broadcast(
&MaterialViewportRequestBus::Events::SetDisplayMapperOperationType,
AZ::Render::DisplayMapperOperationType::Passthrough);
});
m_passthrough->setCheckable(true);
m_gammaSRGB = toneMappingMenu->addAction("GammaSRGB", [this]() {
MaterialViewportRequestBus::Broadcast(
&MaterialViewportRequestBus::Events::SetDisplayMapperOperationType,
AZ::Render::DisplayMapperOperationType::GammaSRGB);
});
m_gammaSRGB->setCheckable(true);
m_reinhard = toneMappingMenu->addAction("Reinhard", [this]() {
MaterialViewportRequestBus::Broadcast(
&MaterialViewportRequestBus::Events::SetDisplayMapperOperationType,
AZ::Render::DisplayMapperOperationType::Reinhard);
});
m_reinhard->setCheckable(true);
toneMappingButton->setMenu(toneMappingMenu);
toneMappingButton->setText("Tone Mapping");
toneMappingButton->setIcon(QIcon(":/Icons/toneMapping.svg"));
toneMappingButton->setPopupMode(QToolButton::InstantPopup);
// hiding button until DisplayMapper supports changing settings at run time
toneMappingButton->setVisible(false);
toneMappingButton->setVisible(true);
addWidget(toneMappingButton);
// Add model combo box
@@ -99,6 +121,34 @@ namespace MaterialEditor
m_toggleGrid->setChecked(enable);
}
void MaterialEditorToolBar::OnDisplayMapperOperationTypeChanged(AZ::Render::DisplayMapperOperationType operationType)
{
m_aces->setChecked(false);
m_acesLut->setChecked(false);
m_passthrough->setChecked(false);
m_gammaSRGB->setChecked(false);
m_reinhard->setChecked(false);
switch (operationType)
{
case AZ::Render::DisplayMapperOperationType::Aces:
m_aces->setChecked(true);
break;
case AZ::Render::DisplayMapperOperationType::AcesLut:
m_acesLut->setChecked(true);
break;
case AZ::Render::DisplayMapperOperationType::Passthrough:
m_passthrough->setChecked(true);
break;
case AZ::Render::DisplayMapperOperationType::GammaSRGB:
m_gammaSRGB->setChecked(true);
break;
case AZ::Render::DisplayMapperOperationType::Reinhard:
m_reinhard->setChecked(true);
break;
}
}
void MaterialEditorToolBar::OnShadowCatcherEnabledChanged(bool enable)
{
m_toggleShadowCatcher->setChecked(enable);
Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h
+7
View File
@@ -33,8 +33,15 @@ namespace MaterialEditor
// MaterialViewportNotificationBus::Handler overrides...
void OnShadowCatcherEnabledChanged([[maybe_unused]] bool enable) override;
void OnGridEnabledChanged([[maybe_unused]] bool enable) override;
void OnDisplayMapperOperationTypeChanged(AZ::Render::DisplayMapperOperationType operationType) override;
QAction* m_toggleGrid = {};
QAction* m_toggleShadowCatcher = {};
QAction* m_aces = {};
QAction* m_acesLut = {};
QAction* m_passthrough = {};
QAction* m_gammaSRGB = {};
QAction* m_reinhard = {};
};
} // namespace MaterialEditor