ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2024-11-26 08:52:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Opening ytyp in project window now updating world view archetypes

Browse Source
This commit is contained in:
dexy 2019-12-01 17:31:44 +11:00
parent c33a09d09f
commit 7fb07e1a27
2 changed files with 75 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CodeWalker.Core/GameFiles/FileTypes/YmapFile.cs
View File

@ -1395,17 +1395,13 @@ namespace CodeWalker.GameFiles
{ {
//transform interior entities into world space... //transform interior entities into world space...
var mloa = Archetype as MloArchetype; var mloa = Archetype as MloArchetype;
if (MloInstance == null)
{
MloInstance = new MloInstanceData(); MloInstance = new MloInstanceData();
} MloInstance._Instance = new CMloInstanceDef { CEntityDef = _CEntityDef };
if (mloa != null) if (mloa != null)
{ {
if (!IsMlo) if (!IsMlo)
{ {
IsMlo = true; IsMlo = true;
MloInstance._Instance = new CMloInstanceDef { CEntityDef = _CEntityDef };
List<YmapEntityDef> mloEntities = Ymap.MloEntities?.ToList() ?? new List<YmapEntityDef>(); List<YmapEntityDef> mloEntities = Ymap.MloEntities?.ToList() ?? new List<YmapEntityDef>();
mloEntities.Add(this); mloEntities.Add(this);
Ymap.MloEntities = mloEntities.ToArray(); Ymap.MloEntities = mloEntities.ToArray();

71
Project/ProjectForm.cs
View File

@ -83,6 +83,8 @@ namespace CodeWalker.Project
private Dictionary<uint, YmapEntityDef> visiblemloentities = new Dictionary<uint, YmapEntityDef>(); private Dictionary<uint, YmapEntityDef> visiblemloentities = new Dictionary<uint, YmapEntityDef>();
private Dictionary<uint, RelFile> visibleaudiofiles = new Dictionary<uint, RelFile>(); private Dictionary<uint, RelFile> visibleaudiofiles = new Dictionary<uint, RelFile>();
private Dictionary<uint, Archetype> projectarchetypes = new Dictionary<uint, Archetype>();//used to override archetypes in world view
private bool ShowProjectItemInProcess = false; private bool ShowProjectItemInProcess = false;
@ -2242,11 +2244,13 @@ namespace CodeWalker.Project
} }
CurrentYtypFile = ytyp; CurrentYtypFile = ytyp;
RefreshUI(); RefreshUI();
AddProjectArchetypes(ytyp);
} }
public void RemoveYtypFromProject() public void RemoveYtypFromProject()
{ {
if (CurrentYtypFile == null) return; if (CurrentYtypFile == null) return;
if (CurrentProjectFile == null) return; if (CurrentProjectFile == null) return;
RemoveProjectArchetypes(CurrentYtypFile);
CurrentProjectFile.RemoveYtypFile(CurrentYtypFile); CurrentProjectFile.RemoveYtypFile(CurrentYtypFile);
CurrentYtypFile = null; CurrentYtypFile = null;
LoadProjectTree(); LoadProjectTree();
@ -2278,6 +2282,8 @@ namespace CodeWalker.Project
LoadProjectTree(); LoadProjectTree();
ProjectExplorer?.TrySelectArchetypeTreeNode(archetype); ProjectExplorer?.TrySelectArchetypeTreeNode(archetype);
CurrentArchetype = archetype; CurrentArchetype = archetype;
AddProjectArchetype(archetype);
} }
public void NewMloEntity(YmapEntityDef copy = null, bool copyTransform = false) public void NewMloEntity(YmapEntityDef copy = null, bool copyTransform = false)
{ {
@ -2485,6 +2491,8 @@ namespace CodeWalker.Project
var delarch = CurrentArchetype; var delarch = CurrentArchetype;
var delytyp = delarch.Ytyp; var delytyp = delarch.Ytyp;
RemoveProjectArchetype(delarch);
ProjectExplorer?.RemoveArchetypeTreeNode(delarch); ProjectExplorer?.RemoveArchetypeTreeNode(delarch);
ProjectExplorer?.SetYtypHasChanged(delytyp, true); ProjectExplorer?.SetYtypHasChanged(delytyp, true);
@ -2494,6 +2502,44 @@ namespace CodeWalker.Project
return true; return true;
} }
private void AddProjectArchetypes(YtypFile ytyp)
{
if (ytyp?.AllArchetypes == null) return;
foreach (var arch in ytyp.AllArchetypes)
{
AddProjectArchetype(arch);
}
}
private void AddProjectArchetype(Archetype arch)
{
if ((arch?.Hash ?? 0) == 0) return;
lock (projectsyncroot)
{
projectarchetypes[arch.Hash] = arch;
}
}
private void RemoveProjectArchetypes(YtypFile ytyp)
{
if (ytyp?.AllArchetypes == null) return;
foreach (var arch in ytyp.AllArchetypes)
{
RemoveProjectArchetype(arch);
}
}
private void RemoveProjectArchetype(Archetype arch)
{
if ((arch?.Hash ?? 0) == 0) return;
Archetype tarch = null;
lock (projectsyncroot)
{
projectarchetypes.TryGetValue(arch.Hash, out tarch);
if (tarch == arch)
{
projectarchetypes.Remove(arch.Hash);
}
}
}
public void NewYnd() public void NewYnd()
{ {
@ -5134,7 +5180,27 @@ namespace CodeWalker.Project
foreach (var kvp in ymaps) foreach (var kvp in ymaps)
{ {
var ymap = kvp.Value; var ymap = kvp.Value;
if (ymap.MloEntities == null) continue; if (ymap.AllEntities != null)
{
foreach (var ent in ymap.AllEntities)
{
if (ent.Archetype == null) continue;
Archetype parch = null;
projectarchetypes.TryGetValue(ent.Archetype.Hash, out parch);
if ((parch != null) && (ent.Archetype != parch))
{
ent.SetArchetype(parch); //swap archetype to project one...
if (ent.IsMlo)
{
ent.MloInstance.InitYmapEntityArchetypes(GameFileCache);
}
}
}
}
if (ymap.MloEntities != null)
{
foreach (var mloDef in ymap.MloEntities) foreach (var mloDef in ymap.MloEntities)
{ {
if (mloDef.Archetype == null) continue; // archetype was changed from an mlo to a regular archetype if (mloDef.Archetype == null) continue; // archetype was changed from an mlo to a regular archetype
@ -5144,6 +5210,7 @@ namespace CodeWalker.Project
} }
} }
} }
}
public void GetVisibleCollisionMeshes(Camera camera, List<BoundsStoreItem> items) public void GetVisibleCollisionMeshes(Camera camera, List<BoundsStoreItem> items)
{ {
if (hidegtavmap) if (hidegtavmap)
@ -6130,6 +6197,8 @@ namespace CodeWalker.Project
byte[] data = File.ReadAllBytes(filename); byte[] data = File.ReadAllBytes(filename);
ytyp.Load(data); ytyp.Load(data);
AddProjectArchetypes(ytyp);
} }
private void LoadYndFromFile(YndFile ynd, string filename) private void LoadYndFromFile(YndFile ynd, string filename)
{ {