sync some stuff

LoneWandererProductions · LoneWandererProductions · commit dcc778da8210 · 2026-06-17T10:06:55.000+02:00
diff --git a/CommonLibraryGuiTests/Image/example Polaris.png b/CommonLibraryGuiTests/Image/example Polaris.png
diff --git a/CommonLibraryGuiTests/Image/example.png b/CommonLibraryGuiTests/Image/example.png
diff --git a/RenderEngine/GLResourceManager.cs b/RenderEngine/GLResourceManager.cs
@@ -37,11 +37,13 @@ public sealed class GlResourceManager : IDisposable
         /// </summary>
         private bool _disposed;
 
+        public bool UseMatrices { get; set; } = true;
+
         // --- Textures ---
 
         /// <summary>
         /// Gets the texture.
-        /// Be carefull, this can overwrite existing textures.
+        /// Be careful, this can overwrite existing textures.
         /// </summary>
         /// <param name="filePath">The file path.</param>
         /// <returns>Id of Texture</returns>
@@ -126,11 +128,10 @@ public int GetShaderProgram(ShaderTypeApp appType)
                     break;
 
                 case ShaderTypeApp.Wireframe:
-                    var useMatrices = true;
-                    vertexSrc = useMatrices
+                    vertexSrc = UseMatrices
                         ? ShaderResource.WireframeVertexShader
                         : ShaderResource.WireframeVertexShaderPassThrough;
-                    fragmentSrc = useMatrices
+                    fragmentSrc = UseMatrices
                         ? ShaderResource.WireframeFragmentShader
                         : ShaderResource.WireframeFragmentShaderPassThrough;
                     break;
@@ -272,4 +273,4 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
     }
-}
+}
diff --git a/RenderEngine/Geometry2DBuilder.cs b/RenderEngine/Geometry2DBuilder.cs
@@ -197,4 +197,4 @@ internal static (float x, float y, int r, int g, int b, int a)[] BuildCircleOutl
             return pts;
         }
     }
-}
+}
diff --git a/RenderEngine/ImageToolkit.cs b/RenderEngine/ImageToolkit.cs
@@ -187,4 +187,4 @@ public int[] CompositeToBits()
             }
         }
     }
-}
+}
diff --git a/RenderEngine/Interfaces/IImageToolkit.cs b/RenderEngine/Interfaces/IImageToolkit.cs
@@ -63,4 +63,4 @@ public interface IImageToolkit
         /// <param name="insertAt">The insert at.</param>
         void MergeLayers(LayeredImageContainer container, int[] layerIndices, int insertAt);
     }
-}
+}
diff --git a/RenderEngine/LayeredImageContainer.cs b/RenderEngine/LayeredImageContainer.cs
@@ -236,4 +236,4 @@ private static unsafe void AlphaBlend(Span<byte> baseSpan, Span<byte> overlaySpa
             }
         }
     }
-}
+}
diff --git a/RenderEngine/OpenTKHelper.cs b/RenderEngine/OpenTKHelper.cs
@@ -295,4 +295,4 @@ internal static bool IsOpenGlCompatible(int requiredMajor = 4, int requiredMinor
             return _glVersion >= new Version(requiredMajor, requiredMinor);
         }
     }
-}
+}
diff --git a/RenderEngine/RenderBatch.cs b/RenderEngine/RenderBatch.cs
@@ -309,4 +309,4 @@ public void AddHostAction(Action action)
             HostActions.Add(action);
         }
     }
-}
+}
diff --git a/RenderEngine/RenderResource.cs b/RenderEngine/RenderResource.cs
@@ -33,19 +33,9 @@ internal static class RenderResource
         /// </summary>
         internal const string ErrorNoLayers = "No layers to composite.";
 
-        /// <summary>
-        /// The shader skybox vertex
-        /// </summary>
-        internal const string ShaderSkyboxVertex = "skybox_vertex.glsl";
-
-        /// <summary>
-        /// The shader skybox fragment
-        /// </summary>
-        internal const string ShaderSkyboxFragment = "skybox_fragment.glsl";
-
         /// <summary>
         /// The error layer size mismatch
         /// </summary>
         internal const string ErrorLayerSizeMismatch = "Layer size mismatch.";
     }
-}
+}
diff --git a/RenderEngine/ShaderResources.cs b/RenderEngine/ShaderResources.cs
@@ -572,4 +572,4 @@ void main() {
     FragColor = vec4(uFogColor * fogFactor, 1.0);
 }";
     }
