From 6f48f6c233a9632bf729cb7f4e5d380d25a8144b Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Thu, 29 Feb 2024 12:18:01 +0100 Subject: [PATCH] Texture2D - Fix broken api --- PCK-Studio/Rendering/SkinRenderer.cs | 2 +- PCK-Studio/Rendering/Texture/Texture2D.cs | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/PCK-Studio/Rendering/SkinRenderer.cs b/PCK-Studio/Rendering/SkinRenderer.cs index 0b0e9937..40937ae0 100644 --- a/PCK-Studio/Rendering/SkinRenderer.cs +++ b/PCK-Studio/Rendering/SkinRenderer.cs @@ -599,7 +599,7 @@ namespace PckStudio.Rendering if (e.Cancel) return; - skinTexture.LoadImageData(e.NewTexture); + skinTexture.SetTexture(e.NewTexture); GLErrorCheck(); } diff --git a/PCK-Studio/Rendering/Texture/Texture2D.cs b/PCK-Studio/Rendering/Texture/Texture2D.cs index 08cdcea5..a703cec6 100644 --- a/PCK-Studio/Rendering/Texture/Texture2D.cs +++ b/PCK-Studio/Rendering/Texture/Texture2D.cs @@ -9,20 +9,9 @@ namespace PckStudio.Rendering.Texture { internal class Texture2D : Texture { - public Texture2D(string filepath, int slot) - : this(Image.FromFile(filepath), slot) - { - - } - public OpenTK.Graphics.OpenGL.PixelFormat PixelFormat { get; set; } public PixelInternalFormat InternalPixelFormat { get; set; } - public Texture2D(Image image, int slot) : this(slot) - { - LoadImageData(image); - } - public Texture2D(int slot) : this() { Slot = slot; @@ -39,7 +28,7 @@ namespace PckStudio.Rendering.Texture Unbind(); } - public void LoadImageData(Image image) + public void SetTexture(Image image) { Bind(); var bitmap = new Bitmap(image);