AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-18 09:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make enum properties track the enumerator ID internally instead of the index + CUniqueID bugfix

Browse Source
This commit is contained in:
parax0
2016-02-10 18:48:34 -07:00
parent 739e3c51bf
commit 7bd97f0fce
9 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Resource/Cooker/CScriptCooker.cpp
View File

@@ -36,9 +36,7 @@ void CScriptCooker::WriteProperty(IProperty *pProp)
case eEnumProperty:
{
TEnumProperty *pEnumCast = static_cast<TEnumProperty*>(pProp);
CEnumTemplate *pEnumTemp = static_cast<CEnumTemplate*>(pEnumCast->Template());
u32 ID = pEnumTemp->EnumeratorID(pEnumCast->Get());
mpSCLY->WriteLong(ID);
mpSCLY->WriteLong(pEnumCast->Get());
break;
}

9
src/Core/Resource/Factory/CScriptLoader.cpp
View File

@@ -63,9 +63,12 @@ void CScriptLoader::ReadProperty(IProperty *pProp, u32 Size, IInputStream& SCLY)
TEnumProperty *pEnumCast = static_cast<TEnumProperty*>(pProp);
CEnumTemplate *pEnumTemp = static_cast<CEnumTemplate*>(pTemp);
u32 ID = SCLY.ReadLong();
u32 index = pEnumTemp->EnumeratorIndex(ID);
if (index == -1) Log::FileError(SCLY.GetSourceString(), SCLY.Tell() - 4, "Enum property \"" + pEnumTemp->Name() + "\" in struct \"" + pTemp->Name() + "\" has invalid enumerator value: " + TString::HexString(ID, true, true, 8));
pEnumCast->Set(index);
// Validate
u32 Index = pEnumTemp->EnumeratorIndex(ID);
if (Index == -1) Log::FileError(SCLY.GetSourceString(), SCLY.Tell() - 4, "Enum property \"" + pEnumTemp->Name() + "\" in struct \"" + pTemp->Name() + "\" has invalid enumerator value: " + TString::HexString(ID, true, true, 8));
pEnumCast->Set(ID);
break;
}

5
src/Core/Resource/Script/CScriptTemplate.cpp
View File

@@ -153,10 +153,7 @@ s32 CScriptTemplate::CheckVolumeConditions(CScriptObject *pObj, bool LogErrors)
break;
case eEnumProperty: {
TEnumProperty *pEnumCast = static_cast<TEnumProperty*>(pProp);
CEnumTemplate *pEnumTemp = static_cast<CEnumTemplate*>(pEnumCast->Template());
int index = static_cast<TEnumProperty*>(pProp)->Get();
v = pEnumTemp->EnumeratorID(index);
v = (int) static_cast<TEnumProperty*>(pProp)->Get();
break;
}
}

3
src/Core/Resource/Script/IPropertyTemplate.h
View File

@@ -416,8 +416,7 @@ public:
virtual IProperty* InstantiateProperty(CPropertyStruct *pParent)
{
TEnumProperty *pEnum = new TEnumProperty(this, pParent);
u32 Index = EnumeratorIndex(GetDefaultValue());
pEnum->Set(Index);
pEnum->Set(GetDefaultValue());
return pEnum;
}

14
src/Core/ScriptExtra/CDamageableTriggerExtra.h
View File

@@ -8,13 +8,13 @@ class CDamageableTriggerExtra : public CScriptExtra
// Render fluid planes for doors in MP1
enum ERenderSide
{
eNoRender = 0,
eNorth = 1,
eSouth = 2,
eWest = 3,
eEast = 4,
eUp = 5,
eDown = 6
eNoRender = 0x0,
eNorth = 0x1,
eSouth = 0x2,
eWest = 0x4,
eEast = 0x8,
eUp = 0x10,
eDown = 0x20
};
TVector3Property *mpSizeProp;