-}
+}
diff --git a/RenderEngine/ShaderTypeApp.cs b/RenderEngine/ShaderTypeApp.cs
@@ -29,4 +29,4 @@ public enum ShaderTypeApp
         WaterRipple = 11, // placeholder
         VolumetricFog = 12 // placeholde
     }
-}
+}
diff --git a/RenderEngine/Simple2DRenderer.cs b/RenderEngine/Simple2DRenderer.cs
@@ -454,7 +454,6 @@ public void DrawTexturedEllipse(
                 data[idx++] = v1;
             }
 
-            // FIXED: Using correct texture VBO and capacity
             EnsureBufferCapacity(_vboTex, ref _vboTexCapacity, idx);
 
             GL.BindBuffer(BufferTarget.ArrayBuffer, _vboTex);
@@ -718,7 +717,7 @@ public int GetOrCreateCheckerboardTexture()
         private void BindShaderAndViewport(int shaderId)
         {
             GL.UseProgram(shaderId);
-            GL.Uniform2(GL.GetUniformLocation(shaderId, "uViewport"), (float)Width, (float)Height);
+            GL.Uniform2(GL.GetUniformLocation(shaderId, "uViewport"), Width, (float)Height);
         }
 
         /// <summary>
@@ -739,4 +738,4 @@ public void Dispose()
             }
         }
     }
-}
+}
diff --git a/RenderEngine/Simple3DRenderer.cs b/RenderEngine/Simple3DRenderer.cs
@@ -41,23 +41,64 @@ public sealed class Simple3DRenderer : IDisposable
         /// </summary>
         private readonly GlResourceManager _resources;
 
+        /// <summary>
+        /// The vao solid
+        /// </summary>
         private int _vaoSolid, _vboSolid, _vaoTex, _vboTex;
+
+        /// <summary>
+        /// The shader solid
+        /// </summary>
         private int _shaderSolid, _shaderTex;
+
+        /// <summary>
+        /// The initialized
+        /// </summary>
         private bool _initialized;
+
+        /// <summary>
+        /// The vbo solid capacity
+        /// </summary>
         private int _vboSolidCapacity = 16384, _vboTexCapacity = 16384;
 
+        /// <summary>
+        /// The projection
+        /// </summary>
         private TK.Matrix4 _projection;
+
+        /// <summary>
+        /// The view
+        /// </summary>
         private TK.Matrix4 _view;
 
+        /// <summary>
+        /// Gets the view matrix.
+        /// </summary>
+        /// <value>
+        /// The view matrix.
+        /// </value>
         public TK.Matrix4 ViewMatrix => _view;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Simple3DRenderer"/> class.
+        /// </summary>
+        /// <param name="width">The width.</param>
+        /// <param name="height">The height.</param>
+        /// <param name="resources">The resources.</param>
         public Simple3DRenderer(int width, int height, GlResourceManager resources)
         {
             _resources = resources;
             UpdateProjection(width, height);
             SetCamera(new Vector3(8, 15, 25), new Vector3(8, 0, 8), Vector3.UnitY);
         }
 
+        /// <summary>
+        /// Sets the projection.
+        /// </summary>
+        /// <param name="fovDegrees">The fov degrees.</param>
+        /// <param name="aspect">The aspect.</param>
+        /// <param name="near">The near plane distance.</param>
+        /// <param name="far">The far plane distance.</param>
         public void SetProjection(float fovDegrees, float aspect, float near, float far)
         {
             _projection = TK.Matrix4.CreatePerspectiveFieldOfView(
@@ -67,6 +108,11 @@ public void SetProjection(float fovDegrees, float aspect, float near, float far)
                 far);
         }
 
+        /// <summary>
+        /// Updates the projection.
+        /// </summary>
+        /// <param name="width">The width.</param>
+        /// <param name="height">The height.</param>
         public void UpdateProjection(int width, int height)
         {
             if (width <= 0) width = 1;
@@ -79,6 +125,12 @@ public void UpdateProjection(int width, int height)
             SetProjection(45f, aspect, 0.1f, 10000f);
         }
 
+        /// <summary>
+        /// Sets the camera.
+        /// </summary>
+        /// <param name="position">The position.</param>
+        /// <param name="target">The target.</param>
+        /// <param name="up">Up.</param>
         public void SetCamera(Vector3 position, Vector3 target, Vector3 up)
         {
             if (Vector3.DistanceSquared(position, target) < 0.001f)
@@ -90,6 +142,9 @@ public void SetCamera(Vector3 position, Vector3 target, Vector3 up)
                 new TK.Vector3(up.X, up.Y, up.Z));
         }
 
