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

Merge branch 'development' into cmake/warn_format_security

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	cmake/Platform/Common/Clang/Configurations_clang.cmake
This commit is contained in:
Esteban Papp
2021-09-03 11:10:40 -07:00
parent 0df55c3a7f 5851031d2e
commit 522e4bff9e
641 changed files with 32438 additions and 32687 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Legacy/CryCommon/AppleSpecific.h
-4
View File
@@ -13,10 +13,6 @@
#define CRYINCLUDE_CRYCOMMON_APPLESPECIFIC_H
#pragma once
#if defined(__clang__)
#pragma diagnostic ignore "-W#pragma-messages"
#endif
//////////////////////////////////////////////////////////////////////////
// Standard includes.
//////////////////////////////////////////////////////////////////////////
Code/Legacy/CryCommon/IConsole.h
-4
View File
@@ -118,10 +118,6 @@ struct IConsoleVarSink
// </interfuscator:shuffle>
};
#if defined(GetCommandLine)
#undef GetCommandLine
#endif
// Interface to the arguments of the console command.
struct IConsoleCmdArgs
{
Code/Legacy/CryCommon/LyShine/IDraw2d.h
-52
View File
@@ -12,9 +12,6 @@
#include <AzCore/Math/Color.h>
#include <AzCore/std/string/string.h>
// Forward declarations
struct IFFont;
////////////////////////////////////////////////////////////////////////////////////////////////////
//! Class for 2D drawing in screen space
//
@@ -58,55 +55,6 @@ public: // types
MAX_TEXT_STRING_LENGTH = 1024,
};
enum : int
{
//! Constant that indicates the built-in default value should be used
UseDefault = -1
};
//! Struct used to pass additional image options.
//
//! If this is not passed then the defaults below are used
struct ImageOptions
{
int blendMode; //!< default is GS_BLSRC_SRCALPHA|GS_BLDST_ONEMINUSSRCALPHA
AZ::Vector3 color; //!< default is (1,1,1)
Rounding pixelRounding; //!< default is Rounding::Nearest
int baseState; //!< Additional flags for SetState. Default is GS_NODEPTHTEST
};
//! Struct used to pass additional text options - mostly ones that do not change from call to call.
//
//! If this is not passed then the defaults below are used
struct TextOptions
{
AZStd::string fontName; //!< default is "default"
unsigned int effectIndex; //!< default is 0
AZ::Vector3 color; //!< default is (1,1,1)
HAlign horizontalAlignment; //!< default is HAlign::Left
VAlign verticalAlignment; //!< default is VAlign::Top
AZ::Vector2 dropShadowOffset; //!< default is (0,0), zero offset means no drop shadow is drawn
AZ::Color dropShadowColor; //!< default is (0,0,0,0), zero alpha means no drop shadow is drawn
float rotation; //!< default is 0
int baseState; //!< Additional flags for SetState. Default is GS_NODEPTHTEST
};
//! Used to pass in arrays of vertices (e.g. to DrawQuad)
struct VertexPosColUV
{
VertexPosColUV(){}
VertexPosColUV(const AZ::Vector2& inPos, const AZ::Color& inColor, const AZ::Vector2& inUV)
{
position = inPos;
color = inColor;
uv = inUV;
}
AZ::Vector2 position; //!< 2D position of vertex
AZ::Color color; //!< Float color
AZ::Vector2 uv; //!< Texture coordinate
};
public: // member functions
//! Implement virtual destructor just for safety.