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

Merge pull request #2705 from jlewin/design_tools

Browse source 
Remove per draw Object3D wrapper and instantiation
This commit is contained in:
johnlewin 2017-11-28 16:09:07 -08:00 • committed by GitHub
commit 8a09f34cf5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

108
PartPreviewWindow/View3D/MeshViewerWidget.cs
View file

@ -444,63 +444,33 @@ namespace MatterHackers.MeshVisualizer
GL.Enable(EnableCap.Lighting); GL.Enable(EnableCap.Lighting);
} }
foreach (var renderData in object3D.VisibleMeshes()) foreach (var item in object3D.VisibleMeshes())
{ {
bool isSelected = parentSelected || bool isSelected = parentSelected ||
scene.HasSelection && (object3D == scene.SelectedItem || scene.SelectedItem.Children.Contains(object3D)); scene.HasSelection && (object3D == scene.SelectedItem || scene.SelectedItem.Children.Contains(object3D));
Color drawColor = renderData.WorldColor(); Color drawColor = GetItemColor(item);
if (renderData.WorldOutputType() == PrintOutputTypes.Support)
{
drawColor = new Color(Color.Yellow, 120);
}
else if (renderData.WorldOutputType() == PrintOutputTypes.Hole)
{
drawColor = new Color(Color.Gray, 120);
}
// If there is a printer - check if the object is within the bed volume (has no AABB outside the bed volume)
if(sceneContext.Printer != null)
{
if (!renderData.InsideBuildVolume(sceneContext.Printer))
{
drawColor = new Color(drawColor, 65);
}
}
// check if we should be rendering materials (this overrides the other colors)
if (this.RenderType == RenderTypes.Materials)
{
drawColor = MatterialRendering.Color(renderData.WorldMaterialIndex());
}
bool isDebugItem = false; bool isDebugItem = false;
bool renderAsSolid = drawColor.alpha == 255; bool renderAsSolid = drawColor.alpha == 255;
#if DEBUG #if DEBUG
isDebugItem = scene.DebugItem == renderData; isDebugItem = scene.DebugItem == item;
renderAsSolid = (renderAsSolid && scene.DebugItem == null) renderAsSolid = (renderAsSolid && scene.DebugItem == null)
|| isDebugItem; || isDebugItem;
#endif #endif
if (renderAsSolid) if (renderAsSolid)
{ {
GLHelper.Render(renderData.Mesh, drawColor, renderData.WorldMatrix(), RenderType, renderData.WorldMatrix() * World.ModelviewMatrix); GLHelper.Render(item.Mesh, drawColor, item.WorldMatrix(), RenderType, item.WorldMatrix() * World.ModelviewMatrix);
} }
else else
{ {
transparentMeshes.Add(new Object3D() transparentMeshes.Add(item);
{
Mesh = renderData.Mesh,
Matrix = renderData.WorldMatrix(),
Color = (scene.DebugItem == null) ? drawColor : debugNotSelectedFillColor,
MaterialIndex = renderData.WorldMaterialIndex(),
OutputType = renderData.WorldOutputType()
});
} }
if (isSelected && !tooBigForComplexSelection) if (isSelected && !tooBigForComplexSelection)
{ {
RenderSelection(renderData, frustum); RenderSelection(item, frustum);
} }
#if DEBUG #if DEBUG
@ -511,9 +481,9 @@ namespace MatterHackers.MeshVisualizer
GLHelper.PrepareFor3DLineRender(true); GLHelper.PrepareFor3DLineRender(true);
RenderAABB(frustum, aabb, Matrix4X4.Identity, debugBorderColor, 1); RenderAABB(frustum, aabb, Matrix4X4.Identity, debugBorderColor, 1);
if (renderData.Mesh != null) if (item.Mesh != null)
{ {
GLHelper.Render(renderData.Mesh, debugBorderColor, renderData.WorldMatrix(), RenderTypes.Wireframe, renderData.WorldMatrix() * World.ModelviewMatrix); GLHelper.Render(item.Mesh, debugBorderColor, item.WorldMatrix(), RenderTypes.Wireframe, item.WorldMatrix() * World.ModelviewMatrix);
} }
} }
#endif #endif
@ -525,6 +495,36 @@ namespace MatterHackers.MeshVisualizer
} }
} }
private Color GetItemColor(IObject3D item)
{
Color drawColor = item.WorldColor();
if (item.WorldOutputType() == PrintOutputTypes.Support)
{
drawColor = new Color(Color.Yellow, 120);
}
else if (item.WorldOutputType() == PrintOutputTypes.Hole)
{
drawColor = new Color(Color.Gray, 120);
}
// If there is a printer - check if the object is within the bed volume (has no AABB outside the bed volume)
if (sceneContext.Printer != null)
{
if (!item.InsideBuildVolume(sceneContext.Printer))
{
drawColor = new Color(drawColor, 65);
}
}
// check if we should be rendering materials (this overrides the other colors)
if (this.RenderType == RenderTypes.Materials)
{
drawColor = MatterialRendering.Color(item.WorldMaterialIndex());
}
return drawColor;
}
private void RenderNormals(IObject3D renderData) private void RenderNormals(IObject3D renderData)
{ {
var frustum = World.GetClippingFrustum(); var frustum = World.GetClippingFrustum();
@ -658,25 +658,22 @@ namespace MatterHackers.MeshVisualizer
if (lookingDownOnBed) if (lookingDownOnBed)
{ {
// render the bed
RenderBedMesh(lookingDownOnBed); RenderBedMesh(lookingDownOnBed);
// than the transparent stuff
//int colorIndex = 0; // helps debug the sorting order
foreach (var transparentRenderData in transparentMeshes)
{
var color = transparentRenderData.Color;
//color = RGBA_Floats.FromHSL(Math.Max(colorIndex++, 0) / 10.0, .99, .49).ToColor();
GLHelper.Render(transparentRenderData.Mesh, color, transparentRenderData.Matrix, RenderTypes.Outlines, transparentRenderData.Matrix * World.ModelviewMatrix);
}
} }
else
// Transparent objects
foreach (var object3D in transparentMeshes)
{
GLHelper.Render(
object3D.Mesh,
GetItemColor(object3D),
object3D.WorldMatrix(),
RenderTypes.Outlines,
object3D.WorldMatrix() * World.ModelviewMatrix);
}
if (!lookingDownOnBed)
{ {
// render the transparent stuff
foreach (var transparentRenderData in transparentMeshes)
{
GLHelper.Render(transparentRenderData.Mesh, transparentRenderData.Color, transparentRenderData.Matrix, RenderTypes.Outlines, transparentRenderData.Matrix * World.ModelviewMatrix);
}
// than render the bed
RenderBedMesh(lookingDownOnBed); RenderBedMesh(lookingDownOnBed);
} }
@ -789,4 +786,5 @@ namespace MatterHackers.MeshVisualizer
} }
} }
} }
} }

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 0d57ebf6abaa365881fd9f9b18562c288ab8cb66 Subproject commit 9fd86f08b68ea6b97b82577a117a2bfe1a48cd13