Merge remote-tracking branch 'upstream/main' into DisableAtomShim

2021-04-23 18:35:18 -05:00
parent f750a491c8 4abe63e046
commit bc40dd7e5e
4379 changed files with 30092 additions and 39185 deletions
@@ -396,4 +396,4 @@ void CFogVolumeRenderNode::GetVolumetricFogColorBox(const Vec3& worldPos, const
            resultColor = ColorF(m_cachedFogColor.r, m_cachedFogColor.g, m_cachedFogColor.b, min(fog, 1.0f));
        }
    }
-}
+}
@@ -325,4 +325,4 @@ bool CGeomCacheMeshManager::ReadMeshColors(CGeomCacheStreamReader& reader, const
    return true;
 }

-#endif
+#endif
@@ -1488,4 +1488,4 @@ void CGeomCacheRenderNode::OnGeomCacheStaticDataUnloaded()
    Clear(false);
 }

-#endif
+#endif
@@ -14,4 +14,4 @@
 // Description : Draw static objects (vegetations)


-#include "Cry3DEngine_precompiled.h"
+#include "Cry3DEngine_precompiled.h"
@@ -94,4 +94,4 @@ void C3DEngine::DisablePostEffects()
            }
        }
    }
-}
+}
@@ -22,4 +22,4 @@ TEST(MockValidationTests, SystemMock_Compiles)
 TEST(MockValidationTests, LogMock_Compiles)
 {
    LogMock mockLog;
-}
+}
@@ -71,4 +71,4 @@ namespace std17
    }
 }

-#endif // CRYINCLUDE_CRYCOMMON_ALGORITHM_H
+#endif // CRYINCLUDE_CRYCOMMON_ALGORITHM_H
@@ -318,4 +318,4 @@ namespace Bezier
    }
 }

-#endif
+#endif
@@ -63,4 +63,4 @@ public:
 };


-#endif // #ifndef _CREFOGVOLUME_
+#endif // #ifndef _CREFOGVOLUME_
@@ -67,4 +67,4 @@ public:
    _smart_ptr<IRenderMesh> m_pHullMesh;
 };

-#endif // #ifndef _CREVOLUMEOBJECT_
+#endif // #ifndef _CREVOLUMEOBJECT_
@@ -54,4 +54,4 @@ private:
 };


-#endif
+#endif
@@ -35,4 +35,4 @@ namespace AZ
    };

    typedef AZ::EBus<HeightmapUpdateNotification> HeightmapUpdateNotificationBus;
-}
+}
@@ -327,7 +327,16 @@ struct IMovieCallback
 */
 struct IAnimTrack
 {
-    AZ_RTTI(IAnimTrack, "{AA0D5170-FB28-426F-BA13-7EFF6BB3AC67}")
+    AZ_RTTI(IAnimTrack, "{AA0D5170-FB28-426F-BA13-7EFF6BB3AC67}");
+    AZ_CLASS_ALLOCATOR(IAnimTrack, AZ::SystemAllocator, 0);
+
+    static void Reflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            serializeContext->Class<IAnimTrack>();
+        }
+    }

    //! Flags that can be set on animation track.
    enum EAnimTrackFlags
@@ -594,7 +603,16 @@ struct IAnimNodeOwner
 struct IAnimNode
 {
 public:
-    AZ_RTTI(IAnimNode, "{0A096354-7F26-4B18-B8C0-8F10A3E0440A}")
+    AZ_RTTI(IAnimNode, "{0A096354-7F26-4B18-B8C0-8F10A3E0440A}");
+    AZ_CLASS_ALLOCATOR(IAnimNode, AZ::SystemAllocator, 0);
+
+    static void Reflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            serializeContext->Class<IAnimNode>();
+        }
+    }

    //////////////////////////////////////////////////////////////////////////
    // Supported params.
@@ -922,7 +940,7 @@ struct IAnimSequence

    static void Reflect(AZ::ReflectContext* context)
    {
-        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext != nullptr)
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
        {
            serializeContext->Class<IAnimSequence>();
        }
@@ -83,4 +83,4 @@ void LocalizationManagerRequests::LocalizeAndSubstitute(const AZStd::string& loc

    outLocalizedString = locString;
    LocalizationManagerRequestBus::Broadcast(&LocalizationManagerRequestBus::Events::LocalizeAndSubstituteInternal, outLocalizedString, keys, values);
-}
+}
@@ -96,4 +96,4 @@ public: // member functions
    virtual void OnCheckboxStateChange([[maybe_unused]] bool checked) {}
 };

-typedef AZ::EBus<UiCheckboxNotifications> UiCheckboxNotificationBus;
+typedef AZ::EBus<UiCheckboxNotifications> UiCheckboxNotificationBus;
@@ -124,4 +124,4 @@ public: // member functions
    virtual void OnDropdownValueChanged([[maybe_unused]] AZ::EntityId option) {}
 };

-typedef AZ::EBus<UiDropdownNotifications> UiDropdownNotificationBus;
+typedef AZ::EBus<UiDropdownNotifications> UiDropdownNotificationBus;
@@ -63,4 +63,4 @@ public: // member functions
    virtual void OnDropdownOptionSelected() {}
 };

-typedef AZ::EBus<UiDropdownOptionNotifications> UiDropdownOptionNotificationBus;
+typedef AZ::EBus<UiDropdownOptionNotifications> UiDropdownOptionNotificationBus;
@@ -83,4 +83,4 @@ public: // member functions
    virtual void OnRadioButtonStateChange([[maybe_unused]] bool checked) {}
 };

