Integrating latest from github/staging

Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
+6 -3
View File
@@ -41,7 +41,6 @@ ly_add_target(
ly_add_target(
NAME RenderToTexture ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME Gem.RenderToTexture.b895c3bc4f894c1ebb9562a3577248f9.v0.1.0
FILES_CMAKE
rendertotexture_shared_files.cmake
PLATFORM_INCLUDE_FILES
@@ -54,6 +53,8 @@ ly_add_target(
BUILD_DEPENDENCIES
PRIVATE
Gem::RenderToTexture.Static
RUNTIME_DEPENDENCIES
Gem::LmbrCentral
)
if(PAL_TRAIT_BUILD_HOST_TOOLS)
@@ -83,9 +84,9 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
)
ly_add_target(
NAME RenderToTexture.Editor MODULE
NAME RenderToTexture.Editor GEM_MODULE
NAMESPACE Gem
OUTPUT_NAME Gem.RenderToTexture.Editor.b895c3bc4f894c1ebb9562a3577248f9.v0.1.0
FILES_CMAKE
rendertotexture_shared_files.cmake
PLATFORM_INCLUDE_FILES
@@ -98,6 +99,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
BUILD_DEPENDENCIES
PRIVATE
Gem::RenderToTexture.Editor.Static
RUNTIME_DEPENDENCIES
Gem::LmbrCentral.Editor
)
endif()
@@ -230,7 +230,7 @@ namespace RenderToTexture
return AZ::TICK_LAST;
}
void EditorRenderToTextureComponent::OnTick(float deltaTime, AZ::ScriptTimePoint time)
void EditorRenderToTextureComponent::OnTick([[maybe_unused]] float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
{
// we can do this in the editor because it is single threaded
Render(m_renderTargetHandle, m_config, GetEntityId());
@@ -190,7 +190,7 @@ namespace RenderToTexture
return AZ::TICK_LAST;
}
void RenderToTextureComponent::OnTick(float deltaTime, AZ::ScriptTimePoint time)
void RenderToTextureComponent::OnTick([[maybe_unused]] float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
{
// push the changes from the component's RenderContextConfig to our RenderContext
// do this here before we render so we avoid threading issues.