ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2024-07-15 22:31:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed interior and embedded collisions not being drawn when in Collisions mode

Browse Source
This commit is contained in:
dexy 2018-12-16 17:20:00 +11:00
parent 56e2988713
commit f738a03eaa
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Rendering/Renderer.cs
View File

@ -110,6 +110,8 @@ namespace CodeWalker.Rendering
private List<RenderSkeletonItem> renderskeletonlist = new List<RenderSkeletonItem>(); private List<RenderSkeletonItem> renderskeletonlist = new List<RenderSkeletonItem>();
private List<VertexTypePC> skeletonLineVerts = new List<VertexTypePC>(); private List<VertexTypePC> skeletonLineVerts = new List<VertexTypePC>();
public MapSelectionMode SelectionMode = MapSelectionMode.Entity; //to assist in rendering embedded collisions properly...
public BoundsShaderMode boundsmode = BoundsShaderMode.None; public BoundsShaderMode boundsmode = BoundsShaderMode.None;
public bool renderboundsclip = Settings.Default.BoundsDepthClip; public bool renderboundsclip = Settings.Default.BoundsDepthClip;
@ -1599,7 +1601,7 @@ namespace CodeWalker.Rendering
//todo: render parent if children loading....... //todo: render parent if children loading.......
} }
if (ent.IsMlo && rendercollisionmeshes && renderinteriors) if ((rendercollisionmeshes || (SelectionMode == MapSelectionMode.Collision)) && renderinteriors)
{ {
RenderInteriorCollisionMesh(ent); RenderInteriorCollisionMesh(ent);
} }
@ -2030,7 +2032,7 @@ namespace CodeWalker.Rendering
RenderArchetype(intarch, intent); RenderArchetype(intarch, intent);
} }
} }
if (rendercollisionmeshes) if (rendercollisionmeshes || (SelectionMode == MapSelectionMode.Collision))
{ {
RenderInteriorCollisionMesh(entity); RenderInteriorCollisionMesh(entity);
} }
@ -2336,7 +2338,7 @@ namespace CodeWalker.Rendering
float distance = (camrel + bscen).Length(); float distance = (camrel + bscen).Length();
if (rendercollisionmeshes && rendercollisionmeshlayerdrawable) if ((rendercollisionmeshes || (SelectionMode == MapSelectionMode.Collision)) && rendercollisionmeshlayerdrawable)
{ {
Drawable sdrawable = rndbl.Key as Drawable; Drawable sdrawable = rndbl.Key as Drawable;
if ((sdrawable != null) && (sdrawable.Bound != null)) if ((sdrawable != null) && (sdrawable.Bound != null))

1
WorldForm.cs
View File

@ -5928,6 +5928,7 @@ namespace CodeWalker
} }
SelectionMode = mode; SelectionMode = mode;
SelectionModeStr = modestr; SelectionModeStr = modestr;
Renderer.SelectionMode = mode;
if (SelectionModeComboBox.Text != modestr) if (SelectionModeComboBox.Text != modestr)
{ {