AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-14 23:56:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for enum combo boxes, and added casing combo box and property ID pools to the property name generator

Browse Source
This commit is contained in:
Aruki
2018-10-12 19:38:08 -06:00
parent ef6759df4a
commit 1d724b69d9
16 changed files with 352 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Core/Resource/Script/CGameTemplate.cpp
View File

@@ -193,7 +193,6 @@ SMessage CGameTemplate::MessageByIndex(u32 Index)
IProperty* CGameTemplate::FindPropertyArchetype(const TString& kTypeName)
{
auto Iter = mPropertyTemplates.find(kTypeName);
ASSERT(Iter != mPropertyTemplates.end()); // Requested archetype property does not exist; missing or malformed template
if (Iter == mPropertyTemplates.end())
{

83
src/Core/Resource/Script/Property/CPropertyNameGenerator.cpp
View File

@@ -28,14 +28,9 @@ void CPropertyNameGenerator::Warmup()
while (!feof(pListFile))
{
char WordBuffer[256];
fgets(&WordBuffer[0], 256, pListFile);
// Capitalize first letter
if (WordBuffer[0] >= 'a' && WordBuffer[0] <= 'z')
{
WordBuffer[0] -= 0x20;
}
char WordBuffer[64];
fgets(&WordBuffer[0], 64, pListFile);
WordBuffer[0] = TString::CharToUpper(WordBuffer[0]);
SWord Word;
Word.Word = TString(WordBuffer).Trimmed();
@@ -53,9 +48,27 @@ void CPropertyNameGenerator::Generate(const SPropertyNameGenerationParameters& r
ASSERT(!mIsRunning);
ASSERT(rkParams.TypeNames.size() > 0);
mGeneratedNames.clear();
mValidTypePairMap.clear();
mIsRunning = true;
mFinishedRunning = false;
// Convert valid type pairs into hashes.
// Also, replace the normal type name list with whatever is in the ID pairs list we were given.
if (!rkParams.ValidIdPairs.empty())
{
mTypeNames.clear();
for (const SPropertyIdTypePair& kPair : rkParams.ValidIdPairs)
{
mValidTypePairMap[ kPair.ID ] = kPair.pkType;
NBasics::VectorAddUnique( mTypeNames, TString(kPair.pkType) );
}
}
else
{
mTypeNames = rkParams.TypeNames;
}
// If we haven't loaded the word list yet, load it.
// If we are still loading the word list, wait until we're finished.
if (!mWordListLoadFinished)
@@ -132,11 +145,22 @@ void CPropertyNameGenerator::Generate(const SPropertyNameGenerationParameters& r
{
int Index = WordCache[RecalcIndex].WordIndex;
// Add an underscore if needed
if (RecalcIndex > 0 && rkParams.UseUnderscores)
LastValidHash.Hash("_");
// For camelcase, hash the first letter of the first word as lowercase
if (RecalcIndex == 0 && rkParams.Casing == ENameCasing::camelCase)
{
const char* pkWord = *mWords[Index].Word;
LastValidHash.Hash( TString::CharToLower( pkWord[0] ) );
LastValidHash.Hash( &pkWord[1] );
}
else
{
// Add an underscore for snake case
if (RecalcIndex > 0 && rkParams.Casing == ENameCasing::Snake_Case)
LastValidHash.Hash("_");
LastValidHash.Hash( *mWords[Index].Word );
}
LastValidHash.Hash( *mWords[Index].Word );
WordCache[RecalcIndex].Hash = LastValidHash;
}
@@ -144,15 +168,15 @@ void CPropertyNameGenerator::Generate(const SPropertyNameGenerationParameters& r
CCRC32 BaseHash = LastValidHash;
BaseHash.Hash( *rkParams.Suffix );
for (int TypeIdx = 0; TypeIdx < rkParams.TypeNames.size(); TypeIdx++)
for (int TypeIdx = 0; TypeIdx < mTypeNames.size(); TypeIdx++)
{
CCRC32 FullHash = BaseHash;
const char* pkTypeName = *rkParams.TypeNames[TypeIdx];
const char* pkTypeName = *mTypeNames[TypeIdx];
FullHash.Hash( pkTypeName );
u32 PropertyID = FullHash.Digest();
// Check if this hash is a property ID
if (NPropertyMap::IsValidPropertyName(PropertyID, pkTypeName))
if (IsValidPropertyID(PropertyID, pkTypeName))
{
SGeneratedPropertyName PropertyName;
NPropertyMap::RetrieveXMLsWithProperty(PropertyID, pkTypeName, PropertyName.XmlList);
@@ -164,7 +188,7 @@ void CPropertyNameGenerator::Generate(const SPropertyNameGenerationParameters& r
{
int Index = WordCache[WordIdx].WordIndex;
if (WordIdx > 0 && rkParams.UseUnderscores)
if (WordIdx > 0 && rkParams.Casing == ENameCasing::Snake_Case)
{
PropertyName.Name += "_";
}
@@ -172,8 +196,13 @@ void CPropertyNameGenerator::Generate(const SPropertyNameGenerationParameters& r
PropertyName.Name += mWords[Index].Word;
}
if (rkParams.Casing == ENameCasing::camelCase)
{
PropertyName.Name[0] = TString::CharToLower( PropertyName.Name[0] );
}
PropertyName.Name += rkParams.Suffix;
PropertyName.Type = rkParams.TypeNames[TypeIdx];
PropertyName.Type = mTypeNames[TypeIdx];
PropertyName.ID = PropertyID;
if (SaveResults)
@@ -184,7 +213,7 @@ void CPropertyNameGenerator::Generate(const SPropertyNameGenerationParameters& r
// If we have too many saved results, then to avoid crashing we will force enable log output.
if (mGeneratedNames.size() > 9999)
{
gpUIRelay->AsyncMessageBox("Warning", "There are over 10,000 results. To avoid memory issues, results will no longer print to the screen. Check the log for the rest of the output.");
gpUIRelay->AsyncMessageBox("Warning", "There are over 10,000 results. Results will no longer print to the screen. Check the log for the remaining output.");
WriteToLog = true;
SaveResults = false;
}
@@ -222,3 +251,21 @@ void CPropertyNameGenerator::Generate(const SPropertyNameGenerationParameters& r
mIsRunning = false;
mFinishedRunning = true;
}
/** Returns whether a given property ID is valid */
bool CPropertyNameGenerator::IsValidPropertyID(u32 ID, const char* pkType)
{
if (!mValidTypePairMap.empty())
{
auto Find = mValidTypePairMap.find(ID);
if (Find != mValidTypePairMap.end())
{
return strcmp( Find->second, pkType ) == 0;
}
else
return false;
}
else
return NPropertyMap::IsValidPropertyName(ID, pkType);
}

31
src/Core/Resource/Script/Property/CPropertyNameGenerator.h
View File

@@ -4,6 +4,21 @@
#include "Core/IProgressNotifier.h"
#include <Common/Common.h>
/** Name casing parameter */
enum class ENameCasing
{
PascalCase,
Snake_Case,
camelCase,
};
/** ID/type pairing for ID pool */
struct SPropertyIdTypePair
{
u32 ID;
const char* pkType;
};
/** Parameters for using the name generator */
struct SPropertyNameGenerationParameters
{
@@ -16,11 +31,14 @@ struct SPropertyNameGenerationParameters
/** Suffix to include at the end of every name */
TString Suffix;
/** Name casing to use */
ENameCasing Casing;
/** List of valid type suffixes */
std::vector<TString> TypeNames;
/** Whether to separate words with underscores */
bool UseUnderscores;
/** List of ID/type pairs to check against. If empty, all properties are valid. */
std::vector<SPropertyIdTypePair> ValidIdPairs;
/** Whether to print the output from the generation process to the log */
bool PrintToLog;
@@ -50,6 +68,12 @@ class CPropertyNameGenerator
/** Whether the generation process finished running */
bool mFinishedRunning;
/** List of valid property types to check against */
std::vector<TString> mTypeNames;
/** Mapping of valid ID/type pairs; if empty, all property names in NPropertyMap are allowed */
std::unordered_map<u32, const char*> mValidTypePairMap;
/** List of words */
struct SWord
{
@@ -74,6 +98,9 @@ public:
/** Run the name generation system */
void Generate(const SPropertyNameGenerationParameters& rkParams, IProgressNotifier* pProgressNotifier);
/** Returns whether a given property ID is valid */
bool IsValidPropertyID(u32 ID, const char* pkType);
/** Accessors */
bool IsRunning() const
{