sync up my renderengine

Author: LoneWandererProductions

RenderEngine/RenderBatch.cs

@@ -15,16 +15,20 @@ public sealed class RenderBatch
     {
         public readonly List<float> SolidLineVertices = new();
         public readonly List<float> SolidTriangleVertices = new();
-        public readonly List<float> TexVertices = new();
+        public readonly Dictionary<int, List<float>> TexturedBatches = new();
+
         public readonly List<Action> HostActions = new();
 
-        public void AddColoredLine(
-            float x0, float y0,
-            float x1, float y1,
-            int r, int g, int b, int a)
+        public void AddColoredLine(float x, float y, int r, int g, int b, int a)
         {
-            AddColoredVertex(x0, y0, r, g, b, a, SolidLineVertices);
-            AddColoredVertex(x1, y1, r, g, b, a, SolidLineVertices);
+            // Pushes a single vertex into the line batch.
+            // When flushed, OpenGL will connect every 2 consecutive vertices into a line segment.
+            AddColoredVertex(x, y, r, g, b, a, SolidLineVertices);
+        }
+
+        public void AddSolidTriangleVertex(float x, float y, int r, int g, int b, int a)
+        {
+            AddColoredVertex(x, y, r, g, b, a, SolidTriangleVertices);
         }
 
         public void AddColoredTriangle(
@@ -54,25 +58,35 @@ public void AddSolidQuad(
         public void AddTexturedQuad(
             (int x, int y) p1, (int x, int y) p2,
             (int x, int y) p3, (int x, int y) p4,
-            int textureId) // Note: Batching assumes the same textureId for the whole batch for now
+            int textureId)
         {
-            AddTexturedTriangle(p1, p2, p3);
-            AddTexturedTriangle(p1, p3, p4);
+            AddTexturedTriangle(p1, p2, p3, textureId);
+            AddTexturedTriangle(p1, p3, p4, textureId);
         }
+
         public void AddTexturedTriangle(
-            (int x, int y) p1, (int x, int y) p2, (int x, int y) p3)
+            (int x, int y) p1, (int x, int y) p2, (int x, int y) p3,
+            int textureId)
         {
-            AddTexturedVertex(p1.x, p1.y, 0f, 0f);
-            AddTexturedVertex(p2.x, p2.y, 1f, 0f);
-            AddTexturedVertex(p3.x, p3.y, 0f, 1f);
+            // Grab the list for this specific texture, or create it if it doesn't exist
+            if (!TexturedBatches.TryGetValue(textureId, out var list))
+            {
+                list = new List<float>();
+                TexturedBatches[textureId] = list;
+            }
+
+            // Notice we only push the 4 required floats, but into the correct texture's list
+            AddTexturedVertex(p1.x, p1.y, 0f, 0f, list);
+            AddTexturedVertex(p2.x, p2.y, 1f, 0f, list);
+            AddTexturedVertex(p3.x, p3.y, 0f, 1f, list);
         }
 
-        private void AddTexturedVertex(float x, float y, float u, float v)
+        private void AddTexturedVertex(float x, float y, float u, float v, List<float> targetList)
         {
-            TexVertices.Add(x);
-            TexVertices.Add(y);
-            TexVertices.Add(u);
-            TexVertices.Add(v);
+            targetList.Add(x);
+            targetList.Add(y);
+            targetList.Add(u);
+            targetList.Add(v);
         }
 
         private void AddColoredVertex(
@@ -85,11 +99,12 @@ private void AddColoredVertex(
             targetList.Add(b / 255f);
             targetList.Add(a / 255f);
         }
+
         public void Clear()
         {
-            TexVertices.Clear();
             SolidLineVertices.Clear();
             SolidTriangleVertices.Clear();
+            TexturedBatches.Clear(); // Clear the dictionary here
             HostActions.Clear();
         }
 

RenderEngine/Simple2DRenderer.cs

@@ -515,7 +515,6 @@ public void DrawFullscreenQuad(int idx)
                 ((int)w, (int)h),
                 (0, (int)h));
 
-            // FIXED: Using correct texture VBO, capacity, and checking data.Length instead of texture ID
             EnsureBufferCapacity(_vboTex, ref _vboTexCapacity, data.Length);
 
             GL.BindBuffer(BufferTarget.ArrayBuffer, _vboTex);
@@ -563,19 +562,34 @@ private void FlushBatch(RenderBatch batch)
             }
 
             // --- Textured Vertices ---
-            if (batch.TexVertices.Count > 0)
+            if (batch.TexturedBatches.Count > 0)
             {
                 GL.UseProgram(_ui2DTextureShader);
                 GL.BindVertexArray(_vaoTex);
 
-                var data = batch.TexVertices.ToArray();
-                EnsureBufferCapacity(_vboTex, ref _vboTexCapacity, data.Length);
+                // Loop through each texture group
+                foreach (var kvp in batch.TexturedBatches)
+                {
+                    int texId = kvp.Key;
+                    var dataList = kvp.Value;
 
-                GL.BindBuffer(BufferTarget.ArrayBuffer, _vboTex);
-                GL.BufferSubData(BufferTarget.ArrayBuffer, IntPtr.Zero, data.Length * sizeof(float), data);
+                    if (dataList.Count == 0) continue;
+
+                    var data = dataList.ToArray();
+                    EnsureBufferCapacity(_vboTex, ref _vboTexCapacity, data.Length);
+
+                    // Bind the specific texture for this batch
+                    GL.ActiveTexture(TextureUnit.Texture0);
+
+                    // Use checkerboard if the texture ID is invalid (< 0)
+                    GL.BindTexture(TextureTarget.Texture2D, texId < 0 ? GetOrCreateCheckerboardTexture() : texId);
+                    GL.Uniform1(GL.GetUniformLocation(_ui2DTextureShader, "uTexture"), 0);
 
-                // Note: For now, this assumes the appropriate texture was bound BEFORE calling FlushBatch.
-                GL.DrawArrays(PrimitiveType.Triangles, 0, data.Length / 4);
+                    // Upload and draw
+                    GL.BindBuffer(BufferTarget.ArrayBuffer, _vboTex);
+                    GL.BufferSubData(BufferTarget.ArrayBuffer, IntPtr.Zero, data.Length * sizeof(float), data);
+                    GL.DrawArrays(PrimitiveType.Triangles, 0, data.Length / 4);
+                }
 
                 GL.BindTexture(TextureTarget.Texture2D, 0);
                 GL.BindVertexArray(0);

RenderEngine/UnmanagedImageBuffer.cs

@@ -311,6 +311,8 @@ public void BlitRegion(UnmanagedImageBuffer src, int srcX, int srcY, int width,
         /// </summary>
         public IntPtr Buffer => _buffer;
 
+        public int Id { get; set; }
+
         /// <summary>
         /// Returns a hash code for this instance.
         /// </summary>