Add missing serialization and empty ctor to CultureInfo

This commit is contained in:
2026-07-17 17:27:44 +02:00
parent c3e9edc42f
commit a8f35d2412
2 changed files with 54 additions and 0 deletions
@@ -35,6 +35,11 @@ namespace
}
};
CultureInfo::CultureInfo()
: CultureInfo(127) // Invariant Culture
{
}
CultureInfo::CultureInfo(int32 lcid)
{
_lcid = lcid;
@@ -150,6 +155,11 @@ bool CultureInfo::operator==(const CultureInfo& other) const
return _lcid == other._lcid;
}
bool CultureInfo::operator!=(const CultureInfo& other) const
{
return _lcid != other._lcid;
}
void* MUtils::ToManaged(const CultureInfo& value)
{
#if USE_CSHARP
@@ -187,3 +197,24 @@ CultureInfo MUtils::ToNative(void* value)
#endif
return CultureInfo(lcid);
}
void Serialization::Serialize(ISerializable::SerializeStream& stream, const CultureInfo& v, const void* otherObj)
{
stream.String(v.GetName());
}
void Serialization::Deserialize(ISerializable::DeserializeStream& stream, CultureInfo& v, ISerializeModifier* modifier)
{
if (stream.IsString())
{
v = CultureInfo(stream.GetText());
}
else if (stream.IsInt())
{
v = CultureInfo(stream.GetInt());
}
else
{
v = CultureInfo();
}
}
+23
View File
@@ -4,6 +4,7 @@
#include "Engine/Core/Types/String.h"
#include "Engine/Core/Formatting.h"
#include "Engine/Serialization/SerializationFwd.h"
/// <summary>
/// The information about a specific culture (aka locale). The information includes the names for the culture, the writing system, the calendar used, the sort order of strings, and formatting for dates and numbers.
@@ -21,6 +22,11 @@ private:
String _englishName;
public:
/// <summary>
/// Initializes a new instance of the <see cref="CultureInfo"/> class.
/// </summary>
CultureInfo();
/// <summary>
/// Initializes a new instance of the <see cref="CultureInfo"/> class.
/// </summary>
@@ -67,6 +73,7 @@ public:
String ToString() const;
bool operator==(const CultureInfo& other) const;
bool operator!=(const CultureInfo& other) const;
};
DEFINE_DEFAULT_FORMATTING_VIA_TO_STRING(CultureInfo);
@@ -76,3 +83,19 @@ namespace MUtils
extern void* ToManaged(const CultureInfo& value);
extern CultureInfo ToNative(void* value);
}
inline uint32 GetHash(const CultureInfo& key)
{
return (uint32)key.GetLCID();
}
namespace Serialization
{
inline bool ShouldSerialize(const CultureInfo& v, const void* otherObj)
{
return !otherObj || v != *(CultureInfo*)otherObj;
}
FLAXENGINE_API void Serialize(ISerializable::SerializeStream& stream, const CultureInfo& v, const void* otherObj);
FLAXENGINE_API void Deserialize(ISerializable::DeserializeStream& stream, CultureInfo& v, ISerializeModifier* modifier);
}