-typedef AZ::EBus<UiRadioButtonNotifications> UiRadioButtonNotificationBus;
+typedef AZ::EBus<UiRadioButtonNotifications> UiRadioButtonNotificationBus;
@@ -38,4 +38,4 @@ public: // static member data
    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
 };

-typedef AZ::EBus<UiRadioButtonCommunicationInterface> UiRadioButtonCommunicationBus;
+typedef AZ::EBus<UiRadioButtonCommunicationInterface> UiRadioButtonCommunicationBus;
@@ -75,4 +75,4 @@ public: // member functions
    virtual void OnRadioButtonGroupStateChange([[maybe_unused]] AZ::EntityId checkedRadioButton) {}
 };

-typedef AZ::EBus<UiRadioButtonGroupNotifications> UiRadioButtonGroupNotificationBus;
+typedef AZ::EBus<UiRadioButtonGroupNotifications> UiRadioButtonGroupNotificationBus;
@@ -44,4 +44,4 @@ public: // static member data
    static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
 };

-typedef AZ::EBus<UiRadioButtonGroupCommunicationInterface> UiRadioButtonGroupCommunicationBus;
+typedef AZ::EBus<UiRadioButtonGroupCommunicationInterface> UiRadioButtonGroupCommunicationBus;
@@ -107,4 +107,4 @@ public: // member functions
    virtual void OnSliderValueChanged([[maybe_unused]] float value) {}
 };

-typedef AZ::EBus<UiSliderNotifications> UiSliderNotificationBus;
+typedef AZ::EBus<UiSliderNotifications> UiSliderNotificationBus;
@@ -11,7 +11,7 @@
 */
 #pragma once

-#include <LyShine/ILyShine.h>
+#include <IRenderer.h>
 #include <AzCore/Math/Vector2.h>
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Math/Color.h>
@@ -115,355 +115,4 @@ public: // member functions

    //! Implement virtual destructor just for safety.
    virtual ~IDraw2d() {}
