From f738a03eaa266837347966c8df63fb7c1b7cf9a5 Mon Sep 17 00:00:00 2001 From: dexy Date: Sun, 16 Dec 2018 17:20:00 +1100 Subject: [PATCH] Fixed interior and embedded collisions not being drawn when in Collisions mode --- Rendering/Renderer.cs | 8 +++++--- WorldForm.cs | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Rendering/Renderer.cs b/Rendering/Renderer.cs index f37cf18..659f31a 100644 --- a/Rendering/Renderer.cs +++ b/Rendering/Renderer.cs @@ -110,6 +110,8 @@ namespace CodeWalker.Rendering private List renderskeletonlist = new List(); private List skeletonLineVerts = new List(); + public MapSelectionMode SelectionMode = MapSelectionMode.Entity; //to assist in rendering embedded collisions properly... + public BoundsShaderMode boundsmode = BoundsShaderMode.None; public bool renderboundsclip = Settings.Default.BoundsDepthClip; @@ -1599,7 +1601,7 @@ namespace CodeWalker.Rendering //todo: render parent if children loading....... } - if (ent.IsMlo && rendercollisionmeshes && renderinteriors) + if ((rendercollisionmeshes || (SelectionMode == MapSelectionMode.Collision)) && renderinteriors) { RenderInteriorCollisionMesh(ent); } @@ -2030,7 +2032,7 @@ namespace CodeWalker.Rendering RenderArchetype(intarch, intent); } } - if (rendercollisionmeshes) + if (rendercollisionmeshes || (SelectionMode == MapSelectionMode.Collision)) { RenderInteriorCollisionMesh(entity); } @@ -2336,7 +2338,7 @@ namespace CodeWalker.Rendering float distance = (camrel + bscen).Length(); - if (rendercollisionmeshes && rendercollisionmeshlayerdrawable) + if ((rendercollisionmeshes || (SelectionMode == MapSelectionMode.Collision)) && rendercollisionmeshlayerdrawable) { Drawable sdrawable = rndbl.Key as Drawable; if ((sdrawable != null) && (sdrawable.Bound != null)) diff --git a/WorldForm.cs b/WorldForm.cs index e040a94..e4c265e 100644 --- a/WorldForm.cs +++ b/WorldForm.cs @@ -5928,6 +5928,7 @@ namespace CodeWalker } SelectionMode = mode; SelectionModeStr = modestr; + Renderer.SelectionMode = mode; if (SelectionModeComboBox.Text != modestr) {