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

Gems/Atom*

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-10 20:16:11 -07:00
parent 7755c39d09
commit a7780b6dbe
21 changed files with 63 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.h
+1 -1
View File
@@ -47,7 +47,7 @@ namespace ImageProcessingAtomEditor
protected:
////////////////////////////////////////////////////////////////////////
//EditorInternalNotificationBus
void OnEditorSettingsChanged(bool needRefresh, const AZStd::string& platform);
void OnEditorSettingsChanged(bool needRefresh, const AZStd::string& platform) override;
////////////////////////////////////////////////////////////////////////
private:
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.h
+1 -1
View File
@@ -70,7 +70,7 @@ namespace ImageProcessingAtomEditor
protected:
////////////////////////////////////////////////////////////////////////
//EditorInternalNotificationBus
void OnEditorSettingsChanged(bool needRefresh, const AZStd::string& platform);
void OnEditorSettingsChanged(bool needRefresh, const AZStd::string& platform) override;
////////////////////////////////////////////////////////////////////////
void resizeEvent(QResizeEvent* event) override;
bool eventFilter(QObject* obj, QEvent* event) override;
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.h
+1 -1
View File
@@ -52,7 +52,7 @@ namespace ImageProcessingAtomEditor
////////////////////////////////////////////////////////////////////////
//EditorInternalNotificationBus
void OnEditorSettingsChanged(bool needRefresh, const AZStd::string& platform);
void OnEditorSettingsChanged(bool needRefresh, const AZStd::string& platform) override;
////////////////////////////////////////////////////////////////////////
bool event(QEvent* event) override;
Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/StartParamFunctionsOverrideImpl.inl
+19
View File
@@ -0,0 +1,19 @@
/*
* 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
*
*/
// Auto-generates override function declarations for getters and setters of specified parameters and overrides
#define AZ_GFX_COMMON_PARAM(ValueType, Name, MemberName, DefaultValue) \
ValueType Get##Name() const override { return MemberName; } \
void Set##Name(ValueType val) override { MemberName = val; } \
#define AZ_GFX_COMMON_OVERRIDE(ValueType, Name, MemberName, OverrideValueType) \
OverrideValueType Get##Name##Override() const override { return MemberName##Override; } \
void Set##Name##Override(OverrideValueType val) override { MemberName##Override = val; } \
#include <Atom/Feature/ParamMacros/MapAllCommon.inl>
Gems/Atom/Feature/Common/Code/Source/Checkerboard/CheckerboardPass.h
+1 -1
View File
@@ -35,7 +35,7 @@ namespace AZ
protected:
// Pass overrides...
void FrameBeginInternal(FramePrepareParams params);
void FrameBeginInternal(FramePrepareParams params) override;
void BuildInternal() override;
void FrameEndInternal() override;
Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.h
+1 -1
View File
@@ -77,7 +77,7 @@ namespace AZ
void RenderImguiDrawData(const ImDrawData& drawData);
// TickBus::Handler overrides...
void OnTick(float deltaTime, AZ::ScriptTimePoint timePoint);
void OnTick(float deltaTime, AZ::ScriptTimePoint timePoint) override;
// AzFramework::InputTextEventListener overrides...
bool OnInputTextEventFiltered(const AZStd::string& textUTF8) override;
Gems/Atom/Feature/Common/Code/Source/PostProcess/Bloom/BloomSettings.h
+1 -1
View File
@@ -47,7 +47,7 @@ namespace AZ
void ApplySettingsTo(BloomSettings* target, float alpha) const;
// Generate getters and setters.
#include <Atom/Feature/ParamMacros/StartParamFunctions.inl>
#include <Atom/Feature/ParamMacros/StartParamFunctionsOverrideImpl.inl>
#include <Atom/Feature/PostProcess/Bloom/BloomParams.inl>
#include <Atom/Feature/ParamMacros/EndParams.inl>
Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessSettings.h
+1 -1
View File
@@ -52,7 +52,7 @@ namespace AZ
#undef POST_PROCESS_MEMBER
// Auto-gen getter and setter functions for post process members...
#include <Atom/Feature/ParamMacros/StartParamFunctions.inl>
#include <Atom/Feature/ParamMacros/StartParamFunctionsOverrideImpl.inl>
#include <Atom/Feature/PostProcess/PostProcessParams.inl>
#include <Atom/Feature/ParamMacros/EndParams.inl>
Gems/Atom/Feature/Common/Code/Source/PostProcess/Ssao/SsaoSettings.h
+1 -1
View File
@@ -47,7 +47,7 @@ namespace AZ
void ApplySettingsTo(SsaoSettings* target, float alpha) const;
// Generate getters and setters.
#include <Atom/Feature/ParamMacros/StartParamFunctions.inl>
#include <Atom/Feature/ParamMacros/StartParamFunctionsOverrideImpl.inl>
#include <Atom/Feature/PostProcess/Ssao/SsaoParams.inl>
#include <Atom/Feature/ParamMacros/EndParams.inl>
Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogSettings.h
+9 -9
View File
@@ -56,7 +56,7 @@ namespace AZ
~DeferredFogSettings() = default;
// DeferredFogSettingsInterface overrides...
void OnSettingsChanged();
void OnSettingsChanged() override;
bool GetSettingsNeedUpdate()
{
return m_needUpdate;
@@ -66,35 +66,35 @@ namespace AZ
m_needUpdate = needUpdate;
}
void SetEnabled(bool value);
virtual bool GetEnabled() const override
void SetEnabled(bool value) override;
bool GetEnabled() const override
{
return m_enabled;
}
virtual void SetInitialized(bool isInitialized) override
void SetInitialized(bool isInitialized) override
{
m_isInitialized = isInitialized;
}
virtual bool IsInitialized() override
bool IsInitialized() override
{
return m_isInitialized;
}
virtual void SetUseNoiseTextureShaderOption(bool value) override
void SetUseNoiseTextureShaderOption(bool value) override
{
m_useNoiseTextureShaderOption = value;
}
virtual bool GetUseNoiseTextureShaderOption() override
bool GetUseNoiseTextureShaderOption() override
{
return m_useNoiseTextureShaderOption;
}
virtual void SetEnableFogLayerShaderOption(bool value) override
void SetEnableFogLayerShaderOption(bool value) override
{
m_enableFogLayerShaderOption = value;
}
virtual bool GetEnableFogLayerShaderOption() override
bool GetEnableFogLayerShaderOption() override
{
return m_enableFogLayerShaderOption;
}
Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.h
+1 -1
View File
@@ -48,7 +48,7 @@ namespace AZ::Render
void SetFieldOfViewY(ShadowId id, float fieldOfViewYRadians) override;
void SetShadowmapMaxResolution(ShadowId id, ShadowmapSize size) override;
void SetShadowBias(ShadowId id, float bias) override;
void SetPcfMethod(ShadowId id, PcfMethod method);
void SetPcfMethod(ShadowId id, PcfMethod method) override;
void SetEsmExponent(ShadowId id, float exponent);
void SetShadowFilterMethod(ShadowId id, ShadowFilterMethod method) override;
void SetSofteningBoundaryWidthAngle(ShadowId id, float boundaryWidthRadians) override;
Gems/Atom/Feature/Common/Code/atom_feature_common_public_files.cmake
+1
View File
@@ -39,6 +39,7 @@ set(FILES
Include/Atom/Feature/ParamMacros/StartParamCopySettingsTo.inl
Include/Atom/Feature/ParamMacros/StartParamFunctions.inl
Include/Atom/Feature/ParamMacros/StartParamFunctionsOverride.inl
Include/Atom/Feature/ParamMacros/StartParamFunctionsOverrideImpl.inl
Include/Atom/Feature/ParamMacros/StartParamFunctionsVirtual.inl
Include/Atom/Feature/ParamMacros/StartParamMembers.inl
Include/Atom/Feature/ParamMacros/StartParamSerializeContext.inl
Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterface.h
+1 -1
View File
@@ -34,7 +34,7 @@ namespace AZ
const AssetBuilderSDK::PlatformInfo& platform, const AZStd::string& shaderSourcePath, const AZStd::string& functionName,
RHI::ShaderHardwareStage shaderStage, const AZStd::string& tempFolderPath, StageDescriptor& outputDescriptor,
const RHI::ShaderCompilerArguments& shaderCompilerArguments) const override;
AZStd::string GetAzslCompilerWarningParameters(const RHI::ShaderCompilerArguments& shaderCompilerArguments) const;
AZStd::string GetAzslCompilerWarningParameters(const RHI::ShaderCompilerArguments& shaderCompilerArguments) const override;
bool BuildHasDebugInfo(const RHI::ShaderCompilerArguments& shaderCompilerArguments) const override;
const char* GetAzslHeader(const AssetBuilderSDK::PlatformInfo& platform) const override;
bool BuildPipelineLayoutDescriptor(
Gems/Atom/RPI/Code/Tests/Common/RHI/Stubs.h
+9 -9
View File
@@ -69,8 +69,8 @@ namespace UnitTest
void FillFormatsCapabilitiesInternal([[maybe_unused]] FormatCapabilitiesList& formatsCapabilities) override {}
AZ::RHI::ResultCode InitializeLimits() override { return AZ::RHI::ResultCode::Success; }
void PreShutdown() override {}
AZ::RHI::ResourceMemoryRequirements GetResourceMemoryRequirements([[maybe_unused]] const AZ::RHI::ImageDescriptor& descriptor) { return AZ::RHI::ResourceMemoryRequirements{}; };
AZ::RHI::ResourceMemoryRequirements GetResourceMemoryRequirements([[maybe_unused]] const AZ::RHI::BufferDescriptor& descriptor) { return AZ::RHI::ResourceMemoryRequirements{}; };
AZ::RHI::ResourceMemoryRequirements GetResourceMemoryRequirements([[maybe_unused]] const AZ::RHI::ImageDescriptor& descriptor) override { return AZ::RHI::ResourceMemoryRequirements{}; };
AZ::RHI::ResourceMemoryRequirements GetResourceMemoryRequirements([[maybe_unused]] const AZ::RHI::BufferDescriptor& descriptor) override { return AZ::RHI::ResourceMemoryRequirements{}; };
void ObjectCollectionNotify(AZ::RHI::ObjectCollectorNotifyFunction notifyFunction) override {}
};
@@ -228,12 +228,12 @@ namespace UnitTest
AZ_CLASS_ALLOCATOR(Fence, AZ::SystemAllocator, 0);
private:
virtual AZ::RHI::ResultCode InitInternal(AZ::RHI::Device&, AZ::RHI::FenceState) override { return AZ::RHI::ResultCode::Success; }
virtual void ShutdownInternal() override {}
virtual void SignalOnCpuInternal() override {}
virtual void WaitOnCpuInternal() const override {};
virtual void ResetInternal() override {}
virtual AZ::RHI::FenceState GetFenceStateInternal() const override { return AZ::RHI::FenceState::Reset; }
AZ::RHI::ResultCode InitInternal(AZ::RHI::Device&, AZ::RHI::FenceState) override { return AZ::RHI::ResultCode::Success; }
void ShutdownInternal() override {}
void SignalOnCpuInternal() override {}
void WaitOnCpuInternal() const override {};
void ResetInternal() override {}
AZ::RHI::FenceState GetFenceStateInternal() const override { return AZ::RHI::FenceState::Reset; }
};
class ShaderResourceGroupPool
@@ -276,7 +276,7 @@ namespace UnitTest
AZ_CLASS_ALLOCATOR(ShaderStageFunction, AZ::SystemAllocator, 0);
private:
virtual AZ::RHI::ResultCode FinalizeInternal() { return AZ::RHI::ResultCode::Success; }
AZ::RHI::ResultCode FinalizeInternal() override { return AZ::RHI::ResultCode::Success; }
};
class PipelineState
Gems/Atom/RPI/Code/Tests/Material/MaterialPropertySerializerTests.cpp
+2 -2
View File
@@ -21,14 +21,14 @@ namespace JsonSerializationTests
public JsonSerializerConformityTestDescriptor<AZ::RPI::MaterialTypeSourceData::PropertyDefinition>
{
public:
void Reflect(AZStd::unique_ptr<AZ::SerializeContext>& context)
void Reflect(AZStd::unique_ptr<AZ::SerializeContext>& context) override
{
AZ::RPI::MaterialTypeSourceData::Reflect(context.get());
AZ::RPI::MaterialPropertyDescriptor::Reflect(context.get());
AZ::RPI::ReflectMaterialDynamicMetadata(context.get());
}
void Reflect(AZStd::unique_ptr<AZ::JsonRegistrationContext>& context)
void Reflect(AZStd::unique_ptr<AZ::JsonRegistrationContext>& context) override
{
AZ::RPI::MaterialTypeSourceData::Reflect(context.get());
}
Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
+1 -1
View File
@@ -113,7 +113,7 @@ namespace AtomToolsFramework
void ToggleFullScreenState() override;
float GetDpiScaleFactor() const override;
uint32_t GetSyncInterval() const override;
uint32_t GetDisplayRefreshRate() const;
uint32_t GetDisplayRefreshRate() const override;
protected:
// AzFramework::InputChannelEventListener ...
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.h
+1 -1
View File
@@ -75,7 +75,7 @@ namespace AZ
////////////////////////////////////////////////////////////////////////
// AttachmentComponentRequests
void Reattach(bool detachFirst);
void Reattach(bool detachFirst) override;
void Attach(AZ::EntityId targetId, const char* targetBoneName, const AZ::Transform& offset) override;
void Detach() override;
void SetAttachmentOffset(const AZ::Transform& offset) override;
Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimplePointLightDelegate.h
+1 -2
View File
@@ -31,8 +31,7 @@ namespace AZ
float GetEffectiveSolidAngle() const override { return PhotometricValue::OmnidirectionalSteradians; }
private:
virtual void HandleShapeChanged();
void HandleShapeChanged() override;
};
} // namespace Render
Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SimpleSpotLightDelegate.h
+1 -1
View File
@@ -34,7 +34,7 @@ namespace AZ
void SetShutterAngles(float innerAngleDegrees, float outerAngleDegrees) override;
private:
virtual void HandleShapeChanged();
void HandleShapeChanged() override;
};
} // namespace Render
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.h
+7 -10
View File
@@ -30,9 +30,6 @@ namespace AZ
{
namespace Render
{
//! A configuration structure for the MeshComponentController
class MeshComponentConfig final
: public AZ::ComponentConfig
@@ -107,14 +104,14 @@ namespace AZ
void SetLodType(RPI::Cullable::LodType lodType) override;
RPI::Cullable::LodType GetLodType() const override;
virtual void SetLodOverride(RPI::Cullable::LodOverride lodOverride);
virtual RPI::Cullable::LodOverride GetLodOverride() const;
void SetLodOverride(RPI::Cullable::LodOverride lodOverride) override;
RPI::Cullable::LodOverride GetLodOverride() const override;
virtual void SetMinimumScreenCoverage(float minimumScreenCoverage);
virtual float GetMinimumScreenCoverage() const;
void SetMinimumScreenCoverage(float minimumScreenCoverage) override;
float GetMinimumScreenCoverage() const override;
virtual void SetQualityDecayRate(float qualityDecayRate);
virtual float GetQualityDecayRate() const;
void SetQualityDecayRate(float qualityDecayRate) override;
float GetQualityDecayRate() const override;
void SetVisibility(bool visible) override;
bool GetVisibility() const override;
@@ -130,7 +127,7 @@ namespace AZ
void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override;
// MaterialReceiverRequestBus::Handler overrides ...
virtual MaterialAssignmentId FindMaterialAssignmentId(
MaterialAssignmentId FindMaterialAssignmentId(
const MaterialAssignmentLodIndex lod, const AZStd::string& label) const override;
RPI::ModelMaterialSlotMap GetModelMaterialSlots() const override;
MaterialAssignmentMap GetMaterialAssignments() const override;
Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.h
+2 -2
View File
@@ -88,7 +88,7 @@ namespace AZ
void UpdateBounds() override;
void DebugDraw(const DebugOptions& debugOptions) override;
void SetMaterials(const EMotionFX::Integration::ActorAsset::MaterialList& materialPerLOD) override { AZ_UNUSED(materialPerLOD); };
void SetSkinningMethod(EMotionFX::Integration::SkinningMethod emfxSkinningMethod);
void SetSkinningMethod(EMotionFX::Integration::SkinningMethod emfxSkinningMethod) override;
SkinningMethod GetAtomSkinningMethod() const;
void SetIsVisible(bool isVisible) override;
@@ -120,7 +120,7 @@ namespace AZ
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// MaterialReceiverRequestBus::Handler overrides...
virtual MaterialAssignmentId FindMaterialAssignmentId(
MaterialAssignmentId FindMaterialAssignmentId(
const MaterialAssignmentLodIndex lod, const AZStd::string& label) const override;
RPI::ModelMaterialSlotMap GetModelMaterialSlots() const override;
MaterialAssignmentMap GetMaterialAssignments() const override;