-
-    //! Start a section of 2D drawing function calls. This will set appropriate render state.
-    //
-    //! \param deferCalls   If true then actual render calls are deferred until the end of the frame
-    virtual void BeginDraw2d(bool deferCalls = false) = 0;
-
-    //! Start a section of 2D drawing function calls. This will set appropriate render state.
-    //! This variant allows the viewport size to be specified
-    //
-    //! \param viewportSize The size of the viewport being rendered to
-    //! \param deferCalls   If true then actual render calls are deferred until the end of the frame
-    virtual void BeginDraw2d(AZ::Vector2 viewportSize, bool deferCalls = false) = 0;
-
-    //! End a section of 2D drawing function calls. This will reset some render state.
-    virtual void EndDraw2d() = 0;
-
-    //! Draw a textured quad with the top left corner at the given position.
-    //
-    //! The image is drawn with the color specified by SetShapeColor and the opacity
-    //! passed as an argument.
-    //! If rotation is non-zero then the quad is rotated. If the pivot point is
-    //! provided then the points of the quad are rotated about that point, otherwise
-    //! they are rotated about the top left corner of the quad.
-    //! \param texId    The texture ID returned by ITexture::GetTextureID()
-    //! \param position Position of the top left corner of the quad (before rotation) in pixels
-    //! \param size     The width and height of the quad. Use texture width and height to avoid minification,
-    //!                 magnification or stretching (assuming the minMaxTexCoords are left to the default)
-    //! \param opacity  The alpha value used when blending
-    //! \param rotation Angle of rotation in degrees counter-clockwise
-    //! \param pivotPoint       The point about which the quad is rotated
-    //! \param minMaxTexCoords  An optional two component array. The first component is the UV coord for the top left
-    //!                         point of the quad and the second is the UV coord of the bottom right point of the quad
-    //! \param imageOptions     Optional struct specifying options that tend to be the same from call to call
-    virtual void DrawImage(int texId, AZ::Vector2 position, AZ::Vector2 size, float opacity = 1.0f,
-        float rotation = 0.0f, const AZ::Vector2* pivotPoint = nullptr, const AZ::Vector2* minMaxTexCoords = nullptr,
-        ImageOptions* imageOptions = nullptr) = 0;
-
-    //! Draw a textured quad where the position specifies the point specified by the alignment.
-    //
-    //! Rotation is always around the position.
-    //! \param texId    The texture ID returned by ITexture::GetTextureID()
-    //! \param position Position align point of the quad (before rotation) in pixels
-    //! \param size     The width and height of the quad. Use texture width and height to avoid minification,
-    //!                 magnification or stretching (assuming the minMaxTexCoords are left to the default)
-    //! \param horizontalAlignment  Specifies how the quad is horizontally aligned to the given position
-    //! \param verticalAlignment    Specifies how the quad is vertically aligned to the given position
-    //! \param opacity  The alpha value used when blending
-    //! \param rotation Angle of rotation in degrees counter-clockwise
-    //! \param minMaxTexCoords  An optional two component array. The first component is the UV coord for the top left
-    //!                         point of the quad and the second is the UV coord of the bottom right point of the quad
-    //! \param imageOptions     Optional struct specifying options that tend to be the same from call to call
-    virtual void DrawImageAligned(int texId, AZ::Vector2 position, AZ::Vector2 size,
-        HAlign horizontalAlignment, VAlign verticalAlignment,
-        float opacity = 1.0f, float rotation = 0.0f, const AZ::Vector2* minMaxTexCoords = nullptr,
-        ImageOptions* imageOptions = nullptr) = 0;
-
-    //! Draw a textured quad where the position, color and uv of each point is specified explicitly
-    //
-    //! \param texId        The texture ID returned by ITexture::GetTextureID()
-    //! \param verts        An array of 4 vertices, in clockwise order (e.g. top left, top right, bottom right, bottom left)
-    //! \param blendMode    UseDefault means default blend mode (currently GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA)
-    //! \param pixelRounding Whether and how to round pixel coordinates
-    //! \param baseState     Additional render state to pass to or into value passed to renderer SetState
-    virtual void DrawQuad(int texId, VertexPosColUV* verts,
-        int blendMode = UseDefault,
-        Rounding pixelRounding = Rounding::Nearest,
-        int baseState = UseDefault) = 0;
-
-    //! Draw a line
-    //
-    //! \param start        The start position
-    //! \param end          The end position
-    //! \param color        The color of the line
-    //! \param blendMode    UseDefault means default blend mode (currently GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA)
-    //! \param pixelRounding Whether and how to round pixel coordinates
-    //! \param baseState     Additional render state to pass to or into value passed to renderer SetState
-    virtual void DrawLine(AZ::Vector2 start, AZ::Vector2 end, AZ::Color color,
-        int blendMode = UseDefault,
-        IDraw2d::Rounding pixelRounding = IDraw2d::Rounding::Nearest,
-        int baseState = UseDefault) = 0;
-
-    //! Draw a line with a texture so it can be dotted or dashed
-    //
-    //! \param texId        The texture ID returned by ITexture::GetTextureID()
-    //! \param verts        An array of 2 vertices for the start and end points of the line
-    //! \param blendMode    UseDefault means default blend mode (currently GS_BLSRC_SRCALPHA | GS_BLDST_ONEMINUSSRCALPHA)
-    //! \param pixelRounding Whether and how to round pixel coordinates
-    //! \param baseState     Additional render state to pass to or into value passed to renderer SetState
-    virtual void DrawLineTextured(int texId, VertexPosColUV* verts,
-        int blendMode = UseDefault,
-        IDraw2d::Rounding pixelRounding = IDraw2d::Rounding::Nearest,
-        int baseState = UseDefault) = 0;
-
-    //! Draw a text string. Only supports ASCII text.
-    //
-    //! The font and effect used to render the text are specified in the textOptions structure
-    //! \param textString   A null terminated ASCII text string. May contain \n characters
-    //! \param position     Position of the text in pixels. Alignment values in textOptions affect actual position
-    //! \param pointSize    The size of the font to use
-    //! \param opacity      The opacity (alpha value) to use to draw the text
-    //! \param textOptions  Pointer to an options struct. If null the default options are used
-    virtual void DrawText(const char* textString, AZ::Vector2 position, float pointSize,
-        float opacity = 1.0f, TextOptions* textOptions = nullptr) = 0;
-
-    //! Get the width and height (in pixels) that would be used to draw the given text string.
-    //
-    //! Pass the same parameter values that would be used to draw the string
-    virtual AZ::Vector2 GetTextSize(const char* textString, float pointSize, TextOptions* textOptions = nullptr) = 0;
-
-    //! Get the width of the rendering viewport (in pixels).
-    //
-    //! If rendering full screen this is the native width from IRenderer
-    virtual float GetViewportWidth() const = 0;
-
-    //! Get the height of the rendering viewport (in pixels).
-    //
-    //! If rendering full screen this is the native width from IRenderer
-    virtual float GetViewportHeight() const = 0;
-
-    //! Get the default values that would be used if no image options were passed in
-    //
-    //! This is a convenient way to initialize the imageOptions struct
-    virtual const ImageOptions& GetDefaultImageOptions() const = 0;
-
-    //! Get the default values that would be used if no text options were passed in
-    //
-    //! This is a convenient way to initialize the textOptions struct
-    virtual const TextOptions& GetDefaultTextOptions() const = 0;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Helper class for using the IDraw2d interface
-//!
-//! The Draw2dHelper class is an inline wrapper that provides two convenience features:
-//! 1. It automatically calls BeginDraw2d/EndDraw2d in its construction/destruction.
-//! 2. It automatically sets member options structures to their defaults and provides set functions
-//!    to set them.
-class Draw2dHelper
-{
-public: // member functions
-
-    //! Start a section of 2D drawing function calls. This will set appropriate render state.
-    Draw2dHelper(bool deferCalls = false)
-        : m_draw2d(GetDraw2d())
-    {
-        if (m_draw2d)
-        {
-            m_draw2d->BeginDraw2d(deferCalls);
-            m_imageOptions = m_draw2d->GetDefaultImageOptions();
-            m_textOptions = m_draw2d->GetDefaultTextOptions();
-        }
-    }
-
-    //! End a section of 2D drawing function calls. This will reset some render state.
-    ~Draw2dHelper()
-    {
-        if (m_draw2d)
-        {
-            m_draw2d->EndDraw2d();
-        }
-    }
-
-    //! Draw a textured quad, optional rotation is counter-clockwise in degrees.
-    //
-    //! See IDraw2d:DrawImage for parameter descriptions
-    void DrawImage(int texId, AZ::Vector2 position, AZ::Vector2 size, float opacity = 1.0f,
-        float rotation = 0.0f, const AZ::Vector2* pivotPoint = nullptr, const AZ::Vector2* minMaxTexCoords = nullptr)
-    {
-        if (m_draw2d)
-        {
-            m_draw2d->DrawImage(texId, position, size, opacity, rotation, pivotPoint, minMaxTexCoords, &m_imageOptions);
-        }
-    }
-
-    //! Draw a textured quad where the position specifies the point specified by the alignment.
-    //
-    //! See IDraw2d:DrawImageAligned for parameter descriptions
-    void DrawImageAligned(int texId, AZ::Vector2 position, AZ::Vector2 size,
-        IDraw2d::HAlign horizontalAlignment, IDraw2d::VAlign verticalAlignment,
-        float opacity = 1.0f, float rotation = 0.0f, const AZ::Vector2* minMaxTexCoords = nullptr)
-    {
-        if (m_draw2d)
-        {
-            m_draw2d->DrawImageAligned(texId, position, size, horizontalAlignment, verticalAlignment,
-                opacity, rotation, minMaxTexCoords, &m_imageOptions);
-        }
-    }
-
-    //! Draw a textured quad where the position, color and uv of each point is specified explicitly
-    //
-    //! See IDraw2d:DrawQuad for parameter descriptions
-    void DrawQuad(int texId, IDraw2d::VertexPosColUV* verts, int blendMode = IDraw2d::UseDefault,
-        IDraw2d::Rounding pixelRounding = IDraw2d::Rounding::Nearest,
-        int baseState = IDraw2d::UseDefault)
-    {
-        if (m_draw2d)
-        {
-            m_draw2d->DrawQuad(texId, verts, blendMode, pixelRounding, baseState);
-        }
-    }
-
-    //! Draw a line
-    //
-    //! See IDraw2d:DrawLine for parameter descriptions
-    void DrawLine(AZ::Vector2 start, AZ::Vector2 end, AZ::Color color, int blendMode = IDraw2d::UseDefault,
-        IDraw2d::Rounding pixelRounding = IDraw2d::Rounding::Nearest,
-        int baseState = IDraw2d::UseDefault)
-    {
-        if (m_draw2d)
-        {
-            m_draw2d->DrawLine(start, end, color, blendMode, pixelRounding, baseState);
-        }
-    }
-
-    //! Draw a line with a texture so it can be dotted or dashed
-    //
-    //! See IDraw2d:DrawLineTextured for parameter descriptions
-    void DrawLineTextured(int texId, IDraw2d::VertexPosColUV* verts, int blendMode = IDraw2d::UseDefault,
-        IDraw2d::Rounding pixelRounding = IDraw2d::Rounding::Nearest,
-        int baseState = IDraw2d::UseDefault)
-    {
-        if (m_draw2d)
-        {
-            m_draw2d->DrawLineTextured(texId, verts, blendMode, pixelRounding, baseState);
-        }
-    }
-
-    //! Draw a text string. Only supports ASCII text.
-    //
-    //! See IDraw2d:DrawText for parameter descriptions
-    void DrawText(const char* textString, AZ::Vector2 position, float pointSize, float opacity = 1.0f)
-    {
-        if (m_draw2d)
-        {
-            m_draw2d->DrawText(textString, position, pointSize, opacity, &m_textOptions);
-        }
-    }
-
-    //! Get the width and height (in pixels) that would be used to draw the given text string.
-    //
-    //! See IDraw2d:GetTextSize for parameter descriptions
-    AZ::Vector2 GetTextSize(const char* textString, float pointSize)
-    {
-        if (m_draw2d)
-        {
-            return m_draw2d->GetTextSize(textString, pointSize, &m_textOptions);
-        }
-        else
-        {
-            return AZ::Vector2(0, 0);
-        }
-    }
-
-    // State management
-
-    //! Set the blend mode used for images, default is GS_BLSRC_SRCALPHA|GS_BLDST_ONEMINUSSRCALPHA.
-    void SetImageBlendMode(int mode) { m_imageOptions.blendMode = mode; }
-
-    //! Set the color used for DrawImage and other image drawing.
-    void SetImageColor(AZ::Vector3 color) { m_imageOptions.color = color; }
-
-    //! Set whether images are rounded to have the points on exact pixel boundaries.
-    void SetImagePixelRounding(IDraw2d::Rounding round) { m_imageOptions.pixelRounding = round; }
-
-    //! Set the base state (that blend mode etc is combined with) used for images, default is GS_NODEPTHTEST.
-    void SetImageBaseState(int state) { m_imageOptions.baseState = state; }
-
-    //! Set the text font.
-    void SetTextFont(IFFont* font) { m_textOptions.font = font; }
-
-    //! Set the text font effect index.
-    void SetTextEffectIndex(unsigned int effectIndex) { m_textOptions.effectIndex = effectIndex; }
-
-    //! Set the text color.
-    void SetTextColor(AZ::Vector3 color) { m_textOptions.color = color; }
-
-    //! Set the text alignment.
-    void SetTextAlignment(IDraw2d::HAlign horizontalAlignment, IDraw2d::VAlign verticalAlignment)
-    {
-        m_textOptions.horizontalAlignment = horizontalAlignment;
-        m_textOptions.verticalAlignment = verticalAlignment;
-    }
-
-    //! Set a drop shadow for text drawing. An alpha of zero disables drop shadow.
-    void SetTextDropShadow(AZ::Vector2 offset, AZ::Color color)
-    {
-        m_textOptions.dropShadowOffset = offset;
-        m_textOptions.dropShadowColor = color;
-    }
-
-    //! Set a rotation for the text. The text rotates around its position (taking into account alignment).
-    void SetTextRotation(float rotation)
-    {
-        m_textOptions.rotation = rotation;
-    }
-
-    //! Set the base state (that blend mode etc is combined with) used for text, default is GS_NODEPTHTEST.
-    void SetTextBaseState(int state) { m_textOptions.baseState = state; }
-
-public: // static member functions
-
-    //! Helper to get the IDraw2d interface
-    static IDraw2d* GetDraw2d() { return (gEnv && gEnv->pLyShine) ? gEnv->pLyShine->GetDraw2d() : nullptr; }
-
-    //! Get the width of the rendering viewport (in pixels).
-    static float GetViewportWidth()
-    {
-        IDraw2d* draw2d = GetDraw2d();
-        return (draw2d) ? draw2d->GetViewportWidth() : 0.0f;
-    }
-
-    //! Get the height of the rendering viewport (in pixels).
-    static float GetViewportHeight()
-    {
-        IDraw2d* draw2d = GetDraw2d();
-        return (draw2d) ? draw2d->GetViewportHeight() : 0.0f;
-    }
-
-    //! Round the X and Y coordinates of a point using the given rounding policy
-    template<typename T>
-    static T RoundXY(T value, IDraw2d::Rounding roundingType)
-    {
-        T result = value;
-
-        switch (roundingType)
-        {
-        case IDraw2d::Rounding::None:
-            // nothing to do
-            break;
-        case IDraw2d::Rounding::Nearest:
-            result.SetX(floor(value.GetX() + 0.5f));
-            result.SetY(floor(value.GetY() + 0.5f));
-            break;
-        case IDraw2d::Rounding::Down:
-            result.SetX(floor(value.GetX()));
-            result.SetY(floor(value.GetY()));
-            break;
-        case IDraw2d::Rounding::Up:
-            result.SetX(ceil(value.GetX()));
-            result.SetY(ceil(value.GetY()));
-            break;
-        }
-
-        return result;
-    }
-
-protected: // attributes
-
-    IDraw2d::ImageOptions   m_imageOptions; //!< image options are stored locally and updated by member functions
-    IDraw2d::TextOptions    m_textOptions;  //!< text options are stored locally and updated by member functions
-    IDraw2d* m_draw2d;
 };
