Compile again after renaming and moving files

Cleaned up namespaces
Renamed a couple of functions and added comments

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
This commit is contained in:
Guthrie Adams
2021-10-10 01:45:13 -05:00
parent 3ee45d54bb
commit 9f92bd2d33
23 changed files with 295 additions and 305 deletions
@@ -24,6 +24,6 @@ namespace AtomToolsFramework
virtual bool IsReady() const = 0;
virtual bool IsError() const = 0;
virtual void ReportErrors() = 0;
virtual void UpdateScene() = 0;
virtual void Update() = 0;
};
} // namespace AtomToolsFramework
@@ -24,7 +24,7 @@ class QPixmap;
namespace AtomToolsFramework
{
//! Provides custom rendering of preview images
//! Processes requests for setting up content that gets rendered to a texture and captured to an image
class PreviewRenderer final : public PreviewerFeatureProcessorProviderBus::Handler
{
public:
@@ -58,15 +58,15 @@ namespace AtomToolsFramework
void SetState(State state);
State GetState() const;
void SelectCaptureRequest();
void ProcessCaptureRequests();
void CancelCaptureRequest();
void CompleteCaptureRequest();
void LoadAssets();
void UpdateLoadAssets();
void CancelLoadAssets();
void LoadContent();
void UpdateLoadContent();
void CancelLoadContent();
void UpdateScene();
void PoseContent();
bool StartCapture();
void EndCapture();
@@ -142,7 +142,7 @@ namespace AtomToolsFramework
return m_currentState;
}
void PreviewRenderer::SelectCaptureRequest()
void PreviewRenderer::ProcessCaptureRequests()
{
if (!m_captureRequestQueue.empty())
{
@@ -165,12 +165,12 @@ namespace AtomToolsFramework
SetState(PreviewRenderer::State::IdleState);
}
void PreviewRenderer::LoadAssets()
void PreviewRenderer::LoadContent()
{
m_currentCaptureRequest.m_content->Load();
}
void PreviewRenderer::UpdateLoadAssets()
void PreviewRenderer::UpdateLoadContent()
{
if (m_currentCaptureRequest.m_content->IsReady())
{
@@ -180,20 +180,20 @@ namespace AtomToolsFramework
if (m_currentCaptureRequest.m_content->IsError())
{
CancelLoadAssets();
CancelLoadContent();
return;
}
}
void PreviewRenderer::CancelLoadAssets()
void PreviewRenderer::CancelLoadContent()
{
m_currentCaptureRequest.m_content->ReportErrors();
CancelCaptureRequest();
}
void PreviewRenderer::UpdateScene()
void PreviewRenderer::PoseContent()
{
m_currentCaptureRequest.m_content->UpdateScene();
m_currentCaptureRequest.m_content->Update();
}
bool PreviewRenderer::StartCapture()
@@ -19,7 +19,7 @@ namespace AtomToolsFramework
void PreviewRendererCaptureState::Start()
{
m_ticksToCapture = 1;
m_renderer->UpdateScene();
m_renderer->PoseContent();
AZ::TickBus::Handler::BusConnect();
}
@@ -28,6 +28,6 @@ namespace AtomToolsFramework
void PreviewRendererIdleState::OnTick([[maybe_unused]] float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
{
m_renderer->SelectCaptureRequest();
m_renderer->ProcessCaptureRequests();
}
} // namespace AtomToolsFramework
@@ -18,7 +18,7 @@ namespace AtomToolsFramework
void PreviewRendererLoadState::Start()
{
m_renderer->LoadAssets();
m_renderer->LoadContent();
m_timeRemainingS = TimeOutS;
AZ::TickBus::Handler::BusConnect();
}
@@ -33,11 +33,11 @@ namespace AtomToolsFramework
m_timeRemainingS -= deltaTime;
if (m_timeRemainingS > 0.0f)
{
m_renderer->UpdateLoadAssets();
m_renderer->UpdateLoadContent();
}
else
{
m_renderer->CancelLoadAssets();
m_renderer->CancelLoadContent();
}
}
} // namespace AtomToolsFramework