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

Everything compiling again after moving preview renderer to atom tools framework

Browse Source 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
This commit is contained in:
Guthrie Adams
2021-10-08 04:33:45 -05:00
parent 569318e9e1
commit 76b4dafbb3
20 changed files with 515 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Thumbnails/PreviewerFeatureProcessorProviderBus.h
-33
View File
@@ -1,33 +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/EBus/EBus.h>
#include <AzCore/std/string/string.h>
namespace AZ
{
namespace LyIntegration
{
namespace Thumbnails
{
//! PreviewerFeatureProcessorProviderRequests allows registering custom Feature Processors for preview image generation
//! Duplicates will be ignored
//! You can check minimal feature processors that are already registered in CommonPreviewRenderer.cpp
class PreviewerFeatureProcessorProviderRequests
: public AZ::EBusTraits
{
public:
//! Get a list of custom feature processors to register with preview image renderer
virtual void GetRequiredFeatureProcessors(AZStd::unordered_set<AZStd::string>& featureProcessors) const = 0;
};
using PreviewerFeatureProcessorProviderBus = AZ::EBus<PreviewerFeatureProcessorProviderRequests>;
} // namespace Thumbnails
} // namespace LyIntegration
} // namespace AZ
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/CommonThumbnailPreviewContent.h
+2 -2
View File
@@ -13,7 +13,7 @@
#include <Atom/RPI.Reflect/Material/MaterialAsset.h>
#include <Atom/RPI.Reflect/Model/ModelAsset.h>
#include <Atom/RPI.Reflect/System/AnyAsset.h>
#include <Thumbnails/Rendering/CommonPreviewContent.h>
#include <AtomToolsFramework/PreviewRenderer/PreviewContent.h>
namespace AZ
{
@@ -23,7 +23,7 @@ namespace AZ
{
//! Provides custom rendering of material and model previews
class CommonThumbnailPreviewContent final
: public CommonPreviewContent
: public AtomToolsFramework::PreviewContent
{
public:
AZ_CLASS_ALLOCATOR(CommonThumbnailPreviewContent, AZ::SystemAllocator, 0);
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/CommonThumbnailRenderer.h
+2 -2
View File
@@ -8,10 +8,10 @@
#pragma once
#include <AtomToolsFramework/PreviewRenderer/PreviewRenderer.h>
#include <AzCore/Component/TickBus.h>
#include <AzToolsFramework/Thumbnails/Thumbnail.h>
#include <AzToolsFramework/Thumbnails/ThumbnailerBus.h>
#include <Thumbnails/Rendering/CommonPreviewRenderer.h>
#include <Thumbnails/Thumbnail.h>
namespace AZ
@@ -39,7 +39,7 @@ namespace AZ
//! SystemTickBus::Handler interface overrides...
void OnSystemTick() override;
CommonPreviewRenderer m_previewRenderer;
AtomToolsFramework::PreviewRenderer m_previewRenderer;
};
} // namespace Thumbnails
} // namespace LyIntegration
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Preview/CommonPreviewer.cpp
+4 -4
View File
@@ -14,14 +14,14 @@
#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
#include <AzToolsFramework/Thumbnails/Thumbnail.h>
#include <Source/Thumbnails/Preview/CommonPreviewer.h>
#include <Source/Thumbnails/ThumbnailUtils.h>
#include <Thumbnails/Preview/CommonPreviewer.h>
#include <Thumbnails/ThumbnailUtils.h>
// Disables warning messages triggered by the Qt library
// 4251: class needs to have dll-interface to be used by clients of class
// 4800: forcing value to bool 'true' or 'false' (performance warning)
AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option")
#include <Source/Thumbnails/Preview/ui_CommonPreviewer.h>
#include <Thumbnails/Preview/ui_CommonPreviewer.h>
#include <QString>
#include <QResizeEvent>
AZ_POP_DISABLE_WARNING
@@ -73,4 +73,4 @@ namespace AZ
} // namespace LyIntegration
} // namespace AZ
#include <Source/Thumbnails/Preview/moc_CommonPreviewer.cpp>
#include <Thumbnails/Preview/moc_CommonPreviewer.cpp>
Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_editor_files.cmake
-11
View File
@@ -9,7 +9,6 @@
set(FILES
Include/AtomLyIntegration/CommonFeatures/Material/EditorMaterialSystemComponentRequestBus.h
Include/AtomLyIntegration/CommonFeatures/ReflectionProbe/EditorReflectionProbeBus.h
Include/AtomLyIntegration/CommonFeatures/Thumbnails/PreviewerFeatureProcessorProviderBus.h
Source/Module.cpp
Source/Animation/EditorAttachmentComponent.h
Source/Animation/EditorAttachmentComponent.cpp
@@ -98,16 +97,6 @@ set(FILES
Source/Thumbnails/Preview/CommonPreviewer.ui
Source/Thumbnails/Preview/CommonPreviewerFactory.cpp
Source/Thumbnails/Preview/CommonPreviewerFactory.h
Source/Thumbnails/Rendering/CommonPreviewContent.h
Source/Thumbnails/Rendering/CommonPreviewRenderer.cpp
Source/Thumbnails/Rendering/CommonPreviewRenderer.h
Source/Thumbnails/Rendering/CommonPreviewRendererState.h
Source/Thumbnails/Rendering/CommonPreviewRendererIdleState.cpp
Source/Thumbnails/Rendering/CommonPreviewRendererIdleState.h
Source/Thumbnails/Rendering/CommonPreviewRendererLoadState.cpp
Source/Thumbnails/Rendering/CommonPreviewRendererLoadState.h
Source/Thumbnails/Rendering/CommonPreviewRendererCaptureState.cpp
Source/Thumbnails/Rendering/CommonPreviewRendererCaptureState.h
Source/Thumbnails/CommonThumbnailPreviewContent.cpp
Source/Thumbnails/CommonThumbnailPreviewContent.h
Source/Thumbnails/CommonThumbnailRenderer.cpp