From 02eec269965ade3675426b5045abd0be37874d2f Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Wed, 1 May 2024 19:24:45 +0200 Subject: [PATCH] Texture.cs - Add virtual function 'SetTexture' --- PCK-Studio/Rendering/Texture/CubeTexture.cs | 2 +- PCK-Studio/Rendering/Texture/Texture.cs | 6 ++++++ PCK-Studio/Rendering/Texture/Texture2D.cs | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/PCK-Studio/Rendering/Texture/CubeTexture.cs b/PCK-Studio/Rendering/Texture/CubeTexture.cs index a60c36f6..5931546e 100644 --- a/PCK-Studio/Rendering/Texture/CubeTexture.cs +++ b/PCK-Studio/Rendering/Texture/CubeTexture.cs @@ -17,7 +17,7 @@ namespace PckStudio.Rendering.Texture Slot = slot; } - public void SetTexture(Image image) + public override void SetTexture(Image image) { Bind(); diff --git a/PCK-Studio/Rendering/Texture/Texture.cs b/PCK-Studio/Rendering/Texture/Texture.cs index 908f5c7c..0fa5d386 100644 --- a/PCK-Studio/Rendering/Texture/Texture.cs +++ b/PCK-Studio/Rendering/Texture/Texture.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics; +using System.Drawing; using OpenTK; using OpenTK.Graphics.OpenGL; @@ -87,6 +88,11 @@ namespace PckStudio.Rendering.Texture Target = target; } + public virtual void SetTexture(Image image) + { + throw new NotImplementedException(); + } + public void Bind() { GL.ActiveTexture(TextureUnit.Texture0 + Slot); diff --git a/PCK-Studio/Rendering/Texture/Texture2D.cs b/PCK-Studio/Rendering/Texture/Texture2D.cs index cb73e1ed..d2ed79ee 100644 --- a/PCK-Studio/Rendering/Texture/Texture2D.cs +++ b/PCK-Studio/Rendering/Texture/Texture2D.cs @@ -21,7 +21,7 @@ namespace PckStudio.Rendering.Texture Unbind(); } - public void SetTexture(Image image) + public override void SetTexture(Image image) { Bind(); var bitmap = new Bitmap(image);