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

Gems/Maestro

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-02 11:44:34 -07:00
parent b9cfce8165
commit db7536acda
25 changed files with 68 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/Export/ExportManager.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ namespace
SEfResTexture* pTex = pRes->GetTextureResource(nSlot);
if (pTex)
{
cry_strcat(outName, Path::GamePathToFullPath(pTex->m_Name.c_str()).toUtf8().data());
azstrcat(outName, Path::GamePathToFullPath(pTex->m_Name.c_str()).toUtf8().data());
}
}
Code/Editor/TrackView/CommentNodeAnimator.cpp
+1 -1
View File
@@ -92,7 +92,7 @@ void CCommentNodeAnimator::AnimateCommentTextTrack(CTrackViewTrack* pTrack, cons
if (commentKey.m_duration > 0 && ac.time < keyHandle.GetTime() + commentKey.m_duration)
{
m_commentContext.m_strComment = commentKey.m_strComment;
cry_strcpy(m_commentContext.m_strFont, commentKey.m_strFont.c_str());
azstrcpy(m_commentContext.m_strFont, commentKey.m_strFont.c_str());
m_commentContext.m_color = commentKey.m_color;
m_commentContext.m_align = commentKey.m_align;
m_commentContext.m_size = commentKey.m_size;
Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
+3 -3
View File
@@ -2808,10 +2808,10 @@ void CTrackViewDopeSheetBase::DrawKeys(CTrackViewTrack* pTrack, QPainter* painte
}
else
{
cry_strcpy(keydesc, "{");
azstrcpy(keydesc, "{");
}
cry_strcat(keydesc, pDescription);
cry_strcat(keydesc, "}");
azstrcat(keydesc, pDescription);
azstrcat(keydesc, "}");
// Draw key description text.
// Find next key.
const QRect textRect(QPoint(x + 10, rect.top()), QPoint(x1, rect.bottom()));
Code/Editor/TrackView/TrackViewNodes.cpp
+1 -1
View File
@@ -2516,7 +2516,7 @@ int CTrackViewNodesCtrl::GetMatNameAndSubMtlIndexFromName(QString& matName, cons
if (const char* pCh = strstr(nodeName, ".["))
{
char matPath[MAX_PATH];
cry_strcpy(matPath, nodeName, (size_t)(pCh - nodeName));
azstrcpy(matPath, nodeName, (size_t)(pCh - nodeName));
matName = matPath;
pCh += 2;
if ((*pCh) != 0)
Code/Legacy/CryCommon/ISurfaceType.h
+7 -7
View File
@@ -85,7 +85,7 @@ struct ISurfaceType
};
struct SBreakable2DParams
{
string particle_effect;
AZStd::string particle_effect;
float blast_radius;
float blast_radius_first;
float vert_size_spread;
@@ -97,12 +97,12 @@ struct ISurfaceType
float shard_density;
int use_edge_alpha;
float crack_decal_scale;
string crack_decal_mtl;
AZStd::string crack_decal_mtl;
float max_fracture;
string full_fracture_fx;
string fracture_fx;
AZStd::string full_fracture_fx;
AZStd::string fracture_fx;
int no_procedural_full_fracture;
string broken_mtl;
AZStd::string broken_mtl;
float destroy_timeout;
float destroy_timeout_spread;
@@ -125,8 +125,8 @@ struct ISurfaceType
};
struct SBreakageParticles
{
string type;
string particle_effect;
AZStd::string type;
AZStd::string particle_effect;
int count_per_unit;
float count_scale;
float scale;
Code/Legacy/CryCommon/Mocks/IRendererMock.h
+1 -1
View File
@@ -283,7 +283,7 @@ public:
MOCK_METHOD0(EF_GetShaderMissLogPath,
const char*());
MOCK_METHOD1(EF_GetShaderNames,
string * (int& nNumShaders));
AZStd::string * (int& nNumShaders));
MOCK_METHOD1(EF_ReloadFile,
bool(const char* szFileName));
MOCK_METHOD1(EF_ReloadFile_Request,
Code/Legacy/CryCommon/Mocks/ISystemMock.h
+1 -1
View File
@@ -122,7 +122,7 @@ public:
const SFileVersion&());
MOCK_METHOD1(AddCVarGroupDirectory,
void(const string&));
void(const AZStd::string&));
MOCK_METHOD0(SaveConfiguration,
void());
MOCK_METHOD3(LoadConfiguration,
Code/Legacy/CryCommon/WinBase.cpp
+5 -5
View File
@@ -349,23 +349,23 @@ void _makepath(char* path, const char* drive, const char* dir, const char* filen
}
if (dir && dir[0])
{
cry_strcat(tmp, dir);
azstrcat(tmp, dir);
ch = tmp[strlen(tmp) - 1];
if (ch != '/' && ch != '\\')
{
cry_strcat(tmp, "\\");
azstrcat(tmp, "\\");
}
}
if (filename && filename[0])
{
cry_strcat(tmp, filename);
azstrcat(tmp, filename);
if (ext && ext[0])
{
if (ext[0] != '.')
{
cry_strcat(tmp, ".");
azstrcat(tmp, ".");
}
cry_strcat(tmp, ext);
azstrcat(tmp, ext);
}
}
azstrcpy(path, strlen(tmp) + 1, tmp);
Code/Legacy/CryCommon/platform_impl.cpp
+1 -1
View File
@@ -499,7 +499,7 @@ inline void CryDebugStr([[maybe_unused]] const char* format, ...)
va_start(ArgList, format);
azvsnprintf(szBuffer,sizeof(szBuffer)-1, format, ArgList);
va_end(ArgList);
cry_strcat(szBuffer,"\n");
azstrcat(szBuffer,"\n");
OutputDebugString(szBuffer);
#endif
*/
Code/Legacy/CrySystem/XConsole.cpp
+1 -1
View File
@@ -1545,7 +1545,7 @@ const char* CXConsole::GetFlagsString(const uint32 dwFlags)
static char sFlags[256];
// hiding this makes it a bit more difficult for cheaters
// if(dwFlags&VF_CHEAT) cry_strcat( sFlags,"CHEAT, ");
// if(dwFlags&VF_CHEAT) azstrcat( sFlags,"CHEAT, ");
azstrcpy(sFlags, "");
Code/Tools/CrashHandler/Support/include/CrashSupport.h
+10 -14
View File
@@ -11,6 +11,8 @@
#pragma once
#include <AzCore/PlatformDef.h>
#include <AzCore/std/string/conversions.h>
#include <AzCore/Utils/Utils.h>
#include <algorithm>
#include <string>
@@ -23,30 +25,24 @@
namespace CrashHandler
{
std::string GetTimeString();
void GetExecutablePathA(char* pathBuffer, int& bufferSize);
void GetExecutablePathW(wchar_t* pathBuffer, int& bufferSize);
void GetTimeInfo(tm& curTime);
template <typename T>
inline void GetExecutablePath(T& returnPath)
inline void GetExecutablePath(std::string& returnPath)
{
char currentFileName[CRASH_HANDLER_MAX_PATH_LEN] = { 0 };
int bufferLen{ CRASH_HANDLER_MAX_PATH_LEN };
GetExecutablePathA(currentFileName, bufferLen);
AZ::Utils::GetExecutablePath(currentFileName, CRASH_HANDLER_MAX_PATH_LEN);
returnPath = currentFileName;
std::replace(returnPath.begin(), returnPath.end(), '\\', '/');
}
template <>
inline void GetExecutablePath<std::wstring>(std::wstring& returnPath)
inline void GetExecutablePath(std::wstring& returnPathW)
{
wchar_t currentFileName[CRASH_HANDLER_MAX_PATH_LEN] = { 0 };
int bufferLen{ CRASH_HANDLER_MAX_PATH_LEN };
GetExecutablePathW(currentFileName, bufferLen);
returnPath = currentFileName;
std::replace(returnPath.begin(), returnPath.end(), '\\', '/');
std::string returnPath;
GetExecutablePath(returnPath);
wchar_t currentFileNameW[CRASH_HANDLER_MAX_PATH_LEN] = { 0 };
AZStd::to_wstring(currentFileNameW, CRASH_HANDLER_MAX_PATH_LEN, returnPath.c_str(), returnPath.size());
returnPathW = currentFileNameW;
}
template<typename T>
Gems/Blast/Code/Source/Components/BlastSystemComponent.cpp
+1
View File
@@ -32,6 +32,7 @@
#include <AzToolsFramework/API/ToolsApplicationAPI.h>
#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
#endif
#include <CryCommon/ISystem.h>
namespace Blast
{
Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp
+3 -3
View File
@@ -2362,10 +2362,10 @@ void CUiAnimViewDopeSheetBase::DrawKeys(CUiAnimViewTrack* pTrack, QPainter* pain
}
else
{
cry_strcpy(keydesc, "{");
azstrcpy(keydesc, "{");
}
cry_strcat(keydesc, pDescription);
cry_strcat(keydesc, "}");
azstrcat(keydesc, pDescription);
azstrcat(keydesc, "}");
// Draw key description text.
// Find next key.
const QRect textRect(QPoint(x + 10, rect.top()), QPoint(x1, rect.bottom()));
Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.h
+3 -3
View File
@@ -144,7 +144,7 @@ private:
{
public:
BehaviorPropertyInfo() {}
BehaviorPropertyInfo(const string& name)
BehaviorPropertyInfo(const AZStd::string& name)
{
*this = name;
}
@@ -154,7 +154,7 @@ private:
m_animNodeParamInfo.paramType = other.m_displayName;
m_animNodeParamInfo.name = &m_displayName[0];
}
BehaviorPropertyInfo& operator=(const string& str)
BehaviorPropertyInfo& operator=(const AZStd::string& str)
{
// TODO: clean this up - this weird memory sharing was copied from legacy Cry - could be better.
m_displayName = str;
@@ -163,7 +163,7 @@ private:
return *this;
}
string m_displayName;
AZStd::string m_displayName;
SParamInfo m_animNodeParamInfo;
};
Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp
+1 -1
View File
@@ -39,7 +39,7 @@ public:
virtual void GetDefault(bool& val) const = 0;
virtual void GetDefault(Vec4& val) const = 0;
string m_name;
AZStd::string m_name;
protected:
virtual ~CControlParamBase(){}
Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp
+2 -15
View File
@@ -98,10 +98,10 @@ void CAnimSequence::SetName(const char* name)
return; // should never happen, null pointer guard
}
string originalName = GetName();
AZStd::string originalName = GetName();
m_name = name;
m_pMovieSystem->OnSequenceRenamed(originalName, m_name.c_str());
m_pMovieSystem->OnSequenceRenamed(originalName.c_str(), m_name.c_str());
// the sequence named LIGHT_ANIMATION_SET_NAME is a singleton sequence to hold all light animations.
if (m_name == LIGHT_ANIMATION_SET_NAME)
@@ -744,9 +744,6 @@ void CAnimSequence::Deactivate()
static_cast<CAnimNode*>(animNode)->OnReset();
}
// Remove a possibly cached game hint associated with this anim sequence.
stack_string sTemp("anim_sequence_");
sTemp += m_name.c_str();
// Audio: Release precached sound
m_bActive = false;
@@ -776,16 +773,6 @@ void CAnimSequence::PrecacheStatic(const float startTime)
return;
}
// Try to cache this sequence's game hint if one exists.
stack_string sTemp("anim_sequence_");
sTemp += m_name.c_str();
//if (gEnv->pAudioSystem)
{
// Make sure to use the non-serializable game hint type as trackview sequences get properly reactivated after load
// Audio: Precache sound
}
gEnv->pLog->Log("=== Precaching render data for cutscene: %s ===", GetName());
m_precached = true;
Gems/Maestro/Code/Source/Cinematics/AnimSequence.h
+1 -1
View File
@@ -174,7 +174,7 @@ private:
uint32 m_id;
AZStd::string m_name;
mutable string m_fullNameHolder;
mutable AZStd::string m_fullNameHolder;
Range m_timeRange;
TrackEvents m_events;
Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.cpp
+5 -5
View File
@@ -457,31 +457,31 @@ void CCompoundSplineTrack::GetKeyInfo(int key, const char*& description, float&
{
float dummy;
m_subTracks[0]->GetKeyInfo(m, subDesc, dummy);
cry_strcat(str, subDesc);
azstrcat(str, subDesc);
break;
}
}
if (m == m_subTracks[0]->GetNumKeys())
{
cry_strcat(str, m_subTrackNames[0].c_str());
azstrcat(str, m_subTrackNames[0].c_str());
}
// Tail cases
for (int i = 1; i < GetSubTrackCount(); ++i)
{
cry_strcat(str, ",");
azstrcat(str, ",");
for (m = 0; m < m_subTracks[i]->GetNumKeys(); ++m)
{
if (m_subTracks[i]->GetKeyTime(m) == time)
{
float dummy;
m_subTracks[i]->GetKeyInfo(m, subDesc, dummy);
cry_strcat(str, subDesc);
azstrcat(str, subDesc);
break;
}
}
if (m == m_subTracks[i]->GetNumKeys())
{
cry_strcat(str, m_subTrackNames[i].c_str());
azstrcat(str, m_subTrackNames[i].c_str());
}
}
}
Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.h
+1 -1
View File
@@ -108,7 +108,7 @@ public:
virtual int NextKeyByTime(int key) const;
void SetSubTrackName(const int i, const string& name) { assert (i < MAX_SUBTRACKS); m_subTrackNames[i] = name; }
void SetSubTrackName(const int i, const AZStd::string& name) { assert (i < MAX_SUBTRACKS); m_subTrackNames[i] = name; }
#ifdef MOVIESYSTEM_SUPPORT_EDITING
virtual ColorB GetCustomColor() const
Gems/Maestro/Code/Source/Cinematics/EventTrack.cpp
+2 -2
View File
@@ -72,8 +72,8 @@ void CEventTrack::GetKeyInfo(int key, const char*& description, float& duration)
azstrcpy(desc, m_keys[key].event.c_str());
if (!m_keys[key].eventValue.empty())
{
cry_strcat(desc, ", ");
cry_strcat(desc, m_keys[key].eventValue.c_str());
azstrcat(desc, ", ");
azstrcat(desc, m_keys[key].eventValue.c_str());
}
description = desc;
Gems/Maestro/Code/Source/Cinematics/MaterialNode.h
+1 -1
View File
@@ -58,7 +58,7 @@ private:
float m_fMaxKeyValue;
std::vector< CAnimNode::SParamInfo > m_dynamicShaderParamInfos;
typedef AZStd::unordered_map< string, size_t, stl::hash_string_caseless<string>, stl::equality_string_caseless<string> > TDynamicShaderParamsMap;
typedef AZStd::unordered_map<AZStd::string, size_t, stl::hash_string_caseless<AZStd::string>, stl::equality_string_caseless<AZStd::string> > TDynamicShaderParamsMap;
TDynamicShaderParamsMap m_nameToDynamicShaderParam;
};
Gems/Maestro/Code/Source/Cinematics/Movie.cpp
+11 -12
View File
@@ -75,19 +75,19 @@ static SMovieSequenceAutoComplete s_movieSequenceAutoComplete;
// Serialization for anim nodes & param types
#define REGISTER_NODE_TYPE(name) assert(g_animNodeEnumToStringMap.find(AnimNodeType::name) == g_animNodeEnumToStringMap.end()); \
g_animNodeEnumToStringMap[AnimNodeType::name] = STRINGIFY(name); \
g_animNodeStringToEnumMap[string(STRINGIFY(name))] = AnimNodeType::name;
g_animNodeStringToEnumMap[AZStd::string(STRINGIFY(name))] = AnimNodeType::name;
#define REGISTER_PARAM_TYPE(name) assert(g_animParamEnumToStringMap.find(AnimParamType::name) == g_animParamEnumToStringMap.end()); \
g_animParamEnumToStringMap[AnimParamType::name] = STRINGIFY(name); \
g_animParamStringToEnumMap[string(STRINGIFY(name))] = AnimParamType::name;
g_animParamStringToEnumMap[AZStd::string(STRINGIFY(name))] = AnimParamType::name;
namespace
{
AZStd::unordered_map<AnimNodeType, string> g_animNodeEnumToStringMap;
StaticInstance<std::map<string, AnimNodeType, stl::less_stricmp<string> >> g_animNodeStringToEnumMap;
AZStd::unordered_map<AnimNodeType, AZStd::string> g_animNodeEnumToStringMap;
StaticInstance<std::map<AZStd::string, AnimNodeType, stl::less_stricmp<AZStd::string> >> g_animNodeStringToEnumMap;
AZStd::unordered_map<AnimParamType, string> g_animParamEnumToStringMap;
StaticInstance<std::map<string, AnimParamType, stl::less_stricmp<string> >> g_animParamStringToEnumMap;
AZStd::unordered_map<AnimParamType, AZStd::string> g_animParamEnumToStringMap;
StaticInstance<std::map<AZStd::string, AnimParamType, stl::less_stricmp<AZStd::string> >> g_animParamStringToEnumMap;
// If you get an assert in this function, it means two node types have the same enum value.
void RegisterNodeTypes()
@@ -1479,8 +1479,7 @@ void CMovieSystem::GoToFrame(const char* seqName, float targetFrame)
if (gEnv->IsEditor() && gEnv->IsEditorGameMode() == false)
{
string editorCmd;
editorCmd.Format("mov_goToFrameEditor %s %f", seqName, targetFrame);
AZStd::string editorCmd = AZStd::string::format("mov_goToFrameEditor %s %f", seqName, targetFrame);
gEnv->pConsole->ExecuteString(editorCmd.c_str());
return;
}
@@ -1679,7 +1678,7 @@ void CMovieSystem::SerializeNodeType(AnimNodeType& animNodeType, XmlNodeRef& xml
{
const char* pTypeString = "Invalid";
assert(g_animNodeEnumToStringMap.find(animNodeType) != g_animNodeEnumToStringMap.end());
pTypeString = g_animNodeEnumToStringMap[animNodeType];
pTypeString = g_animNodeEnumToStringMap[animNodeType].c_str();
xmlNode->setAttr(kType, pTypeString);
}
}
@@ -1780,7 +1779,7 @@ void CMovieSystem::SaveParamTypeToXml(const CAnimParamType& animParamType, XmlNo
}
assert(g_animParamEnumToStringMap.find(animParamType.m_type) != g_animParamEnumToStringMap.end());
pTypeString = g_animParamEnumToStringMap[animParamType.m_type];
pTypeString = g_animParamEnumToStringMap[animParamType.m_type].c_str();
}
xmlNode->setAttr(kParamType, pTypeString);
@@ -1815,7 +1814,7 @@ const char* CMovieSystem::GetParamTypeName(const CAnimParamType& animParamType)
{
if (g_animParamEnumToStringMap.find(animParamType.m_type) != g_animParamEnumToStringMap.end())
{
return g_animParamEnumToStringMap[animParamType.m_type];
return g_animParamEnumToStringMap[animParamType.m_type].c_str();
}
}
@@ -1970,7 +1969,7 @@ CLightAnimWrapper* CLightAnimWrapper::FindLightAnim(const char* name)
//////////////////////////////////////////////////////////////////////////
void CLightAnimWrapper::CacheLightAnim(const char* name, CLightAnimWrapper* p)
{
ms_lightAnimWrapperCache.insert(LightAnimWrapperCache::value_type(string(name), p));
ms_lightAnimWrapperCache.insert(LightAnimWrapperCache::value_type(AZStd::string(name), p));
}
//////////////////////////////////////////////////////////////////////////
Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp
+2 -2
View File
@@ -917,7 +917,7 @@ void CAnimSceneNode::ApplyEventKey(IEventKey& key, [[maybe_unused]] SAnimContext
{
char funcName[1024];
azstrcpy(funcName, "Event_");
cry_strcat(funcName, key.event.c_str());
azstrcat(funcName, key.event.c_str());
gEnv->pMovieSystem->SendGlobalEvent(funcName);
}
@@ -1003,7 +1003,7 @@ void CAnimSceneNode::ApplyGotoKey(CGotoTrack* poGotoTrack, SAnimContext& ec)
{
if (stDiscreteFloadKey.m_fValue >= 0)
{
string fullname = m_pSequence->GetName();
AZStd::string fullname = m_pSequence->GetName();
GetMovieSystem()->GoToFrame(fullname.c_str(), stDiscreteFloadKey.m_fValue);
}
}
Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ void CScreenFaderTrack::GetKeyInfo(int key, const char*& description, float& dur
CheckValid();
description = 0;
duration = m_keys[key].m_fadeTime;
cry_strcpy(desc, m_keys[key].m_fadeType == IScreenFaderKey::eFT_FadeIn ? "In" : "Out");
azstrcpy(desc, m_keys[key].m_fadeType == IScreenFaderKey::eFT_FadeIn ? "In" : "Out");
description = desc;
}
Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.cpp
+2 -2
View File
@@ -146,8 +146,8 @@ void CTrackEventTrack::GetKeyInfo(int key, const char*& description, float& dura
azstrcpy(desc, m_keys[key].event.c_str());
if (!m_keys[key].eventValue.empty())
{
cry_strcat(desc, ", ");
cry_strcat(desc, m_keys[key].eventValue.c_str());
azstrcat(desc, ", ");
azstrcat(desc, m_keys[key].eventValue.c_str());
}
description = desc;