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

Move Set/Unset GLContext helpers to agg

Browse source
This commit is contained in:
John Lewin 2018-03-23 16:42:25 -07:00
parent fb381d1c98
commit 7c641bc2a0
4 changed files with 8 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

79
PartPreviewWindow/View3D/InteractionLayer.cs
View file

@ -36,6 +36,7 @@ using MatterHackers.DataConverters3D;
using MatterHackers.MeshVisualizer;
using MatterHackers.RayTracer;
using MatterHackers.RayTracer.Traceable;
using MatterHackers.RenderOpenGl;
using MatterHackers.RenderOpenGl.OpenGl;
using MatterHackers.VectorMath;
using static MatterHackers.MeshVisualizer.MeshViewerWidget;
@ -82,9 +83,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
if (DoOpenGlDrawing)
{
SetGlContext(this.World, renderSource.TransformToScreenSpace(renderSource.LocalBounds), lighting);
GLHelper.SetGlContext(this.World, renderSource.TransformToScreenSpace(renderSource.LocalBounds), lighting);
OnDrawGlContent(e);
UnsetGlContext();
GLHelper.UnsetGlContext();
}
}
@ -327,79 +328,5 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
DrawGlOpaqueContent?.Invoke(this, e);
DrawGlTransparentContent?.Invoke(this, e);
}
public static void SetGlContext(WorldView worldView, RectangleDouble screenRect, LightingData lighting)
{
GL.ClearDepth(1.0);
GL.Clear(ClearBufferMask.DepthBufferBit); // Clear the Depth Buffer
GL.PushAttrib(AttribMask.ViewportBit);
GL.Viewport((int)screenRect.Left, (int)screenRect.Bottom, (int)screenRect.Width, (int)screenRect.Height);
GL.ShadeModel(ShadingModel.Smooth);
GL.FrontFace(FrontFaceDirection.Ccw);
GL.CullFace(CullFaceMode.Back);
GL.DepthFunc(DepthFunction.Lequal);
GL.Disable(EnableCap.DepthTest);
//ClearToGradient();
GL.Light(LightName.Light0, LightParameter.Ambient, lighting.AmbientLight);
GL.Light(LightName.Light0, LightParameter.Diffuse, lighting.DiffuseLight0);
GL.Light(LightName.Light0, LightParameter.Specular, lighting.SpecularLight0);
GL.Light(LightName.Light1, LightParameter.Diffuse, lighting.DiffuseLight1);
GL.Light(LightName.Light1, LightParameter.Specular, lighting.SpecularLight1);
GL.ColorMaterial(MaterialFace.FrontAndBack, ColorMaterialParameter.AmbientAndDiffuse);
GL.Enable(EnableCap.Light0);
GL.Enable(EnableCap.Light1);
GL.Enable(EnableCap.DepthTest);
GL.Enable(EnableCap.Blend);
GL.Enable(EnableCap.Normalize);
GL.Enable(EnableCap.Lighting);
GL.Enable(EnableCap.ColorMaterial);
Vector3 lightDirectionVector = new Vector3(lighting.LightDirection0[0], lighting.LightDirection0[1], lighting.LightDirection0[2]);
lightDirectionVector.Normalize();
lighting.LightDirection0[0] = (float)lightDirectionVector.X;
lighting.LightDirection0[1] = (float)lightDirectionVector.Y;
lighting.LightDirection0[2] = (float)lightDirectionVector.Z;
GL.Light(LightName.Light0, LightParameter.Position, lighting.LightDirection0);
GL.Light(LightName.Light1, LightParameter.Position, lighting.LightDirection1);
// set the projection matrix
GL.MatrixMode(MatrixMode.Projection);
GL.PushMatrix();
GL.LoadMatrix(worldView.ProjectionMatrix.GetAsDoubleArray());
// set the modelview matrix
GL.MatrixMode(MatrixMode.Modelview);
GL.PushMatrix();
GL.LoadMatrix(worldView.ModelviewMatrix.GetAsDoubleArray());
}
public static void UnsetGlContext()
{
GL.MatrixMode(MatrixMode.Projection);
GL.PopMatrix();
GL.MatrixMode(MatrixMode.Modelview);
GL.PopMatrix();
GL.Disable(EnableCap.ColorMaterial);
GL.Disable(EnableCap.Lighting);
GL.Disable(EnableCap.Light0);
GL.Disable(EnableCap.Light1);
GL.Disable(EnableCap.Normalize);
GL.Disable(EnableCap.Blend);
GL.Disable(EnableCap.DepthTest);
GL.PopAttrib();
}
}
}

4
PartPreviewWindow/View3D/TumbleCubeControl.cs
View file

@ -86,9 +86,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var directionUp = Vector3.TransformNormal(up, interactionLayer.World.InverseModelviewMatrix);
world.RotationMatrix = Matrix4X4.LookAt(Vector3.Zero, directionForward, directionUp);
InteractionLayer.SetGlContext(world, screenSpaceBounds, lighting);
GLHelper.SetGlContext(world, screenSpaceBounds, lighting);
GLHelper.Render(cube, Color.White, Matrix4X4.Identity, RenderTypes.Shaded);
InteractionLayer.UnsetGlContext();
GLHelper.UnsetGlContext();
base.OnDraw(graphics2D);
}