LegacyConsole/PCK-Studio
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-06-14 02:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

SceneViewport - Add OnPaint override to clear color and depth buffer and enable depth testing

Browse Source
This commit is contained in:
miku-666
2024-10-08 11:49:59 +02:00
parent 4385b121bf
commit 43daadf1c9
3 changed files with 26 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
PCK-Studio/Rendering/ModelRenderer.cs
View File

@@ -206,10 +206,7 @@ namespace PckStudio.Rendering
if (DesignMode)
return;
if (!Context.IsCurrent)
MakeCurrent();
GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
GL.Enable(EnableCap.DepthTest); // Enable correct Z Drawings
return;
GL.Enable(EnableCap.Texture2D); // Enable textures
@@ -226,7 +223,7 @@ namespace PckStudio.Rendering
if (RenderModelBounds)
{
DrawBoundingBox(Matrix4.CreateScale(1f, -1f, -1f), _maxBounds, Color.Red);
DrawBoundingBox(Matrix4.CreateScale(1f, -1f, -1f), _maxBounds, Color.Red);
}
foreach (CubeMeshCollection item in _rootCollection)

56
PCK-Studio/Rendering/SceneViewport.cs
View File

@@ -75,11 +75,7 @@ namespace PckStudio.Rendering
protected PerspectiveCamera Camera { get; }
protected virtual void OnUpdate(object sender, TimeSpan timestep)
{
if (IsHandleCreated && !IsDisposed)
SwapBuffers();
}
protected virtual void OnUpdate(object sender, TimeSpan timestep) { }
[Browsable(false)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
@@ -165,8 +161,8 @@ namespace PckStudio.Rendering
}
MakeCurrent();
Trace.TraceInformation(GL.GetString(StringName.Version));
GL.DebugMessageCallback(DebugProc, IntPtr.Zero);
AddShader("Internal_colorShader", ShaderProgram.Create(Resources.plainColorVertexShader, Resources.plainColorFragmentShader));
GL.DebugMessageCallback(DebugProc, this.Handle);
AddShader("Internal_colorShader", Resources.plainColorVertexShader, Resources.plainColorFragmentShader);
var vao = new VertexArray();
VertexBufferLayout layout = new VertexBufferLayout();
layout.Add(ShaderDataType.Float3);
@@ -285,11 +281,10 @@ namespace PckStudio.Rendering
return boundingBoxes.Aggregate((a, b) => new BoundingBox(Vector3.ComponentMin(a.Start, b.Start), Vector3.ComponentMax(a.End, b.End)));
}
void DebugProc(DebugSource source, DebugType type, int id, DebugSeverity severity, int length, IntPtr message, IntPtr userParam)
static void DebugProc(DebugSource source, DebugType type, int id, DebugSeverity severity, int length, IntPtr message, IntPtr instanceHandle)
{
string dbgMessage = Marshal.PtrToStringAnsi(message, length);
Debug.WriteLine($"{source} {type} {severity}: {dbgMessage}");
Debug.WriteLine($"{source}:{id} {type} {severity}: {dbgMessage}");
}
[Conditional("DEBUG")]
@@ -373,7 +368,6 @@ namespace PckStudio.Rendering
[Conditional("USE_FRAMEBUFFER")]
private void SetFramebufferSize(Size size)
{
MakeCurrent();
if (_framebuffer is not null)
{
_framebuffer.Bind();
@@ -406,12 +400,19 @@ namespace PckStudio.Rendering
private void TimerTick(object sender, EventArgs e)
{
long tick = DateTime.UtcNow.Ticks - _lastTick;
Refresh();
_lastTick = DateTime.UtcNow.Ticks;
if (!HasValidContext)
MakeCurrent();
RenderDebug();
OnUpdate(sender, TimeSpan.FromTicks(tick));
Refresh();
RenderDebug();
if (IsHandleCreated && !IsDisposed)
SwapBuffers();
}
protected override void OnPaint(PaintEventArgs e)
{
base.OnPaint(e);
GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
GL.Enable(EnableCap.DepthTest); // Enable correct Z Drawings
}
protected override void OnSizeChanged(EventArgs e)
@@ -419,7 +420,6 @@ namespace PckStudio.Rendering
base.OnSizeChanged(e);
if (DesignMode)
return;
MakeCurrent();
if (Camera is not null)
{
Camera.ViewportSize = ClientSize;
@@ -526,16 +526,18 @@ namespace PckStudio.Rendering
private void RenderDebug()
{
#if DEBUG
d_debugLabel.Text = Camera.ToString();
GL.BlendFunc(BlendingFactor.SrcColor, BlendingFactor.SrcColor);
GL.DepthMask(false);
GL.DepthFunc(DepthFunction.Always);
GL.Enable(EnableCap.PointSmooth);
GL.Enable(EnableCap.LineSmooth);
ShaderProgram colorShader = GetShader("Internal_colorShader");
colorShader.Bind();
Matrix4 viewProjection = Camera.GetViewProjection();
colorShader.SetUniformMat4("ViewProjection", ref viewProjection);
if (d_showFocalPoint)
{
GL.BlendFunc(BlendingFactor.SrcColor, BlendingFactor.SrcColor);
GL.DepthFunc(DepthFunction.Always);
GL.DepthMask(false);
GL.Enable(EnableCap.PointSmooth);
colorShader.Bind();
Matrix4 transform = Matrix4.CreateTranslation(Camera.FocalPoint).Inverted();
colorShader.SetUniformMat4("Transform", ref transform);
colorShader.SetUniform1("intensity", 0.75f);
@@ -543,18 +545,9 @@ namespace PckStudio.Rendering
GL.PointSize(5f);
Renderer.Draw(colorShader, d_debugPointDrawContext);
GL.PointSize(1f);
GL.DepthMask(true);
GL.DepthFunc(DepthFunction.Less);
GL.BlendFunc(BlendingFactor.SrcAlpha, BlendingFactor.OneMinusSrcAlpha);
}
if (d_showDirectionArrows)
{
GL.BlendFunc(BlendingFactor.SrcColor, BlendingFactor.SrcColor);
GL.DepthFunc(DepthFunction.Always);
GL.DepthMask(false);
GL.Enable(EnableCap.LineSmooth);
colorShader.Bind();
Matrix4 transform = Matrix4.CreateScale(1, -1, -1);
transform *= Matrix4.CreateTranslation(Vector3.Zero);
transform *= Matrix4.CreateScale(Camera.Distance / 4f).Inverted();
@@ -569,11 +562,10 @@ namespace PckStudio.Rendering
Renderer.SetLineWidth(1f);
}
GL.DepthMask(true);
GL.DepthFunc(DepthFunction.Less);
GL.BlendFunc(BlendingFactor.SrcAlpha, BlendingFactor.OneMinusSrcAlpha);
}
d_debugLabel.Text = Camera.ToString();
#endif
}

8
PCK-Studio/Rendering/SkinRenderer.cs
View File

@@ -168,7 +168,6 @@ namespace PckStudio.Rendering
Bitmap bmp = new Bitmap(Width, Height);
BitmapData data = bmp.LockBits(ClientRectangle, ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
MakeCurrent();
GL.Finish();
GL.ReadPixels(0, 0, Width, Height, OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, data.Scan0);
bmp.UnlockBits(data);
@@ -280,7 +279,6 @@ namespace PckStudio.Rendering
if (initialized)
Debug.Fail("Already Initialized!");
autoInflateOverlayParts = inflateOverlayParts;
MakeCurrent();
InitializeShaders();
Renderer.SetClearColor(BackColor);
GLErrorCheck();
@@ -386,7 +384,6 @@ namespace PckStudio.Rendering
private void InitializeShaders()
{
MakeCurrent();
plainColorVertexBufferLayout = new VertexBufferLayout();
plainColorVertexBufferLayout.Add(ShaderDataType.Float3);
plainColorVertexBufferLayout.Add(ShaderDataType.Float4);
@@ -798,13 +795,8 @@ namespace PckStudio.Rendering
return;
}
MakeCurrent();
FramebufferBegin();
GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
GL.Enable(EnableCap.DepthTest); // Enable correct Z Drawings
GL.Enable(EnableCap.LineSmooth);
Matrix4 viewProjection = Camera.GetViewProjection();