Everything compiling again after moving preview renderer to atom tools framework
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
This commit is contained in:
+2
-2
@@ -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);
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
+4
-4
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user