Skip to content

Commit b48561f

Browse files
vampyvampy
committed
[C] Replace Guid with GUID
See https://en.wikipedia.org/wiki/Universally_unique_identifier
1 parent 1905d61 commit b48561f

17 files changed

+92
-82
lines changed

‎Source/DlgSystem/Private/DlgDialogue.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ void UDlgDialogue::PostInitProperties()
178178

179179
// Used when creating new Dialogues
180180
// Initialize with a valid GUID
181-
if (DialogueVersion >= FDlgDialogueObjectVersion::AddGuid && !GUID.IsValid())
181+
if (DialogueVersion >= FDlgDialogueObjectVersion::AddGUID && !GUID.IsValid())
182182
{
183183
RegenerateGUID();
184184
FDlgLogger::Get().Debugf(
@@ -433,7 +433,7 @@ void UDlgDialogue::ImportFromFileFormat(EDlgDialogueTextFormat TextFormat)
433433

434434
// TODO(vampy): validate if data is legit, indicies exist and that sort.
435435
// Check if Guid is not a duplicate
436-
const TArray<UDlgDialogue*> DuplicateDialogues = UDlgManager::GetDialoguesWithDuplicateGuid();
436+
const TArray<UDlgDialogue*> DuplicateDialogues = UDlgManager::GetDialoguesWithDuplicateGUIDs();
437437
if (DuplicateDialogues.Num() > 0)
438438
{
439439
if (DuplicateDialogues.Contains(this))

‎Source/DlgSystem/Private/DlgManager.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,19 +271,19 @@ TArray<UObject*> UDlgManager::GetAllObjectsWithDialogueParticipantInterface(UObj
271271
return Array;
272272
}
273273

274-
TArray<UDlgDialogue*> UDlgManager::GetDialoguesWithDuplicateGuid()
274+
TArray<UDlgDialogue*> UDlgManager::GetDialoguesWithDuplicateGUIDs()
275275
{
276276
TArray<UDlgDialogue*> Dialogues = GetAllDialoguesFromMemory();
277277
TArray<UDlgDialogue*> DuplicateDialogues;
278278

279-
TSet<FGuid> DialogueGuids;
279+
TSet<FGuid> DialogueGUIDs;
280280
for (UDlgDialogue* Dialogue : Dialogues)
281281
{
282282
const FGuid ID = Dialogue->GetDialogueGUID();
283-
if (DialogueGuids.Find(ID) == nullptr)
283+
if (DialogueGUIDs.Find(ID) == nullptr)
284284
{
285285
// does not exist, good
286-
DialogueGuids.Add(ID);
286+
DialogueGUIDs.Add(ID);
287287
}
288288
else
289289
{
@@ -295,7 +295,7 @@ TArray<UDlgDialogue*> UDlgManager::GetDialoguesWithDuplicateGuid()
295295
return DuplicateDialogues;
296296
}
297297

298-
TMap<FGuid, UDlgDialogue*> UDlgManager::GetAllDialoguesGuidMap()
298+
TMap<FGuid, UDlgDialogue*> UDlgManager::GetAllDialoguesGUIDsMap()
299299
{
300300
TArray<UDlgDialogue*> Dialogues = GetAllDialoguesFromMemory();
301301
TMap<FGuid, UDlgDialogue*> DialoguesMap;
@@ -306,7 +306,7 @@ TMap<FGuid, UDlgDialogue*> UDlgManager::GetAllDialoguesGuidMap()
306306
if (DialoguesMap.Contains(ID))
307307
{
308308
FDlgLogger::Get().Errorf(
309-
TEXT("GetAllDialoguesGuidMap - ID = `%s` for Dialogue = `%s` already exists"),
309+
TEXT("GetAllDialoguesGUIDsMap - ID = `%s` for Dialogue = `%s` already exists"),
310310
*ID.ToString(), *Dialogue->GetPathName()
311311
);
312312
}

‎Source/DlgSystem/Private/DlgMemory.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#include "DlgMemory.h"
33
#include "DlgHelper.h"
44

5-
65
bool FDlgHistory::operator==(const FDlgHistory& Other) const
76
{
87
return FDlgHelper::IsSetEqual(VisitedNodeIndices, Other.VisitedNodeIndices);
@@ -45,8 +44,3 @@ bool FDlgMemory::IsNodeVisited(const FGuid& DialogueGUID, int32 NodeIndex) const
4544
const int32* FoundIndex = History->VisitedNodeIndices.Find(NodeIndex);
4645
return FoundIndex != nullptr;
4746
}
48-
49-
void FDlgMemory::Serialize(FArchive& Ar)
50-
{
51-
Ar << HistoryMap;
52-
}

‎Source/DlgSystem/Private/Tests/DlgIOTesterTypes.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ void FDlgTestStructPrimitives::GenerateRandomData(const FDlgIOTesterOptions& InO
182182
Rotator = FRotator(FMath::SRand(), FMath::SRand(), FMath::SRand());
183183
Matrix = FMatrix(Vector3, FVector(IntPoint), FVector(Vector4), Vector3);
184184
Transform = FTransform(Vector3);
185-
Guid = FGuid::NewGuid();
185+
GUID = FGuid::NewGuid();
186186

187187
const TArray<UClass*> ClassesPool = {
188188
UField::StaticClass(), UStruct::StaticClass(), nullptr, UObject::StaticClass(),
@@ -355,10 +355,10 @@ bool FDlgTestStructPrimitives::IsEqual(const Self& Other, FString& OutError) con
355355
OutError += FString::Printf(TEXT("\tThis.Transform (%s) != Other.Transform (%s)\n"), *Transform.ToString(), *Other.Transform.ToString());
356356
}
357357

358-
if (Guid != Other.Guid)
358+
if (GUID != Other.GUID)
359359
{
360360
bIsEqual = false;
361-
OutError += FString::Printf(TEXT("\tThis.Guid (%s) != Other.Guid (%s)\n"), *Guid.ToString(), *Other.Guid.ToString());
361+
OutError += FString::Printf(TEXT("\tThis.Guid (%s) != Other.Guid (%s)\n"), *GUID.ToString(), *Other.GUID.ToString());
362362
}
363363

364364
if (Class != Other.Class)
@@ -456,7 +456,7 @@ void FDlgTestStructPrimitives::SetToDefaults()
456456
Rotator = FRotator(ForceInitToZero);
457457
Matrix = FMatrix(ForceInitToZero);
458458
Transform = FTransform();
459-
Guid = FGuid();
459+
GUID = FGuid();
460460
Class = nullptr;
461461
EmptyObjectInitialized = nullptr;
462462
EmptyObjectInitializedReference = nullptr;

‎Source/DlgSystem/Public/DlgDialogue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ struct DLGSYSTEM_API FDlgDialogueObjectVersion
2222
UseOnlyOneOutputAndInputPin,
2323
MergeVirtualParentAndSelectorTypes,
2424
ConvertDialogueDataArraysToSets,
25-
AddGuid,
25+
AddGUID,
2626
AddComparisonWithOtherParticipant,
2727
AddTextFormatArguments,
2828
AddLocalizationOverwrittenNamespacesAndKeys,

‎Source/DlgSystem/Public/DlgManager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ class DLGSYSTEM_API UDlgManager : public UBlueprintFunctionLibrary
122122
static TArray<UObject*> GetAllObjectsWithDialogueParticipantInterface(UObject* WorldContextObject);
123123

124124
// Gets all the dialogues that have a duplicate GUID, should not happen, like ever.
125-
static TArray<UDlgDialogue*> GetDialoguesWithDuplicateGuid();
125+
static TArray<UDlgDialogue*> GetDialoguesWithDuplicateGUIDs();
126126

127127
// Helper methods that gets all the dialogues in a map by guid.
128-
static TMap<FGuid, UDlgDialogue*> GetAllDialoguesGuidMap();
128+
static TMap<FGuid, UDlgDialogue*> GetAllDialoguesGUIDsMap();
129129

130130
// Gets all the loaded dialogues from memory that have the ParticipantName included inside them.
131131
static TArray<UDlgDialogue*> GetAllDialoguesForParticipantName(FName ParticipantName);

‎Source/DlgSystem/Public/DlgMemory.h

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ struct DLGSYSTEM_API FDlgHistory
2121

2222
// Singleton to store Dialogue history
2323
// TODO: investigate if this is multiplayer friendly, it does not seem so as there exists only a single global dialogue memory
24-
class DLGSYSTEM_API FDlgMemory
24+
USTRUCT()
25+
struct DLGSYSTEM_API FDlgMemory
2526
{
27+
GENERATED_USTRUCT_BODY()
2628
public:
2729
static FDlgMemory* GetInstance()
2830
{
@@ -56,12 +58,15 @@ class DLGSYSTEM_API FDlgMemory
5658
private:
5759
// Key: Dialogue unique identifier Guid
5860
// Value: set of already visited nodes
61+
UPROPERTY()
5962
TMap<FGuid, FDlgHistory> HistoryMap;
6063
};
6164

62-
// operator overloads for serialization
63-
FORCEINLINE FArchive& operator<<(FArchive &Ar, FDlgHistory& History)
65+
template<>
66+
struct TStructOpsTypeTraits<FDlgHistory> : public TStructOpsTypeTraitsBase2<FDlgHistory>
6467
{
65-
Ar << History.VisitedNodeIndices;
66-
return Ar;
67-
}
68+
enum
69+
{
70+
WithIdenticalViaEquality = true
71+
};
72+
};

‎Source/DlgSystem/Public/Tests/DlgIOTesterTypes.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ struct DLGSYSTEM_API FDlgTestStructPrimitives
197197
KeyHash = HashCombine(KeyHash, GetTypeHash(This.Color));
198198
KeyHash = HashCombine(KeyHash, GetTypeHash(This.DateTime));
199199
KeyHash = HashCombine(KeyHash, GetTypeHash(This.IntPoint));
200-
KeyHash = HashCombine(KeyHash, GetTypeHash(This.Guid));
200+
KeyHash = HashCombine(KeyHash, GetTypeHash(This.GUID));
201201
KeyHash = HashCombine(KeyHash, GetTypeHash(This.Texture2DReference));
202202
return KeyHash;
203203
}
@@ -272,7 +272,7 @@ struct DLGSYSTEM_API FDlgTestStructPrimitives
272272
FTransform Transform;
273273

274274
UPROPERTY()
275-
FGuid Guid;
275+
FGuid GUID;
276276

277277
UPROPERTY()
278278
UClass* Class;

‎Source/DlgSystemEditor/Private/Commandlets/DlgExportTwineCommandlet.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ int32 UDlgExportTwineCommandlet::Main(const FString& Params)
203203
}
204204

205205

206-
FString UDlgExportTwineCommandlet::CreateTwineStoryData(const FString& Name, const FGuid& DialogueGuid, int32 StartNodeIndex, const FString& PassagesData)
206+
FString UDlgExportTwineCommandlet::CreateTwineStoryData(const FString& Name, const FGuid& DialogueGUID, int32 StartNodeIndex, const FString& PassagesData)
207207
{
208208
static const FString Creator = TEXT("UE-NotYetDlgSystem");
209209
static const FString CreatorVersion = TEXT("5.0"); // TODO
@@ -222,13 +222,13 @@ FString UDlgExportTwineCommandlet::CreateTwineStoryData(const FString& Name, con
222222
// tags colors data
223223
TEXT("\n%s\n")
224224
// Special tag to identify the dialogue id
225-
//TEXT("<tw-passagedata pid=\"-1\" tags=\"\" name=\"DialogueGuid\" position=\"0,0\" size=\"10,10\">%s</tw-passagedata>\n")
225+
//TEXT("<tw-passagedata pid=\"-1\" tags=\"\" name=\"DialogueGUID\" position=\"0,0\" size=\"10,10\">%s</tw-passagedata>\n")
226226

227227
TEXT("%s\n")
228228

229229
TEXT("</tw-storydata>"),
230230
*Name, StartNodeIndex + 2, *Creator, *CreatorVersion,
231-
*DialogueGuid.ToString(EGuidFormats::DigitsWithHyphens), Zoom, *Format, *FormatVersion,
231+
*DialogueGUID.ToString(EGuidFormats::DigitsWithHyphens), Zoom, *Format, *FormatVersion,
232232
*CreateTwineCustomCss(),
233233
*CreateTwineTagColorsData(),
234234
*PassagesData

‎Source/DlgSystemEditor/Private/Commandlets/DlgHumanReadableTextCommandlet.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ int32 UDlgHumanReadableTextCommandlet::Import()
167167
UE_LOG(LogDlgHumanReadableTextCommandlet, Display, TEXT("Importing from = `%s`"), *OutputInputDirectory);
168168

169169
PackagesToSave.Empty();
170-
TMap<FGuid, UDlgDialogue*> DialoguesMap = UDlgManager::GetAllDialoguesGuidMap();
170+
TMap<FGuid, UDlgDialogue*> DialoguesMap = UDlgManager::GetAllDialoguesGUIDsMap();
171171
IPlatformFile& PlatformFile = FPlatformFileManager::Get().GetPlatformFile();
172172

173173
// Find all files
@@ -201,13 +201,13 @@ int32 UDlgHumanReadableTextCommandlet::Import()
201201

202202

203203
// Find Dialogue
204-
UDlgDialogue** DialoguePtr = DialoguesMap.Find(HumanFormat.DialogueGuid);
204+
UDlgDialogue** DialoguePtr = DialoguesMap.Find(HumanFormat.DialogueGUID);
205205
if (DialoguePtr == nullptr)
206206
{
207207
UE_LOG(LogDlgHumanReadableTextCommandlet,
208208
Error,
209209
TEXT("Can't find Dialogue for GUID = `%s`, DialogueName = `%s` from File = `%s`"),
210-
*HumanFormat.DialogueGuid.ToString(), *HumanFormat.DialogueName.ToString(), *File);
210+
*HumanFormat.DialogueGUID.ToString(), *HumanFormat.DialogueName.ToString(), *File);
211211
continue;
212212
}
213213

@@ -225,7 +225,7 @@ int32 UDlgHumanReadableTextCommandlet::Import()
225225
bool UDlgHumanReadableTextCommandlet::ExportDialogueToHumanReadableFormat(const UDlgDialogue& Dialogue, FDlgDialogue_FormatHumanReadable& OutFormat)
226226
{
227227
OutFormat.DialogueName = Dialogue.GetDialogueFName();
228-
OutFormat.DialogueGuid = Dialogue.GetDialogueGUID();
228+
OutFormat.DialogueGUID = Dialogue.GetDialogueGUID();
229229

230230
// Root Node
231231
{

0 commit comments

Comments
 (0)