fixing build
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
@@ -254,7 +254,7 @@ namespace Path
|
||||
}
|
||||
AZStd::string str(GetGameAssetsFolder());
|
||||
str += "Mods\\";
|
||||
str += s_currentModName;
|
||||
str += s_currentModName.c_str();
|
||||
return str;
|
||||
}
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
#include "CrySizer.h"
|
||||
#include "CryEndian.h"
|
||||
#include "TypeInfo_impl.h"
|
||||
#include <AzCore/std/string/fixed_string.h>
|
||||
|
||||
// Traits
|
||||
#if defined(AZ_RESTRICTED_PLATFORM)
|
||||
@@ -131,9 +132,9 @@ const CTypeInfo&PtrTypeInfo()
|
||||
// bool
|
||||
AZStd::string ToString(bool const& val)
|
||||
{
|
||||
static AZStd::fixed_string sTrue = "true";
|
||||
static AZStd::fixed_string sFalse = "false";
|
||||
return val ? sTrue : sFalse;
|
||||
static AZStd::fixed_string<5> sTrue = "true";
|
||||
static AZStd::fixed_string<6> sFalse = "false";
|
||||
return val ? sTrue.c_str() : sFalse.c_str();
|
||||
}
|
||||
|
||||
bool FromString(bool& val, cstr s)
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <AzCore/std/string/string.h>
|
||||
#include <AzCore/RTTI/RTTI.h>
|
||||
#include <SceneAPI/SceneCore/DataTypes/Rules/IRule.h>
|
||||
#include <AzCore/std/string/fixed_string.h>
|
||||
|
||||
namespace AZ
|
||||
{
|
||||
@@ -18,7 +19,7 @@ namespace AZ
|
||||
{
|
||||
namespace DataTypes
|
||||
{
|
||||
const static AZStd::fixed_string s_advancedDisabledString = "Disabled";
|
||||
static AZStd::string s_advancedDisabledString = "Disabled";
|
||||
|
||||
class IMeshAdvancedRule
|
||||
: public IRule
|
||||
|
||||
@@ -18,11 +18,6 @@ namespace AZ
|
||||
{
|
||||
namespace DataTypes = AZ::SceneAPI::DataTypes;
|
||||
|
||||
const AZStd::fixed_string<8> MaterialData::s_DiffuseMapName = "Diffuse";
|
||||
const AZStd::fixed_string<9> MaterialData::s_SpecularMapName = "Specular";
|
||||
const AZStd::fixed_string<5> MaterialData::s_BumpMapName = "Bump";
|
||||
const AZStd::fixed_string<1> MaterialData::s_emptyString = "";
|
||||
|
||||
MaterialData::MaterialData()
|
||||
: m_isNoDraw(false)
|
||||
, m_diffuseColor(AZ::Vector3::CreateOne())
|
||||
@@ -72,7 +67,7 @@ namespace AZ
|
||||
return result->second;
|
||||
}
|
||||
|
||||
return s_emptyString;
|
||||
return m_emptyString;
|
||||
}
|
||||
|
||||
void MaterialData::SetNoDraw(bool isNoDraw)
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <SceneAPI/SceneData/SceneDataConfiguration.h>
|
||||
#include <SceneAPI/SceneCore/DataTypes/GraphData/IMaterialData.h>
|
||||
#include <AzCore/std/containers/unordered_map.h>
|
||||
#include <AzCore/std/string/fixed_string.h>
|
||||
|
||||
namespace AZ
|
||||
{
|
||||
@@ -96,10 +97,7 @@ namespace AZ
|
||||
|
||||
bool m_isNoDraw;
|
||||
|
||||
const static AZStd::fixed_string<8> s_DiffuseMapName;
|
||||
const static AZStd::fixed_string<9> s_SpecularMapName;
|
||||
const static AZStd::fixed_string<5> s_BumpMapName;
|
||||
const static AZStd::fixed_string<1> s_emptyString;
|
||||
const AZStd::string m_emptyString;
|
||||
|
||||
// A unique id which is used to identify a material in a fbx.
|
||||
// This is the same as the ID in the fbx file's FbxNode
|
||||
|
||||
Reference in New Issue
Block a user