AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed crash when creating new projects

This commit is contained in:
Aruki 2019-02-04 23:15:20 -07:00
parent 1baa48de34
commit b49f19c386
14 changed files with 57 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/.qmake.conf
View File

@ -16,7 +16,7 @@ EXTERNALS_DIR = $$PWD/../externals
PWE_MAIN_INCLUDE = $$PWD
DEFINES += 'APP_NAME=\"\\\"Prime World Editor\\\"\"' \
'APP_VERSION=\"\\\"1.2.1\\\"\"'
'APP_VERSION=\"\\\"1.2.2\\\"\"'
PUBLIC_RELEASE {
DEFINES += 'PUBLIC_RELEASE=1' \

4
src/Core/GameProject/CGameExporter.cpp
View File

@ -626,7 +626,9 @@ void CGameExporter::ExportResource(SResourceInstance& rRes)
Name = rRes.ResourceID.ToString();
#endif
CResourceEntry *pEntry = mpStore->CreateNewResource(rRes.ResourceID, CResTypeInfo::TypeForCookedExtension(mGame, rRes.ResourceType)->Type(), Directory, Name);
CResourceEntry *pEntry = mpStore->CreateNewResource(rRes.ResourceID,
CResTypeInfo::TypeForCookedExtension(mGame, rRes.ResourceType)->Type(),
Directory, Name, true);
// Set flags
pEntry->SetFlag(EResEntryFlag::IsBaseGameResource);

18
src/Core/GameProject/CResourceEntry.cpp
View File

@ -24,7 +24,7 @@ CResourceEntry::CResourceEntry(CResourceStore *pStore)
// Static constructors
CResourceEntry* CResourceEntry::CreateNewResource(CResourceStore *pStore, const CAssetID& rkID,
const TString& rkDir, const TString& rkName,
EResourceType Type)
EResourceType Type, bool ExistingResource /*= false*/)
{
// Initialize all entry info with the input data.
CResourceEntry *pEntry = new CResourceEntry(pStore);
@ -41,12 +41,16 @@ CResourceEntry* CResourceEntry::CreateNewResource(CResourceStore *pStore, const
pEntry->mMetadataDirty = true;
// Check if the data exists or not. If so, then we are creating an entry for an existing resource (game exporter).
// If not, we want to initiate the new resource data and save it as soon as possible.
if (!pEntry->HasCookedVersion())
// If this is a new resource (i.e. not a base game resource that we are currently exporting),
// then instantiate the new resource data so it can be saved as soon as possible.
if (!ExistingResource)
{
pEntry->mpResource = CResourceFactory::SpawnResource(pEntry);
pEntry->mpResource->InitializeNewResource();
pEntry->mpResource = CResourceFactory::CreateResource(pEntry);
if (pEntry->mpResource)
{
pEntry->mpResource->InitializeNewResource();
}
}
return pEntry;
@ -394,7 +398,7 @@ CResource* CResourceEntry::Load()
// support serialization yet) then load the cooked version as a backup.
if (HasRawVersion())
{
mpResource = CResourceFactory::SpawnResource(this);
mpResource = CResourceFactory::CreateResource(this);
if (mpResource)
{

2
src/Core/GameProject/CResourceEntry.h
View File

@ -46,7 +46,7 @@ class CResourceEntry
public:
static CResourceEntry* CreateNewResource(CResourceStore *pStore, const CAssetID& rkID,
const TString& rkDir, const TString& rkName,
EResourceType Type);
EResourceType Type, bool ExistingResource = false);
static CResourceEntry* BuildFromArchive(CResourceStore *pStore, IArchive& rArc);
static CResourceEntry* BuildFromDirectory(CResourceStore *pStore, CResTypeInfo *pTypeInfo,
const TString& rkDirPath, const TString& rkName);

4
src/Core/GameProject/CResourceStore.cpp
View File

@ -445,7 +445,7 @@ bool CResourceStore::IsResourceRegistered(const CAssetID& rkID) const
return FindEntry(rkID) != nullptr;
}
CResourceEntry* CResourceStore::CreateNewResource(const CAssetID& rkID, EResourceType Type, const TString& rkDir, const TString& rkName)
CResourceEntry* CResourceStore::CreateNewResource(const CAssetID& rkID, EResourceType Type, const TString& rkDir, const TString& rkName, bool ExistingResource /*= false*/)
{
CResourceEntry *pEntry = FindEntry(rkID);
@ -457,7 +457,7 @@ CResourceEntry* CResourceStore::CreateNewResource(const CAssetID& rkID, EResourc
// Validate directory
if (IsValidResourcePath(rkDir, rkName))
{
pEntry = CResourceEntry::CreateNewResource(this, rkID, rkDir, rkName, Type);
pEntry = CResourceEntry::CreateNewResource(this, rkID, rkDir, rkName, Type, ExistingResource);
mResourceEntries[rkID] = pEntry;
mDatabaseCacheDirty = true;

2
src/Core/GameProject/CResourceStore.h
View File

@ -55,7 +55,7 @@ public:
TString DeletedResourcePath() const;
bool IsResourceRegistered(const CAssetID& rkID) const;
CResourceEntry* CreateNewResource(const CAssetID& rkID, EResourceType Type, const TString& rkDir, const TString& rkName);
CResourceEntry* CreateNewResource(const CAssetID& rkID, EResourceType Type, const TString& rkDir, const TString& rkName, bool ExistingResource = false);
CResourceEntry* FindEntry(const CAssetID& rkID) const;
CResourceEntry* FindEntry(const TString& rkPath) const;
bool AreAllEntriesValid() const;

4
src/Core/Resource/Factory/CResourceFactory.h
View File

@ -32,7 +32,7 @@ class CResourceFactory
CResourceFactory() {}
public:
static CResource* SpawnResource(CResourceEntry *pEntry)
static CResource* CreateResource(CResourceEntry *pEntry)
{
switch (pEntry->ResourceType())
{
@ -58,7 +58,7 @@ public:
case EResourceType::StringTable: return new CStringTable(pEntry);
case EResourceType::Texture: return new CTexture(pEntry);
case EResourceType::World: return new CWorld(pEntry);
default: return nullptr; // should it return a CResource instead?
default: return nullptr; // should it return a CResource instead?
}
}

24
templates/MP2/Game.xml
View File

@ -839,6 +839,18 @@
<Key>EditorProperties</Key>
<Value Path="Structs/EditorProperties.xml"/>
</Element>
<Element>
<Key>EmperorIngStage1Data</Key>
<Value Path="Structs/EmperorIngStage1Data.xml"/>
</Element>
<Element>
<Key>EmperorIngStage1TentacleData</Key>
<Value Path="Structs/EmperorIngStage1TentacleData.xml"/>
</Element>
<Element>
<Key>EmperorIngStage2TentacleData</Key>
<Value Path="Structs/EmperorIngStage2TentacleData.xml"/>
</Element>
<Element>
<Key>EmperorIngStage3Data</Key>
<Value Path="Structs/EmperorIngStage3Data.xml"/>
@ -1307,14 +1319,6 @@
<Key>UnknownStruct17</Key>
<Value Path="Structs/UnknownStruct17.xml"/>
</Element>
<Element>
<Key>UnknownStruct18</Key>
<Value Path="Structs/UnknownStruct18.xml"/>
</Element>
<Element>
<Key>UnknownStruct19</Key>
<Value Path="Structs/UnknownStruct19.xml"/>
</Element>
<Element>
<Key>UnknownStruct2</Key>
<Value Path="Structs/UnknownStruct2.xml"/>
@ -1339,10 +1343,6 @@
<Key>UnknownStruct24</Key>
<Value Path="Structs/UnknownStruct24.xml"/>
</Element>
<Element>
<Key>UnknownStruct25</Key>
<Value Path="Structs/UnknownStruct25.xml"/>
</Element>
<Element>
<Key>UnknownStruct26</Key>
<Value Path="Structs/UnknownStruct26.xml"/>

2
templates/MP2/Script/EmperorIngStage1.xml
View File

@ -15,7 +15,7 @@
</SubProperties>
</Element>
<Element Type="Struct" ID="0x7E397FED" Archetype="ActorParameters"/>
<Element Type="Struct" ID="0x4A1E493B" Archetype="UnknownStruct25"/>
<Element Type="Struct" ID="0x4A1E493B" Archetype="EmperorIngStage1Data"/>
</SubProperties>
</Properties>
<EditorProperties>

2
templates/MP2/Script/EmperorIngStage2Tentacle.xml
View File

@ -15,7 +15,7 @@
</SubProperties>
</Element>
<Element Type="Struct" ID="0x7E397FED" Archetype="ActorParameters"/>
<Element Type="Struct" ID="0x5105FA2D" Archetype="UnknownStruct18"/>
<Element Type="Struct" ID="0x5105FA2D" Archetype="EmperorIngStage2TentacleData"/>
</SubProperties>
</Properties>
<EditorProperties>

6
templates/MP2/Structs/UnknownStruct25.xml → templates/MP2/Structs/EmperorIngStage1Data.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<PropertyTemplate ArchiveVer="4" Game="Echoes">
<PropertyArchetype Type="Struct">
<Name>UnknownStruct25</Name>
<Name>EmperorIngStage1Data</Name>
<SubProperties>
<Element Type="Struct" ID="0xB3C6398F" Archetype="UnknownStruct19"/>
<Element Type="Struct" ID="0xB3C6398F" Archetype="EmperorIngStage1TentacleData"/>
<Element Type="Struct" ID="0xF59F9A60" Archetype="UnknownStruct20"/>
<Element Type="Struct" ID="0xA1CDA0B6" Archetype="UnknownStruct21"/>
<Element Type="Struct" ID="0x85F36473" Archetype="UnknownStruct22"/>
@ -31,7 +31,7 @@
<Element Type="Float" ID="0xE5A7C358">
<DefaultValue>0.0</DefaultValue>
</Element>
<Element Type="Int" ID="0x93357240">
<Element Type="Sound" ID="0x93357240">
<DefaultValue>-1</DefaultValue>
</Element>
<Element Type="Float" ID="0x293A0C19">

2
templates/MP2/Structs/UnknownStruct19.xml → templates/MP2/Structs/EmperorIngStage1TentacleData.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<PropertyTemplate ArchiveVer="4" Game="Echoes">
<PropertyArchetype Type="Struct">
<Name>UnknownStruct19</Name>
<Name>EmperorIngStage1TentacleData</Name>
<SubProperties>
<Element Type="Struct" ID="0xCF90D15E" Archetype="HealthInfo"/>
<Element Type="Struct" ID="0x29DF61E1" Archetype="DamageVulnerability"/>

2
templates/MP2/Structs/UnknownStruct18.xml → templates/MP2/Structs/EmperorIngStage2TentacleData.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<PropertyTemplate ArchiveVer="4" Game="Echoes">
<PropertyArchetype Type="Struct">
<Name>UnknownStruct18</Name>
<Name>EmperorIngStage2TentacleData</Name>
<SubProperties>
<Element Type="Float" ID="0xBAA9254A">
<DefaultValue>0.0</DefaultValue>

26
templates/PropertyMap.xml
View File

@ -1213,10 +1213,6 @@
<Key ID="0x6DCF118" Type="float"/>
<Value Name="CloseDelay"/>
</Element>
<Element>
<Key ID="0x6DEE4C5" Type="choice"/>
<Value Name="Unknown"/>
</Element>
<Element>
<Key ID="0x6DEE4C5" Type="int"/>
<Value Name="Unknown"/>
@ -13561,9 +13557,13 @@
<Key ID="0x4A1E493B" Type="UnknownStruct16"/>
<Value Name="UnknownStruct25"/>
</Element>
<Element>
<Key ID="0x4A1E493B" Type="EmperorIngStage1Data"/>
<Value Name="Data"/>
</Element>
<Element>
<Key ID="0x4A1E493B" Type="UnknownStruct25"/>
<Value Name="UnknownStruct25"/>
<Value Name="Data"/>
</Element>
<Element>
<Key ID="0x4A1E8961" Type="float"/>
@ -14909,9 +14909,13 @@
<Key ID="0x50FC4ACB" Type="float"/>
<Value Name="BallCameraChaseAnglePerSecond"/>
</Element>
<Element>
<Key ID="0x5105FA2D" Type="EmperorIngStage2TentacleData"/>
<Value Name="Data"/>
</Element>
<Element>
<Key ID="0x5105FA2D" Type="UnknownStruct18"/>
<Value Name="UnknownStruct18"/>
<Value Name="Data"/>
</Element>
<Element>
<Key ID="0x5106FEB9" Type="bool"/>
@ -26838,7 +26842,7 @@
<Value Name="Jump"/>
</Element>
<Element>
<Key ID="0x93357240" Type="int"/>
<Key ID="0x93357240" Type="sound"/>
<Value Name="VulnerabilityChangeSound"/>
</Element>
<Element>
@ -29043,7 +29047,7 @@
</Element>
<Element>
<Key ID="0x9FB2FAA6" Type="float"/>
<Value Name="Unknown"/>
<Value Name="FieldofView2Player"/>
</Element>
<Element>
<Key ID="0x9FB991FE" Type="float"/>
@ -32857,9 +32861,13 @@
<Key ID="0xB3C6398F" Type="UnknownStruct13"/>
<Value Name="UnknownStruct19"/>
</Element>
<Element>
<Key ID="0xB3C6398F" Type="EmperorIngStage1TentacleData"/>
<Value Name="Tentacle"/>
</Element>
<Element>
<Key ID="0xB3C6398F" Type="UnknownStruct19"/>
<Value Name="UnknownStruct19"/>
<Value Name="Tentacle"/>
</Element>
<Element>
<Key ID="0xB3DABF84" Type="DamageInfo"/>