+        /// <summary>
+        /// Ensures the initialized.
+        /// </summary>
         private void EnsureInitialized()
         {
             if (_initialized) return;
@@ -127,6 +182,13 @@ private void EnsureInitialized()
             _initialized = true;
         }
 
+        /// <summary>
+        /// Draws the triangle.
+        /// </summary>
+        /// <param name="v0">The v0.</param>
+        /// <param name="v1">The v1.</param>
+        /// <param name="v2">The v2.</param>
+        /// <param name="color">The color.</param>
         public void DrawTriangle(Vector3 v0, Vector3 v1, Vector3 v2, (int r, int g, int b, int a) color)
         {
             EnsureInitialized();
@@ -140,16 +202,28 @@ public void DrawTriangle(Vector3 v0, Vector3 v1, Vector3 v2, (int r, int g, int
             var b = color.b / 255f;
             var a = color.a / 255f;
 
-            float[] data = { v0.X, v0.Y, v0.Z, r, g, b, a, v1.X, v1.Y, v1.Z, r, g, b, a, v2.X, v2.Y, v2.Z, r, g, b, a };
+            float[] data =
+            {
+                v0.X, v0.Y, v0.Z, r, g, b, a,
+                v1.X, v1.Y, v1.Z, r, g, b, a,
+                v2.X, v2.Y, v2.Z, r, g, b, a
+            };
 
             GL.BindBuffer(BufferTarget.ArrayBuffer, _vboSolid);
             GL.BufferSubData(BufferTarget.ArrayBuffer, IntPtr.Zero, data.Length * sizeof(float), data);
             GL.DrawArrays(PrimitiveType.Triangles, 0, 3);
         }
 
-        // ============================================================
-        // RE-ADDED: DrawTexturedTriangle for Immediate Mode
-        // ============================================================
+        /// <summary>
+        /// Draws the textured triangle.
+        /// </summary>
+        /// <param name="v0">The v0.</param>
+        /// <param name="uv0">The uv0.</param>
+        /// <param name="v1">The v1.</param>
+        /// <param name="uv1">The uv1.</param>
+        /// <param name="v2">The v2.</param>
+        /// <param name="uv2">The uv2.</param>
+        /// <param name="textureId">The texture identifier.</param>
         public void DrawTexturedTriangle(Vector3 v0, Vector2 uv0, Vector3 v1, Vector2 uv1, Vector3 v2, Vector2 uv2,
             int textureId)
         {
@@ -163,18 +237,22 @@ public void DrawTexturedTriangle(Vector3 v0, Vector2 uv0, Vector3 v1, Vector2 uv
 
             float[] data =
             {
-                v0.X, v0.Y, v0.Z, uv0.X, uv0.Y, 1, 1, 1, 1, v1.X, v1.Y, v1.Z, uv1.X, uv1.Y, 1, 1, 1, 1, v2.X, v2.Y,
-                v2.Z, uv2.X, uv2.Y, 1, 1, 1, 1
+                v0.X, v0.Y, v0.Z, uv0.X, uv0.Y, 1, 1, 1, 1,
+                v1.X, v1.Y, v1.Z, uv1.X, uv1.Y, 1, 1, 1, 1,
+                v2.X, v2.Y, v2.Z, uv2.X, uv2.Y, 1, 1, 1, 1
             };
 
             GL.BindBuffer(BufferTarget.ArrayBuffer, _vboTex);
             GL.BufferSubData(BufferTarget.ArrayBuffer, IntPtr.Zero, data.Length * sizeof(float), data);
             GL.DrawArrays(PrimitiveType.Triangles, 0, 3);
         }
 
-        // ============================================================
-        // RE-ADDED: DrawSprite for Immediate Mode
-        // ============================================================
+        /// <summary>
+        /// Draws the sprite.
+        /// </summary>
+        /// <param name="position">The position.</param>
+        /// <param name="radius">The radius.</param>
+        /// <param name="textureId">The texture identifier.</param>
         public void DrawSprite(Vector3 position, float radius, int textureId)
         {
             EnsureInitialized();
@@ -198,16 +276,24 @@ public void DrawSprite(Vector3 position, float radius, int textureId)
 
             float[] data =
             {
-                v0.X, v0.Y, v0.Z, 0, 0, 1, 1, 1, 1, v1.X, v1.Y, v1.Z, 1, 0, 1, 1, 1, 1, v2.X, v2.Y, v2.Z, 1, 1, 1,
-                1, 1, 1, v0.X, v0.Y, v0.Z, 0, 0, 1, 1, 1, 1, v2.X, v2.Y, v2.Z, 1, 1, 1, 1, 1, 1, v3.X, v3.Y, v3.Z,
-                0, 1, 1, 1, 1, 1
+                v0.X, v0.Y, v0.Z, 0, 0, 1, 1, 1, 1,
+                v1.X, v1.Y, v1.Z, 1, 0, 1, 1, 1, 1,
+                v2.X, v2.Y, v2.Z, 1, 1, 1, 1, 1, 1,
+                v0.X, v0.Y, v0.Z, 0, 0, 1, 1, 1, 1,
+                v2.X, v2.Y, v2.Z, 1, 1, 1, 1, 1, 1,
+                v3.X, v3.Y, v3.Z, 0, 1, 1, 1, 1, 1
             };
 
             GL.BindBuffer(BufferTarget.ArrayBuffer, _vboTex);
             GL.BufferSubData(BufferTarget.ArrayBuffer, IntPtr.Zero, data.Length * sizeof(float), data);
             GL.DrawArrays(PrimitiveType.Triangles, 0, 6);
         }
 
+        /// <summary>
+        /// Uploads the matrices.
+        /// </summary>
+        /// <param name="shader">The shader.</param>
+        /// <param name="model">The model.</param>
         private void UploadMatrices(int shader, ref TK.Matrix4 model)
         {
             var locModel = GL.GetUniformLocation(shader, "model");
@@ -234,6 +320,10 @@ public void SetCustomProjection(Matrix4x4 projection)
             );
         }
 
+        /// <summary>
+        /// Flushes the specified batch.
+        /// </summary>
+        /// <param name="batch">The batch.</param>
         public unsafe void Flush(RenderBatch batch)
         {
             EnsureInitialized();
@@ -274,6 +364,12 @@ public unsafe void Flush(RenderBatch batch)
             GL.BindVertexArray(0);
         }
 
+        /// <summary>
+        /// Ensures the buffer capacity.
+        /// </summary>
+        /// <param name="vbo">The vertex buffer object.</param>
+        /// <param name="cap">The current capacity.</param>
+        /// <param name="req">The required capacity.</param>
         private void EnsureBufferCapacity(int vbo, ref int cap, int req)
         {
             if (req <= cap) return;
@@ -294,4 +390,4 @@ public void Dispose()
             GL.DeleteVertexArray(_vaoTex);
         }
     }
-}
+}
diff --git a/RenderEngine/Tests/HeadlessRenderer.cs b/RenderEngine/Tests/HeadlessRenderer.cs
diff --git a/RenderEngine/UnmanagedImageBuffer.cs b/RenderEngine/UnmanagedImageBuffer.cs