@@ -1,79 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#pragma once
-
-#include <LyShine/IDraw2d.h>
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//! Interface used by UI components to render to the canvas
-//
-//! The IUiRenderer provides helper functions for UI rendering and also manages state that
-//! persists between UI elements when rendering a UI canvas.
-//! For example one UI component can turn on stencil test and that affects all UI rendering
-//! until it is turned off.
-//!
-//! This is a singleton class that is accessed via IUiRenderer::Get() which is a shortcut for
-//!     gEnv->pLyShine()->GetUiRenderer();
-class IUiRenderer
-{
-public: // types
-
-
-public: // member functions
-
-    //! Implement virtual destructor for safety.
-    virtual ~IUiRenderer() {}
-
-    //! Start the rendering of a UI canvas
-    virtual void BeginCanvasRender(AZ::Vector2 viewportSize) = 0;
-
-    //! End the rendering of a UI canvas
-    virtual void EndCanvasRender() = 0;
-
-    //! Get the current base state
-    virtual int GetBaseState() = 0;
-
-    //! Set the base state
-    virtual void SetBaseState(int state) = 0;
-
-    //! Get the current stencil test reference value
-    virtual uint32 GetStencilRef() = 0;
-
-    //! Set the stencil test reference value
-    virtual void SetStencilRef(uint32) = 0;
-
-    //! Increment the current stencil reference value
-    virtual void IncrementStencilRef() = 0;
-
-    //! Decrement the current stencil reference value
-    virtual void DecrementStencilRef() = 0;
-
-    //! Get flag that indicates we are rendering into a mask. Used to avoid masks on child mask elements.
-    virtual bool IsRenderingToMask() = 0;
-
-    //! Set flag that we are rendering into a mask. Used to avoid masks on child mask elements.
-    virtual void SetIsRenderingToMask(bool isRenderingToMask) = 0;
-
-    //! Push an alpha fade, this is multiplied with any existing alpha fade from parents
-    virtual void PushAlphaFade(float alphaFadeValue) = 0;
-
-    //! Pop an alpha fade off the stack
-    virtual void PopAlphaFade() = 0;
-
-    //! Get the current alpha fade value
-    virtual float GetAlphaFade() const = 0;
-
-public: // static member functions
-
-    //! Helper function to get the singleton UiRenderer
-    static IUiRenderer* Get() { return gEnv->pLyShine->GetUiRenderer(); }
-};
@@ -20,6 +20,7 @@
 #include <AzCore/Component/Entity.h>

 #include <LyShine/UiAssetTypes.h>
