nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improving BaseObject

Browse source 
Creating debug tools for print log output
This commit is contained in:
Lars Brubaker 2021-03-09 14:42:44 -08:00
parent 005b868c4d
commit f73ca75084
5 changed files with 72 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

34
MatterControlLib/DesignTools/Primitives/BaseObject3D.cs
View file

@ -39,7 +39,10 @@ using MatterHackers.Agg.VertexSource;
using MatterHackers.DataConverters2D;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.PartPreviewWindow;
using MatterHackers.PolygonMesh.Csg;
using MatterHackers.RenderOpenGl;
using MatterHackers.RenderOpenGl.OpenGl;
using MatterHackers.VectorMath;
using Newtonsoft.Json;
using Polygon = System.Collections.Generic.List<ClipperLib.IntPoint>;
@ -56,7 +59,7 @@ namespace MatterHackers.MatterControl.DesignTools
Outline
}
public class BaseObject3D : Object3D, IPropertyGridModifier
public class BaseObject3D : Object3D, IPropertyGridModifier, IEditorDraw
{
public enum CenteringTypes
{
@ -138,14 +141,23 @@ namespace MatterHackers.MatterControl.DesignTools
return totalSlice.CreateVertexStorage();
}
[JsonIgnore]
public IVertexSource VertexSource
private bool OutlineIsFromMesh
{
get
{
var vertexSource = (IPathObject)this.Descendants<IObject3D>().FirstOrDefault((i) => i is IPathObject);
var hasMesh = this.Descendants<IObject3D>().Where(m => m.Mesh != null).Any();
if (vertexSource?.VertexSource == null && hasMesh)
return vertexSource?.VertexSource == null && hasMesh;
}
}
[JsonIgnore]
public IVertexSource VertexSource
{
get
{
if (OutlineIsFromMesh)
{
if (meshVertexCache.vertexSource == null || meshVertexCache.height != CalculationHeight)
{
@ -158,6 +170,7 @@ namespace MatterHackers.MatterControl.DesignTools
return meshVertexCache.vertexSource;
}
var vertexSource = (IPathObject)this.Descendants<IObject3D>().FirstOrDefault((i) => i is IPathObject);
return vertexSource?.VertexSource;
}
@ -443,5 +456,18 @@ namespace MatterHackers.MatterControl.DesignTools
change.SetRowVisible(kvp.Key, () => kvp.Value);
}
}
public void DrawEditor(Object3DControlsLayer layer, List<Object3DView> transparentMeshes, DrawEventArgs e)
{
if (OutlineIsFromMesh)
{
var aabb = this.GetAxisAlignedBoundingBox(this.WorldMatrix());
// ExtrusionHeight
layer.World.RenderPathOutline(this.WorldMatrix() * Matrix4X4.CreateTranslation(0, 0, CalculationHeight - aabb.MinXYZ.Z + ExtrusionHeight), VertexSource, Agg.Color.Red, 5);
// turn the lighting back on
GL.Enable(EnableCap.Lighting);
}
}
}
}