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

LOD manager immersion improvement

Browse Source
This commit is contained in:
dexy 2019-12-09 00:41:35 +11:00
parent b187ad919b
commit 5d0a3334a8
2 changed files with 97 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1322,6 +1322,7 @@ namespace CodeWalker.GameFiles
public uint EntityHash { get; set; } = 0; //used by CW as a unique position+name identifier public uint EntityHash { get; set; } = 0; //used by CW as a unique position+name identifier
public LinkedList<YmapEntityDef> LodManagerChildren = null; public LinkedList<YmapEntityDef> LodManagerChildren = null;
public object LodManagerRenderable = null;
public string Name public string Name

173
Rendering/Renderer.cs
View File

@ -86,6 +86,9 @@ namespace CodeWalker.Rendering
private List<YmapEntityDef> renderworldentities = new List<YmapEntityDef>(); //used when rendering world view. private List<YmapEntityDef> renderworldentities = new List<YmapEntityDef>(); //used when rendering world view.
private List<RenderableEntity> renderworldrenderables = new List<RenderableEntity>(); private List<RenderableEntity> renderworldrenderables = new List<RenderableEntity>();
private Dictionary<Archetype, Renderable> ArchetypeRenderables = new Dictionary<Archetype, Renderable>();
private Dictionary<YmapEntityDef, Renderable> RequiredParents = new Dictionary<YmapEntityDef, Renderable>();
private List<YmapEntityDef> RenderEntities = new List<YmapEntityDef>();
public Dictionary<uint, YmapEntityDef> HideEntities = new Dictionary<uint, YmapEntityDef>();//dictionary of entities to hide, for cutscenes to use public Dictionary<uint, YmapEntityDef> HideEntities = new Dictionary<uint, YmapEntityDef>();//dictionary of entities to hide, for cutscenes to use
@ -1520,6 +1523,9 @@ namespace CodeWalker.Rendering
renderworldentities.Clear(); renderworldentities.Clear();
renderworldrenderables.Clear(); renderworldrenderables.Clear();
VisibleYmaps.Clear(); VisibleYmaps.Clear();
ArchetypeRenderables.Clear();
RequiredParents.Clear();
RenderEntities.Clear();
foreach (var ymap in renderworldVisibleYmapDict.Values) foreach (var ymap in renderworldVisibleYmapDict.Values)
{ {
@ -1534,48 +1540,66 @@ namespace CodeWalker.Rendering
LodManager.MapViewEnabled = MapViewEnabled; LodManager.MapViewEnabled = MapViewEnabled;
LodManager.MapViewDist = camera.OrthographicSize / MapViewDetail; LodManager.MapViewDist = camera.OrthographicSize / MapViewDetail;
LodManager.ShowScriptedYmaps = ShowScriptedYmaps; LodManager.ShowScriptedYmaps = ShowScriptedYmaps;
LodManager.Update(renderworldVisibleYmapDict, ref camera.Position, currentElapsedTime); LodManager.Update(renderworldVisibleYmapDict, camera, currentElapsedTime);
var ents = LodManager.GetVisibleLeaves(camera); var ents = LodManager.GetVisibleLeaves();
for (int i = 0; i < ents.Count; i++)
//foreach (var ent in ents)
//{
// if (!RenderIsEntityFinalRender(ent))
// { continue; }
// var arch = ent.Archetype;
// var drawable = gameFileCache.TryGetDrawable(arch);
// var rndbl = TryGetRenderable(arch, drawable);
// var ready = ((rndbl != null) && rndbl.IsLoaded && (rndbl.AllTexturesLoaded || !waitforchildrentoload));
//}
foreach (var ent in ents)
{ {
var ent = ents[i];
if (!RenderIsEntityFinalRender(ent)) if (!RenderIsEntityFinalRender(ent))
{ continue; } { continue; }
//if (MapViewEnabled) if (ent.IsMlo)
//{ {
// if (!camera.ViewFrustum.ContainsAABBNoFrontClipNoOpt(ref ent.BBMin, ref ent.BBMax)) if (renderinteriors && (ent.MloInstance != null) && !MapViewEnabled) //render Mlo child entities...
// { continue; }
//}
//else
//{
// if (!camera.ViewFrustum.ContainsAABBNoClip(ref ent.BBCenter, ref ent.BBExtent))
// { continue; }
//}
renderworldentities.Add(ent);
if (renderinteriors && ent.IsMlo && (ent.MloInstance != null)) //render Mlo child entities...
{ {
RenderWorldAddInteriorEntities(ent); RenderWorldAddInteriorEntities(ent);
} }
} }
else
{
var rndbl = GetArchetypeRenderable(ent.Archetype);
ent.LodManagerRenderable = rndbl;
if (rndbl != null)
{
RenderEntities.Add(ent);
}
var pent = ent.Parent;
if (waitforchildrentoload && (pent != null))
{
if (!RequiredParents.ContainsKey(pent))
{
bool allok = true;
var pcnode = pent.LodManagerChildren?.First;
while (pcnode != null)
{
var pcent = pcnode.Value;
var pcrndbl = (pcent == ent) ? rndbl : GetArchetypeRenderable(pcent.Archetype);
pcent.LodManagerRenderable = pcrndbl;
pcnode = pcnode.Next;
allok = allok && (pcrndbl != null);
}
if (!allok)
{
rndbl = GetArchetypeRenderable(pent.Archetype);
pent.LodManagerRenderable = rndbl;
if (rndbl != null)
{
RenderEntities.Add(pent);
}
}
RequiredParents[pent] = rndbl;
}
}
}
}
@ -1598,10 +1622,21 @@ namespace CodeWalker.Rendering
for (int i = 0; i < renderworldentities.Count; i++) for (int i = 0; i < renderworldentities.Count; i++)
{ {
var ent = renderworldentities[i]; var ent = renderworldentities[i];
var arch = ent.Archetype; var rndbl = GetArchetypeRenderable(ent.Archetype);
var drawable = gameFileCache.TryGetDrawable(arch); ent.LodManagerRenderable = rndbl;
var rndbl = TryGetRenderable(arch, drawable); if (rndbl != null)
if ((rndbl != null) && rndbl.IsLoaded && (rndbl.AllTexturesLoaded || !waitforchildrentoload)) {
RenderEntities.Add(ent);
}
}
for (int i = 0; i < RenderEntities.Count; i++)
{
var ent = RenderEntities[i];
var rndbl = ent.LodManagerRenderable as Renderable;
if (rndbl != null)
{ {
var rent = new RenderableEntity(); var rent = new RenderableEntity();
rent.Entity = ent; rent.Entity = ent;
@ -1609,7 +1644,7 @@ namespace CodeWalker.Rendering
if (HideEntities.ContainsKey(ent.EntityHash)) continue; //don't render hidden entities! if (HideEntities.ContainsKey(ent.EntityHash)) continue; //don't render hidden entities!
RenderArchetype(arch, ent, rent.Renderable, false); RenderArchetype(ent.Archetype, ent, rent.Renderable, false);
} }
} }
} }
@ -2115,6 +2150,21 @@ namespace CodeWalker.Rendering
private Renderable GetArchetypeRenderable(Archetype arch)
{
Renderable rndbl = null;
if (!ArchetypeRenderables.TryGetValue(arch, out rndbl))
{
var drawable = gameFileCache.TryGetDrawable(arch);
rndbl = TryGetRenderable(arch, drawable);
ArchetypeRenderables[arch] = rndbl;
}
if ((rndbl != null) && rndbl.IsLoaded && (rndbl.AllTexturesLoaded || !waitforchildrentoload))
{
return rndbl;
}
return null;
}
@ -3484,6 +3534,7 @@ namespace CodeWalker.Rendering
public float MapViewDist = 1.0f; public float MapViewDist = 1.0f;
public bool ShowScriptedYmaps = true; public bool ShowScriptedYmaps = true;
public Camera Camera = null;
public Vector3 Position = Vector3.Zero; public Vector3 Position = Vector3.Zero;
public Dictionary<MetaHash, YmapFile> CurrentYmaps = new Dictionary<MetaHash, YmapFile>(); public Dictionary<MetaHash, YmapFile> CurrentYmaps = new Dictionary<MetaHash, YmapFile>();
@ -3491,9 +3542,10 @@ namespace CodeWalker.Rendering
public Dictionary<YmapEntityDef, YmapEntityDef> RootEntities = new Dictionary<YmapEntityDef, YmapEntityDef>(); public Dictionary<YmapEntityDef, YmapEntityDef> RootEntities = new Dictionary<YmapEntityDef, YmapEntityDef>();
public List<YmapEntityDef> VisibleLeaves = new List<YmapEntityDef>(); public List<YmapEntityDef> VisibleLeaves = new List<YmapEntityDef>();
public void Update(Dictionary<MetaHash, YmapFile> ymaps, ref Vector3 position, float elapsed) public void Update(Dictionary<MetaHash, YmapFile> ymaps, Camera camera, float elapsed)
{ {
Position = position; Camera = camera;
Position = camera.Position;
foreach (var kvp in ymaps) foreach (var kvp in ymaps)
{ {
@ -3594,7 +3646,7 @@ namespace CodeWalker.Rendering
foreach (var kvp in RootEntities) foreach (var kvp in RootEntities)
{ {
var ent = kvp.Key; var ent = kvp.Key;
if (EntityVisibleAtMaxLodLevel(ent)) if (EntityVisibleAtMaxLodLevel(ent) && EntityVisible(ent))
{ {
ent.Distance = MapViewEnabled ? MapViewDist : (ent.Position - Position).Length(); ent.Distance = MapViewEnabled ? MapViewDist : (ent.Position - Position).Length();
if (ent.Distance <= (ent.LodDist * LodDistMult)) if (ent.Distance <= (ent.LodDist * LodDistMult))
@ -3619,47 +3671,12 @@ namespace CodeWalker.Rendering
} }
else else
{ {
VisibleLeaves.Add(ent); if ((ent.Parent == null) || EntityVisible(ent))
}
}
public List<YmapEntityDef> GetVisibleLeaves(Camera cam)
{
VisibleLeaves.Clear();
foreach (var kvp in RootEntities)
{
var ent = kvp.Key;
if (EntityVisibleAtMaxLodLevel(ent) && EntityVisible(ent, cam))
{
ent.Distance = MapViewEnabled ? MapViewDist : (ent.Position - Position).Length();
if (ent.Distance <= (ent.LodDist * LodDistMult))
{
RecurseAddVisibleLeaves(ent, cam);
}
}
}
return VisibleLeaves;
}
private void RecurseAddVisibleLeaves(YmapEntityDef ent, Camera cam)
{
var clist = GetEntityChildren(ent);
if (clist != null)
{
var cnode = clist.First;
while (cnode != null)
{
if (EntityVisible(cnode.Value, cam))
{
RecurseAddVisibleLeaves(cnode.Value, cam);
}
cnode = cnode.Next;
}
}
else
{ {
VisibleLeaves.Add(ent); VisibleLeaves.Add(ent);
} }
} }
}
@ -3696,15 +3713,15 @@ namespace CodeWalker.Rendering
return null; return null;
} }
private bool EntityVisible(YmapEntityDef ent, Camera cam) private bool EntityVisible(YmapEntityDef ent)
{ {
if (MapViewEnabled) if (MapViewEnabled)
{ {
return cam.ViewFrustum.ContainsAABBNoFrontClipNoOpt(ref ent.BBMin, ref ent.BBMax); return Camera.ViewFrustum.ContainsAABBNoFrontClipNoOpt(ref ent.BBMin, ref ent.BBMax);
} }
else else
{ {
return cam.ViewFrustum.ContainsAABBNoClip(ref ent.BBCenter, ref ent.BBExtent); return Camera.ViewFrustum.ContainsAABBNoClip(ref ent.BBCenter, ref ent.BBExtent);
} }
} }
private bool EntityVisibleAtMaxLodLevel(YmapEntityDef ent) private bool EntityVisibleAtMaxLodLevel(YmapEntityDef ent)