Original file line number	Diff line number	Diff line change
`@@ -197,4 +197,4 @@ internal static (float x, float y, int r, int g, int b, int a)[] BuildCircleOutl`
`197`	`197`	`return pts;`
`198`	`198`	`}`
`199`	`199`	`}`
`200`		`-}`
	`200`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -187,4 +187,4 @@ public int[] CompositeToBits()`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`	`}`
`190`		`-}`
	`190`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,4 @@ public interface IImageToolkit`
`63`	`63`	`/// <param name="insertAt">The insert at.</param>`
`64`	`64`	`void MergeLayers(LayeredImageContainer container, int[] layerIndices, int insertAt);`
`65`	`65`	`}`
`66`		`-}`
	`66`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -236,4 +236,4 @@ private static unsafe void AlphaBlend(Span<byte> baseSpan, Span<byte> overlaySpa`
`236`	`236`	`}`
`237`	`237`	`}`
`238`	`238`	`}`
`239`		`-}`
	`239`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -295,4 +295,4 @@ internal static bool IsOpenGlCompatible(int requiredMajor = 4, int requiredMinor`
`295`	`295`	`return _glVersion >= new Version(requiredMajor, requiredMinor);`
`296`	`296`	`}`
`297`	`297`	`}`
`298`		`-}`
	`298`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -309,4 +309,4 @@ public void AddHostAction(Action action)`
`309`	`309`	`HostActions.Add(action);`
`310`	`310`	`}`
`311`	`311`	`}`
`312`		`-}`
	`312`	`+}`