+#include <LyShine/UiBase.h>

 ////////////////////////////////////////////////////////////////////////////////////////////////////

@@ -57,4 +57,4 @@ namespace Maestro
 // defined in the bus header so we can refer to it in the Editor code
 #define EditorSequenceComponentTypeId "{C02DC0E2-D0F3-488B-B9EE-98E28077EC56}"

-} // namespace Maestro
+} // namespace Maestro
@@ -97,4 +97,4 @@ namespace AZStd
            return retVal;
        }
    };
-}
+}
@@ -52,4 +52,4 @@ enum class AnimNodeType
    Num
 };

-#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMNODETYPE_H
+#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMNODETYPE_H
@@ -42,4 +42,4 @@ enum class AnimValue
 };


-#endif CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUE_H
+#endif CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUE_H
@@ -45,4 +45,4 @@ enum class AnimValueType
 };


-#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUETYPE_H
+#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUETYPE_H
@@ -35,4 +35,4 @@ struct IAssetBlendKey
 };

    AZ_TYPE_INFO_SPECIALIZE(IAssetBlendKey, "{15B82C3A-6DB8-466F-AF7F-18298FCD25FD}");
-}
+}
@@ -77,4 +77,4 @@ namespace Maestro
        }
    };

-} // namespace Maestro
+} // namespace Maestro
@@ -25,4 +25,4 @@ enum class SequenceType
    SequenceComponent     = 1         // Sequence Component on an AZ::Entity
 };

