From 451c0aabd55ea24dfe9f23f3fb9b4058a14b790c Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Sun, 22 Sep 2024 13:56:44 +0200 Subject: [PATCH] ShaderProgram - Add 'SetUniform2' overload for System.Drawing.Size --- PCK-Studio/Rendering/Shader/ShaderProgram.cs | 2 ++ PCK-Studio/Rendering/SkinRenderer.cs | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/PCK-Studio/Rendering/Shader/ShaderProgram.cs b/PCK-Studio/Rendering/Shader/ShaderProgram.cs index b1bd12aa..b4923a0f 100644 --- a/PCK-Studio/Rendering/Shader/ShaderProgram.cs +++ b/PCK-Studio/Rendering/Shader/ShaderProgram.cs @@ -65,6 +65,8 @@ namespace PckStudio.Rendering.Shader GL.Uniform1(location, value); } + public void SetUniform2(string name, Size value) => SetUniform2(name, new Vector2(value.Width, value.Height)); + public void SetUniform2(string name, Vector2 value) { int location = GetUniformLocation(name); diff --git a/PCK-Studio/Rendering/SkinRenderer.cs b/PCK-Studio/Rendering/SkinRenderer.cs index 8e82b938..7cf282c8 100644 --- a/PCK-Studio/Rendering/SkinRenderer.cs +++ b/PCK-Studio/Rendering/SkinRenderer.cs @@ -26,7 +26,6 @@ using System.Windows.Forms; using System.ComponentModel; using System.Drawing; using PckStudio.Properties; -using PckStudio.Forms.Editor; using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Drawing.Imaging; @@ -873,7 +872,7 @@ namespace PckStudio.Rendering ShaderProgram cubeShader = GetShader("CubeShader"); cubeShader.Bind(); cubeShader.SetUniformMat4("u_ViewProjection", ref viewProjection); - cubeShader.SetUniform2("u_TexSize", new Vector2(TextureSize.Width, TextureSize.Height)); + cubeShader.SetUniform2("u_TexSize", TextureSize); skinTexture.Bind();