From f5f3bad8db2dc7fb8b77b4ebfda943486684e3b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20L=C3=BCbe=C3=9F?= Date: Wed, 11 Aug 2021 17:20:48 +0200 Subject: [PATCH] Fixed Renderer2D - Fixed textures not being bound - Fixed destructor trying to delete scoped object --- GlitchyEngine/src/Renderer/Renderer2D.bf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GlitchyEngine/src/Renderer/Renderer2D.bf b/GlitchyEngine/src/Renderer/Renderer2D.bf index cd03690..b8c8e63 100644 --- a/GlitchyEngine/src/Renderer/Renderer2D.bf +++ b/GlitchyEngine/src/Renderer/Renderer2D.bf @@ -130,7 +130,7 @@ namespace GlitchyEngine.Renderer instanceBuffer = new VertexBuffer(_context, typeof(BatchVertex), 1024, .Dynamic, .Write); instanceBuffer.SetData(0); - VertexElement[] vertexElements = scope .( + VertexElement[] vertexElements = new .( VertexElement(.R32G32_Float, "POSITION", false, 0, 0, 0, .PerVertexData, 0), VertexElement(.R32G32B32A32_Float, "TRANSFORM", false, 0, 1, (.)-1, .PerInstanceData, 1), @@ -290,7 +290,7 @@ namespace GlitchyEngine.Renderer SortQuads(); Texture2D texture = _quads[0].Texture; - texture.Bind(); + instancingEffect.SetTexture("Texture", texture); _setInstances = 0; @@ -304,7 +304,7 @@ namespace GlitchyEngine.Renderer FlushInstances(); texture = quad.Texture; - texture.Bind(); + instancingEffect.SetTexture("Texture", texture); } _rawInstances[_setInstances++] = .(quad.Transform, quad.Color, quad.uvTransform);