-#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_SEQUENCETYPE_H
+#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_SEQUENCETYPE_H
@@ -110,4 +110,4 @@ private:
    CTimeValue m_frameStartTime;
    float m_frameTime;
    float m_frameRate;
-};
+};
@@ -12,4 +12,4 @@
 set(FILES
    ../../EngineSettingsBackendApple.cpp
    ../../EngineSettingsBackendApple.h
-)
+)
@@ -12,4 +12,4 @@
 set(FILES
    ../../EngineSettingsBackendWin32.cpp
    ../../EngineSettingsBackendWin32.h
-)
+)
@@ -10,4 +10,4 @@
 #

 set(FILES
-)
+)
@@ -120,4 +120,4 @@ namespace AZ
    };

    using RenderScreenshotNotificationBus = AZ::EBus<RenderScreenshotNotifications>;
-}
+}
@@ -83,4 +83,4 @@ namespace AzRTT
        //! confirm if user wants to use texture size larger than MaxRecommendedRenderTargetSize
        bool ValidateTextureSize(void* newValue, const AZ::Uuid& valueType);
    };
-}
+}
@@ -64,4 +64,4 @@ namespace Serialization
        using Serialization::ForceFeedbackIdName;
    }
 }
-#endif // CRYINCLUDE_CRYCOMMON_SERIALIZATION_DECORATORS_RESOURCES_H
+#endif // CRYINCLUDE_CRYCOMMON_SERIALIZATION_DECORATORS_RESOURCES_H
@@ -24,4 +24,4 @@ namespace Serialization
    };
 }

-#endif
+#endif
@@ -44,4 +44,4 @@ namespace AZ
    };

    using StereoRendererRequestBus = EBus < StereoRendererBus >;
-}
+}
@@ -85,4 +85,4 @@ public:
    PodArray<T*> m_lstUsed;
    T* m_pPool;
    int m_nPoolSize;
-};
+};
@@ -256,4 +256,4 @@ namespace AZ

    }//namespace VR
    AZ_TYPE_INFO_SPECIALIZE(VR::ControllerIndex, "{90D4C80E-A1CC-4DBF-A131-0082C75835E8}");
-}//namespace AZ
+}//namespace AZ
@@ -24,4 +24,4 @@ set(FILES
 # Remove files that cause #define collisions on Mac due to multiple inclusions of 'AppleSpecific.h' and include orders
 set(SKIP_UNITY_BUILD_INCLUSION_FILES
    SettingsManagerHelpers.cpp
-)
+)
@@ -23,4 +23,4 @@ set(FILES
    Mocks/ITextureMock.h
    Mocks/IRemoteConsoleMock.h
    Mocks/MockCGFContent.h
-)
+)
@@ -1,3 +1,3 @@
 EXPORTS
 	ModuleInitISystem @2
-	CryModuleGetMemoryInfo @8
+	CryModuleGetMemoryInfo @8
@@ -185,6 +185,7 @@ string CCmdLine::Next(char*& src)
            return string(org, src - 1);

        case ' ':
+            ch = *src++;
            continue;
        default:
            org = src - 1;
@@ -464,4 +464,4 @@ static void printModel(const HuffmanTreeNode* const pNodes, const HuffmanSymbolC
            printf("\n");
        }
    }
-}*/
+}*/
@@ -91,4 +91,4 @@ void CIOSConsole::PutText( int x, int y, const char * msg )
 void CIOSConsole::EndDraw() {
    // Do Nothing
 }
-#endif // IOS
+#endif // IOS
@@ -26,4 +26,4 @@ bool CLZ4Decompressor::DecompressData(const char* pIn, char* pOut, const uint ou
 void CLZ4Decompressor::Release()
 {
    delete this;
-}
+}
@@ -313,4 +313,4 @@ bool CMiniButton::SetConnectedCtrl(IMiniCtrl* pConnectedCtrl)
    return true;
 }

-MINIGUI_END
+MINIGUI_END
@@ -171,4 +171,4 @@ void CMiniInfoBox::AutoResize()
    m_requiresResize = false;
 }

-MINIGUI_END
+MINIGUI_END
@@ -361,4 +361,4 @@ void CMiniMenu::AddSubCtrl(IMiniCtrl* pCtrl)
    // Call parent
    CMiniButton::AddSubCtrl(pCtrl);
 }
