Merge pull request #7613 from aws-lumberyard-dev/Atom/guthadam/centralize_shader_management_console_operations_in_document_class
Atom Tools: Moving shader management console file operations into document classmonroegm-disable-blank-issue-2
Guthrie Adams
4 years ago
committed by
GitHub
commit
ba43efd3d2
@ -1,38 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) Contributors to the Open 3D Engine Project.
|
|
||||||
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <AzCore/std/containers/vector.h>
|
|
||||||
#include <AzCore/EBus/EBus.h>
|
|
||||||
#include <AzCore/Asset/AssetCommon.h>
|
|
||||||
#include <Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h>
|
|
||||||
#include <Atom/RPI.Reflect/Material/ShaderCollection.h>
|
|
||||||
|
|
||||||
namespace ShaderManagementConsole
|
|
||||||
{
|
|
||||||
//! ShaderManagementConsoleRequestBus provides
|
|
||||||
class ShaderManagementConsoleRequests
|
|
||||||
: public AZ::EBusTraits
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
|
|
||||||
static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
|
|
||||||
|
|
||||||
//! Returns a shader file's asset id and relative filepath
|
|
||||||
virtual AZ::Data::AssetInfo GetSourceAssetInfo(const AZStd::string& sourceAssetFileName) = 0;
|
|
||||||
|
|
||||||
// [GFX TODO][ATOM-14857] Generalize this API
|
|
||||||
//! Returns a list of material AssetIds that use the shader file.
|
|
||||||
virtual AZStd::vector<AZ::Data::AssetId> FindMaterialAssetsUsingShader (const AZStd::string& shaderFilePath) = 0;
|
|
||||||
|
|
||||||
//! Returns a list of shader items contained within an instantiated material source's shader collection.
|
|
||||||
virtual AZStd::vector<AZ::RPI::ShaderCollection::Item> GetMaterialInstanceShaderItems(const AZ::Data::AssetId& assetId) = 0;
|
|
||||||
};
|
|
||||||
using ShaderManagementConsoleRequestBus = AZ::EBus<ShaderManagementConsoleRequests>;
|
|
||||||
} // namespace ShaderManagementConsole
|
|
||||||
@ -0,0 +1,106 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <AzCore/Name/Name.h>
|
||||||
|
#include <Document/ShaderManagementConsoleDocumentRequestBus.h>
|
||||||
|
#include <Window/ShaderManagementConsoleTableView.h>
|
||||||
|
|
||||||
|
#include <QHeaderView>
|
||||||
|
|
||||||
|
namespace ShaderManagementConsole
|
||||||
|
{
|
||||||
|
ShaderManagementConsoleTableView::ShaderManagementConsoleTableView(
|
||||||
|
const AZ::Crc32& toolId, const AZ::Uuid& documentId, QWidget* parent)
|
||||||
|
: QTableView(parent)
|
||||||
|
, m_toolId(toolId)
|
||||||
|
, m_documentId(documentId)
|
||||||
|
, m_model(new QStandardItemModel(this))
|
||||||
|
{
|
||||||
|
setSelectionBehavior(QAbstractItemView::SelectRows);
|
||||||
|
setModel(m_model);
|
||||||
|
|
||||||
|
RebuildTable();
|
||||||
|
AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler::BusConnect(m_toolId);
|
||||||
|
}
|
||||||
|
|
||||||
|
ShaderManagementConsoleTableView::~ShaderManagementConsoleTableView()
|
||||||
|
{
|
||||||
|
AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler::BusDisconnect();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShaderManagementConsoleTableView::OnDocumentOpened(const AZ::Uuid& documentId)
|
||||||
|
{
|
||||||
|
if (m_documentId == documentId)
|
||||||
|
{
|
||||||
|
RebuildTable();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShaderManagementConsoleTableView::OnDocumentModified(const AZ::Uuid& documentId)
|
||||||
|
{
|
||||||
|
if (m_documentId == documentId)
|
||||||
|
{
|
||||||
|
RebuildTable();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShaderManagementConsole::ShaderManagementConsoleTableView::RebuildTable()
|
||||||
|
{
|
||||||
|
AZStd::unordered_set<AZStd::string> optionNames;
|
||||||
|
|
||||||
|
size_t shaderOptionCount = 0;
|
||||||
|
ShaderManagementConsoleDocumentRequestBus::EventResult(
|
||||||
|
shaderOptionCount, m_documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderOptionCount);
|
||||||
|
|
||||||
|
for (size_t optionIndex = 0; optionIndex < shaderOptionCount; ++optionIndex)
|
||||||
|
{
|
||||||
|
AZ::RPI::ShaderOptionDescriptor shaderOptionDesc;
|
||||||
|
ShaderManagementConsoleDocumentRequestBus::EventResult(
|
||||||
|
shaderOptionDesc, m_documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderOptionDescriptor, optionIndex);
|
||||||
|
optionNames.insert(shaderOptionDesc.GetName().GetCStr());
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t shaderVariantCount = 0;
|
||||||
|
ShaderManagementConsoleDocumentRequestBus::EventResult(
|
||||||
|
shaderVariantCount, m_documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderVariantCount);
|
||||||
|
|
||||||
|
m_model->clear();
|
||||||
|
m_model->setRowCount(static_cast<int>(shaderVariantCount));
|
||||||
|
m_model->setColumnCount(static_cast<int>(optionNames.size()));
|
||||||
|
|
||||||
|
int nameIndex = 0;
|
||||||
|
for (const auto& optionName : optionNames)
|
||||||
|
{
|
||||||
|
m_model->setHeaderData(nameIndex++, Qt::Horizontal, optionName.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int variantIndex = 0; variantIndex < shaderVariantCount; ++variantIndex)
|
||||||
|
{
|
||||||
|
AZ::RPI::ShaderVariantListSourceData::VariantInfo shaderVariantInfo;
|
||||||
|
ShaderManagementConsoleDocumentRequestBus::EventResult(
|
||||||
|
shaderVariantInfo, m_documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderVariantInfo, variantIndex);
|
||||||
|
|
||||||
|
m_model->setHeaderData(variantIndex, Qt::Vertical, QString::number(variantIndex));
|
||||||
|
|
||||||
|
for (const auto& shaderOption : shaderVariantInfo.m_options)
|
||||||
|
{
|
||||||
|
AZ::Name optionName{ shaderOption.first };
|
||||||
|
AZ::Name optionValue{ shaderOption.second };
|
||||||
|
|
||||||
|
auto optionIt = optionNames.find(optionName.GetCStr());
|
||||||
|
int optionIndex = static_cast<int>(AZStd::distance(optionNames.begin(), optionIt));
|
||||||
|
|
||||||
|
QStandardItem* item = new QStandardItem(optionValue.GetCStr());
|
||||||
|
m_model->setItem(variantIndex, optionIndex, item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} // namespace ShaderManagementConsole
|
||||||
|
|
||||||
|
#include <Window/moc_ShaderManagementConsoleTableView.cpp>
|
||||||
|
#include "ShaderManagementConsoleTableView.h"
|
||||||
@ -0,0 +1,40 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#if !defined(Q_MOC_RUN)
|
||||||
|
#include <AtomToolsFramework/Document/AtomToolsDocumentNotificationBus.h>
|
||||||
|
|
||||||
|
#include <QStandardItemModel>
|
||||||
|
#include <QTableView>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace ShaderManagementConsole
|
||||||
|
{
|
||||||
|
class ShaderManagementConsoleTableView
|
||||||
|
: public QTableView
|
||||||
|
, public AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
AZ_CLASS_ALLOCATOR(ShaderManagementConsoleTableView, AZ::SystemAllocator, 0);
|
||||||
|
ShaderManagementConsoleTableView(const AZ::Crc32& toolId, const AZ::Uuid& documentId, QWidget* parent);
|
||||||
|
~ShaderManagementConsoleTableView();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
// AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler overrides...
|
||||||
|
void OnDocumentOpened(const AZ::Uuid& documentId) override;
|
||||||
|
void OnDocumentModified(const AZ::Uuid& documentId) override;
|
||||||
|
|
||||||
|
void RebuildTable();
|
||||||
|
|
||||||
|
const AZ::Crc32 m_toolId = {};
|
||||||
|
const AZ::Uuid m_documentId = AZ::Uuid::CreateNull();
|
||||||
|
QStandardItemModel* m_model = {};
|
||||||
|
};
|
||||||
|
} // namespace ShaderManagementConsole
|
||||||
Loading…
Reference in New Issue