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

Add iterable list of Drawables to viewer

Browse source
This commit is contained in:
John Lewin 2019-01-31 22:04:39 -08:00
parent c2fee997d2
commit 0f857acc96
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControlLib/PartPreviewWindow/SceneViewer/TraceDataDrawable.cs
View file

@ -47,8 +47,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public void Draw(GuiWidget sender, DrawEventArgs e, Matrix4X4 itemMaxtrix, WorldView world)
{
return;
// RenderSceneTraceData
var bvhIterator = new BvhIterator(scene?.TraceData(), decentFilter: (x) =>
{

3
MatterControlLib/PartPreviewWindow/View3D/InteractionLayer.cs
View file

@ -65,7 +65,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public InteractionLayer(WorldView world, UndoBuffer undoBuffer, BedConfig sceneContext, ThemeConfig theme, EditorType editorType = EditorType.Part)
{
this.DebugShowBounds = true;
this.sceneContext = sceneContext;
this.Scene = scene = sceneContext.Scene;
this.World = world;
@ -83,8 +82,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
floorDrawable = new FloorDrawable(editorType, sceneContext, this.BuildVolumeColor, theme);
traceDataDebugger = new TraceDataDrawable(sceneContext);
///////////////////////// this.interactionLayer.DrawGlTransparentContent += Draw_GlTransparentContent;
if (ViewOnlyTexture == null)

21
MatterControlLib/PartPreviewWindow/View3D/MeshViewerWidget.cs
View file

@ -63,7 +63,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private ThemeConfig theme;
private FloorDrawable floorDrawable;
private TraceDataDrawable traceDataDebugger;
private ModelRenderStyle modelRenderStyle = ModelRenderStyle.Wireframe;
private long lastSelectionChangedMs;
private List<IDrawable> drawables = new List<IDrawable>();
public bool AllowBedRenderingWhenEmpty { get; set; }
@ -84,6 +88,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
};
}
drawables.Add(new AxisIndicatorDrawable());
drawables.Add(new TraceDataDrawable(sceneContext));
base.OnLoad(args);
}
@ -373,7 +380,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
return drawColor;
}
private void RenderSelection(IObject3D item, Frustum frustum, Color selectionColor)
{
if (item.Mesh == null)
@ -477,8 +483,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
floorDrawable.Draw(this, e, Matrix4X4.Identity, this.World);
}
traceDataDebugger.Draw(this, e, Matrix4X4.Identity, this.World);
var wireColor = Color.Transparent;
switch(modelRenderStyle)
{
@ -517,6 +521,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
GLHelper.Render(debugItem.Mesh, debugBorderColor, debugItem.WorldMatrix(),
RenderTypes.Wireframe, debugItem.WorldMatrix() * World.ModelviewMatrix);
}
foreach(var drawable in drawables)
{
drawable.Draw(this, e, Matrix4X4.Identity, this.World);
}
}
@ -559,10 +568,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
None
}
private ModelRenderStyle modelRenderStyle = ModelRenderStyle.Wireframe;
private long lastSelectionChangedMs;
private class Object3DView
{
public Color Color { get; set; }