-MINIGUI_END
+MINIGUI_END
@@ -182,4 +182,4 @@ void CRemoteConsole::RegisterListener(IRemoteConsoleListener* pListener, const c
 void CRemoteConsole::UnregisterListener(IRemoteConsoleListener* pListener)
 {
    m_listener.Remove(pListener);
-}
+}
@@ -284,4 +284,4 @@ void CSampler::LogSampledData()
 }


-#endif // defined(WIN32)
+#endif // defined(WIN32)
@@ -4094,6 +4094,7 @@ void CSystem::CreateSystemVars()
        "0 = Suppress Asserts\n"
        "1 = Log Asserts\n"
        "2 = Show Assert Dialog\n"
+        "3 = Crashes the Application on Assert\n"
        "Note: when set to '0 = Suppress Asserts', assert expressions are still evaluated. To turn asserts into a no-op, undefine AZ_ENABLE_TRACING and recompile.",
        OnAssertLevelCvarChanged);
    CSystem::SetAssertLevel(defaultAssertValue);
@@ -356,4 +356,4 @@ void DebugCamera::MovePosition(const Vec3& offset)
    m_position += m_view.GetColumn2() * offset.z;
 }

-} // namespace LegacyViewSystem
+} // namespace LegacyViewSystem
@@ -80,4 +80,4 @@ inline bool DebugCamera::IsFree()
    return m_cameraMode == DebugCamera::ModeFree;
 }

-} // namespace LegacyViewSystem
+} // namespace LegacyViewSystem
@@ -39,4 +39,4 @@ private:
    static void SphereTessR(Vec3& v0, Vec3& v1, Vec3& v2, int depth, t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff);
 };

-#endif
+#endif
@@ -90,4 +90,4 @@ namespace Render
 } // namespace Render

 #endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_MEMORY_VRAMDRILLERBUS_H
-#pragma once
+#pragma once
@@ -685,4 +685,4 @@ Matrix44& SPostEffectsUtils::GetColorMatrix()
    return m_pColorMat;
 }

-////////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -309,4 +309,4 @@ private:
    static CTexture* m_UpscaleTarget;
 };

-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_POSTPROCESS_POSTPROCESSUTILS_H
+#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_POSTPROCESS_POSTPROCESSUTILS_H
@@ -71,4 +71,4 @@ void AbstractMeshElement::DrawMeshWireframe()
    gcpRendD3D->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, nVertexBufferCount, 0, nIndexBufferCount);

    gcpRendD3D->FX_SetState(nState);
-}
+}
@@ -47,4 +47,4 @@ void CREDeferredShading::mfReset()

 void CREDeferredShading::mfActivate([[maybe_unused]] int iProcess)
 {
-}
+}
@@ -240,4 +240,4 @@ bool CREGeomCache::GetGeometryInfo(SGeometryInfo &streams)
    return true;
 }

-#endif
+#endif
@@ -47,4 +47,4 @@ void CREHDRProcess::mfReset()

 void CREHDRProcess::mfActivate([[maybe_unused]] int iProcess)
 {
-}
+}
@@ -58,4 +58,4 @@ IOpticsElementBase*  COpticsFactory::Create(EFlareType type) const
    default:
        return NULL;
    }
-}
+}
@@ -74,4 +74,4 @@ public:
        static OpticsPredef instance;
        return &instance;
    }
-};
+};
@@ -850,4 +850,4 @@ EPolygonInCircle2D PolygonInCircle2D(const Vec2& center, const float radius, con
    }

    return state;
-}//-------------------------------------------------------------------------------------------------
+}//-------------------------------------------------------------------------------------------------
@@ -150,4 +150,4 @@ enum EPolygonInCircle2D

 EPolygonInCircle2D PolygonInCircle2D(const Vec2& center, const float radius, const Vec2* pPolygon, const int numPts);

-#endif // _POLYGON_MATH_2D_
+#endif // _POLYGON_MATH_2D_
@@ -285,4 +285,4 @@ void CSpatialHashGrid<T, GridSize, BucketSize>::DebugDraw()
 #endif // !RELEASE

 #endif // GLASSCFG_USE_HASH_GRID
-#endif // _SPATIAL_HASH_GRID_
+#endif // _SPATIAL_HASH_GRID_
@@ -19,4 +19,4 @@ FX_STATIC_FLAG(GMEM_RT_GREATER_FOUR)
 FX_STATIC_FLAG(NO_DEPTH_CLIPPING)
 FX_STATIC_FLAG(FEATURE_FETCH_DEPTHSTENCIL)
 FX_STATIC_FLAG(GMEM_VELOCITY_BUFFER)
-FX_STATIC_FLAG(GLES3_0)
+FX_STATIC_FLAG(GLES3_0)
@@ -51,4 +51,4 @@ struct PerFrameParameters
    Vec4 m_VolumetricFogDistanceParams;
 };

-#endif // _PER_FRAME_RESOURCE_GROUP_
+#endif // _PER_FRAME_RESOURCE_GROUP_
@@ -228,4 +228,4 @@ void CPowerOf2BlockPacker::FreeContainers()
    Clear();
    stl::free_container(m_Blocks);
    stl::free_container(m_BlockBitmap);
-}
+}
@@ -43,4 +43,4 @@ void CStereoTexture::Apply(int nTUnit, int nState, int nTexMatSlot, int nSUnit,
    {
        AZ_Assert(true, "Invalid eye provided for rendering");
    }
-}
+}
@@ -37,4 +37,4 @@ public:
    void Apply(int nTUnit, int nState = -1, int nTexMatSlot = EFTT_UNKNOWN, int nSUnit = -1, SResourceView::KeyType nResViewKey = SResourceView::DefaultView, EHWShaderClass eHWSC = eHWSC_Pixel) override;
    
    AZStd::vector<CTexture*> m_textures;
-};
+};
@@ -12,4 +12,4 @@
 // Original file Copyright Crytek GMBH or its affiliates, used under license.

 #include "RenderDll_precompiled.h"
- 
+
@@ -198,4 +198,4 @@ bool CRELensOptics::mfDraw(CShader* pShader, [[maybe_unused]] SShaderPass* pass)
 void CRELensOptics::ClearResources()
 {
    g_SoftOcclusionManager.ClearResources();
-}
+}
@@ -14,4 +14,4 @@
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup />
-</Project>
+</Project>
@@ -14,4 +14,4 @@
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup />
-</Project>
+</Project>
@@ -116,4 +116,4 @@ class D3DHMDRenderer
        EyeRenderTarget m_eyes[STEREO_EYE_COUNT];     ///< Device render targets to be rendered to and submitted to the HMD for display.

        bool m_framePrepared;       ///< If true, PrepareFrame() and SubmitFrame() were called in the proper ordering (just for debugging purproses).
-};
+};
@@ -53,4 +53,4 @@ namespace RenderCapabilities
    {
        return true;
    }
-}
+}
@@ -53,4 +53,4 @@ namespace RenderCapabilities
    {
        return true;
    }
-}
+}
@@ -11,4 +11,4 @@
 */

 // Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
+#include "RenderDll_precompiled.h"
@@ -11,4 +11,4 @@
 */

 // Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
+#include "RenderDll_precompiled.h"
@@ -11,4 +11,4 @@
 */

 // Original file Copyright Crytek GMBH or its affiliates, used under license.
-#include "RenderDll_precompiled.h"
+#include "RenderDll_precompiled.h"
@@ -43,4 +43,4 @@
 #       include <glad/glx.h>
 #       undef GLAD_GLX_IMPLEMENTATION
 #   endif
-#endif
+#endif
@@ -40,4 +40,4 @@ namespace NCryOpenGL
                                                                "{"
                                                                "   Output0 = texture(text0, VtxOutput0.xy);"
                                                                "}";
-}
+}
@@ -352,4 +352,4 @@ namespace NCryOpenGL
 };


-#endif //__GLFORMAT__
+#endif //__GLFORMAT__
@@ -1112,4 +1112,4 @@ CUSTOM_INSTRUMENT(Delete, glDeleteSamplers)
 CUSTOM_INSTRUMENT(Delete, glDeleteTransformFeedbacks)
 CUSTOM_INSTRUMENT(Delete, glDeleteProgramPipelines)

-#endif //__GLINSTRUMENT__
+#endif //__GLINSTRUMENT__
@@ -51,4 +51,4 @@ bool CCryDXGLBlendState::Apply(NCryOpenGL::CContext* pContext)
 void CCryDXGLBlendState::GetDesc(D3D11_BLEND_DESC* pDesc)
 {
    (*pDesc) = m_kDesc;
-}
+}
@@ -75,4 +75,4 @@ LPVOID CCryDXGLBlob::GetBufferPointer()
 SIZE_T CCryDXGLBlob::GetBufferSize()
 {
    return m_uBufferSize;
-}
+}
@@ -41,4 +41,4 @@ private:
    D3D11_BUFFER_DESC m_kDesc;
 };

-#endif //__CRYDXGLBUFFER__
+#endif //__CRYDXGLBUFFER__
@@ -50,4 +50,4 @@ bool CCryDXGLDepthStencilState::Apply(uint32 uStencilReference, NCryOpenGL::CCon
 void CCryDXGLDepthStencilState::GetDesc(D3D11_DEPTH_STENCIL_DESC* pDesc)
 {
    (*pDesc) = m_kDesc;
-}
+}
@@ -53,4 +53,4 @@ NCryOpenGL::SOutputMergerView* CCryDXGLDepthStencilView::GetGLView()
 void CCryDXGLDepthStencilView::GetDesc(D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc)
 {
    *pDesc = m_kDesc;
-}
+}
@@ -44,4 +44,4 @@ protected:
    _smart_ptr<NCryOpenGL::SOutputMergerView> m_spGLView;
 };

-#endif //__CRYDXGLDEPTHSTENCILVIEW__
+#endif //__CRYDXGLDEPTHSTENCILVIEW__
@@ -53,4 +53,4 @@ HRESULT CCryDXGLGIObject::GetParent(REFIID riid, void** ppParent)
    DXGL_TODO("Implement if required")
    * ppParent = NULL;
    return E_FAIL;
-}
+}
@@ -331,4 +331,4 @@ HRESULT CCryDXGLGIOutput::GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats)
 {
    DXGL_NOT_IMPLEMENTED
    return E_FAIL;
-}
+}
@@ -57,4 +57,4 @@ protected:
    DXGI_OUTPUT_DESC m_kDesc;
 };

-#endif //__CRYDXGLGIOUTPUT__
+#endif //__CRYDXGLGIOUTPUT__
--- a/Show More
+++ b/Show More