Shape Drawing Improvements

Examples/GameloopExamples.cs

@@ -533,7 +533,8 @@ private void DrawRoundedCursor(Vector2 tip, float size, ColorRgba colorRgba)
         var top = circleCenter + new Vector2(0, -1) * size;
         SegmentDrawing.DrawSegment(tip, left, 1f, colorRgba, LineCapType.CappedExtended, 3);
         SegmentDrawing.DrawSegment(tip, top, 1f, colorRgba, LineCapType.CappedExtended, 3);
-        CircleDrawing.DrawCircleSectorLines(circleCenter, size, 180, 270, 1f, colorRgba, false, 4f);
+        var circle = new Circle(circleCenter, size);
+        circle.DrawSectorLines(180, 270, 0f, 1f, colorRgba, 0.65f);
     }
 
     protected override void Update(GameTime time, ScreenInfo game, ScreenInfo gameUi, ScreenInfo ui)

Examples/Scenes/ExampleScenes/AsteroidMiningExample.cs

@@ -81,10 +81,13 @@ public override void Update(GameTime time, ScreenInfo game, ScreenInfo gameUi, S
 
         public override void DrawGame(ScreenInfo game)
         {
-            //SDrawing.DrawCircleFast(pos, 4f, RED);
-            var c = this.color.ColorRgba.ChangeAlpha((byte)(255 * lifetimeF));
-            //color = this.color;
-            shape.DrawLines(2f * lifetimeF, c);
+            var alpha = (int)(400 * lifetimeF);
+            if(alpha > 255) alpha = 255;
+            var c = color.ColorRgba.SetAlpha((byte)alpha);
+
+            // shape.DrawLines(2f * lifetimeF, c);
+
+            shape.Draw(c);
         }
 
         public override void DrawGameUI(ScreenInfo gameUi)
@@ -448,15 +451,17 @@ public override void DrawGame(ScreenInfo game)
             if (hybernate) return;
             var c = Colors.Cold;
             shape.DrawLines(4f, c);
-            CircleDrawing.DrawCircle(tip, 8f, c);
+            var circle = new Circle(tip, 8f);
+            circle.Draw(c, 0.1f);
 
             if (laserEnabled && laserPoints.Count > 1)
             {
                 for (int i = 0; i < laserPoints.Count - 1; i++)
                 {
                     Segment laserSegment = new(laserPoints[i], laserPoints[i + 1]);
                     laserSegment.Draw(4f, c);
-                    CircleDrawing.DrawCircle(laserPoints[i + 1], Rng.Instance.RandF(6f, 12f), c, 12);
+                    var laserPointCircle = new Circle(laserPoints[i + 1], Rng.Instance.RandF(6f, 12f));
+                    laserPointCircle.Draw(c, 0.1f);
                 }
 
             }
@@ -835,7 +840,7 @@ protected override void OnHandleInputExample(float dt, Vector2 mousePosGame, Vec
 
                             }
                         }
-                        var finalShapes = ShapeClipper.UnionMany(curShape.ToPolygon(), polys, Clipper2Lib.FillRule.NonZero).ToPolygons(true);
+                        var finalShapes = curShape.ToPolygon().UnionMany(polys).ToPolygons(true);
                         if (finalShapes.Count > 0)
                         {
                             foreach (var f in finalShapes)

Examples/Scenes/ExampleScenes/BouncyCircles.cs

@@ -52,7 +52,7 @@ public override void DrawGame(ScreenInfo game)
                 _ => Colors.Medium
             };
 
-            CircleDrawing.DrawCircleFast(Transform.Position, Transform.ScaledSize.Width, color);
+            Transform.GetCircle().DrawFast(color);
         }
 
         public override void DrawGameUI(ScreenInfo gameUi)

Examples/Scenes/ExampleScenes/CameraExample.cs

@@ -150,8 +150,11 @@ protected override void OnDrawGameExample(ScreenInfo game)
 
             var c = Colors.Cold; // new ColorRgba(Color.CornflowerBlue);
             float f = camera.ZoomFactor;
-            CircleDrawing.DrawCircle(camera.BasePosition, 8f * f, c);
-            CircleDrawing.DrawCircleLines(camera.BasePosition, 64 * f, 2f * f, c);
+            var circle = new Circle(camera.BasePosition, 8f * f);
+            circle.Draw(c, 0.2f);
+            circle = circle.SetRadius(64 * f);
+            circle.DrawLines(2f * f, c, 0.65f);
+
             Segment hor = new(camera.BasePosition - new Vector2(3000 * f, 0), camera.BasePosition + new Vector2(3000 * f, 0));
             hor.Draw(2f * f, c);
             Segment ver = new(camera.BasePosition - new Vector2(0, 3000 * f), camera.BasePosition + new Vector2(0, 3000 * f));

Examples/Scenes/ExampleScenes/CameraGroupFollowExample.cs

@@ -214,10 +214,13 @@ public void Draw()
                 var outlineColor = Selected ? outlineColorActive : outlineColorInactive;
                 var hullColor = Selected ? hullColorActive : hullColorInactive;
                 var cockpitColor = Selected ? cockpitColorActive : cockpitColorInactive;
-                CircleDrawing.DrawCircle(hull.Center - rightThruster * hull.Radius, hull.Radius / 6, outlineColor.ColorRgba, 12);
-                CircleDrawing.DrawCircle(hull.Center - leftThruster * hull.Radius, hull.Radius / 6, outlineColor.ColorRgba, 12);
+                var rightThrusterCircle = new Circle(hull.Center - rightThruster * hull.Radius, hull.Radius / 6);
+                var leftThrusterCircle = new Circle(hull.Center - leftThruster * hull.Radius, hull.Radius / 6);
+                rightThrusterCircle.Draw(outlineColor.ColorRgba, 0.25f);
+                leftThrusterCircle.Draw(outlineColor.ColorRgba, 0.25f);
                 hull.Draw(hullColor.ColorRgba);
-                CircleDrawing.DrawCircle(hull.Center + movementDir * hull.Radius * 0.66f, hull.Radius * 0.33f, cockpitColor.ColorRgba, 12);
+                var circle = new Circle(hull.Center + movementDir * hull.Radius * 0.66f, hull.Radius * 0.33f);
+                circle.Draw(cockpitColor.ColorRgba, 0.25f);
 
                 hull.DrawLines(4f, outlineColor.ColorRgba);
 

Examples/Scenes/ExampleScenes/DataExample.cs

@@ -44,7 +44,9 @@ public void Draw()
             var startC = Colors.Warm;
             var endC = Colors.Medium.SetAlpha(150);
             var c = startC.Lerp(endC, f);
-            CircleDrawing.DrawCircle(pos, ShapeMath.LerpFloat(size * 0.5f, size, f), c, 24);
+            var r = ShapeMath.LerpFloat(size * 0.5f, size, f);
+            var circle = new Circle(pos, r);
+            circle.Draw(c, 0.75f);
         }
     }
     private class Planet
@@ -263,8 +265,8 @@ protected override void OnUpdateExample(GameTime time, ScreenInfo game, ScreenIn
     }
     protected override void OnDrawGameExample(ScreenInfo game)
     {
-
-        CircleDrawing.DrawCircleLines(planet.Shape.Center, AsteroidSpawnRadius, 12f, Colors.Highlight, 4f);
+        var circle = new Circle(planet.Shape.Center, AsteroidSpawnRadius);
+        circle.DrawLines(12f, Colors.Highlight, 1f);
 
         planet.Draw();
         planet.DrawGameUI(textFont);

Examples/Scenes/ExampleScenes/DelaunayExample.cs

@@ -158,11 +158,11 @@ protected override void OnDrawGameExample(ScreenInfo game)
             {
                 var tri = curTriangulation[i];
                 if (i == closeTriangleIndex) continue;
-                tri.DrawLines(lineThickness, Colors.Light, LineCapType.CappedExtended, 4);
+                tri.DrawLines(lineThickness, Colors.Light, 4);
             }
 
 
-            if(closeTriangleIndex >= 0) curTriangulation[closeTriangleIndex].DrawLines(lineThicknessBig, Colors.Highlight, LineCapType.CappedExtended, 4);
+            if(closeTriangleIndex >= 0) curTriangulation[closeTriangleIndex].DrawLines(lineThicknessBig, Colors.Highlight, 4);
 
             for (int i = 0; i < points.Count; i++)
             {

Examples/Scenes/ExampleScenes/EndlessSpaceCollision.cs

@@ -55,7 +55,7 @@ public override Rect GetSourceRect(Dimensions screenDimensions, Dimensions textu
                 );
         }
 
-        public override (ColorRgba color, bool clear) GetBackgroundClearColor() => (ColorRgba.Clear, true);
+        public override (ColorRgba color, bool clear) GetBackgroundClearColor() => (ColorRgba.Transparent, true);
     }
 
     private List<ScreenTexture> starTextures = new(5);
@@ -252,7 +252,8 @@ private void OnDrawStarTexture(ScreenInfo screeninfo, ScreenTexture texture)
         {
             var pos = screeninfo.Area.GetRandomPointInside();
 
-            CircleDrawing.DrawCircleFast(pos, Rng.Instance.RandF(1, 5), Colors.Highlight.SetAlpha(alpha));
+            var circle = new Circle(pos, Rng.Instance.RandF(1, 5));
+            circle.DrawFast(Colors.Highlight.SetAlpha(alpha));
         }
     }
 
@@ -786,26 +787,17 @@ protected override void OnDrawGameExample(ScreenInfo game)
         // {
         //     cutShape.Draw(cutShapeColor);
         // }
-
-
-        CircleDrawing.DrawCircleSectorLines(ship.Transform.Position, 250f, -80, -10, 12f, Colors.PcDark.ColorRgba, false, 8f);
-        CircleDrawing.DrawCircleSectorLines(ship.Transform.Position, 250f, -100, -170, 12f, Colors.PcDark.ColorRgba, false, 8f);
-        CircleDrawing.DrawCircleSectorLines(ship.Transform.Position, 250f, 170, 10, 12f, Colors.PcDark.ColorRgba, false, 8f);
 
-        if (minigun.ReloadF > 0f)
-        {
-            CircleDrawing.DrawCircleSectorLines(ship.Transform.Position, 250f, -80, ShapeMath.LerpFloat(-80, -10, minigun.ReloadF), 4f, Colors.PcWarm.ColorRgba, false, 8f);
-        }
-        else CircleDrawing.DrawCircleSectorLines(ship.Transform.Position, 250f, -80, ShapeMath.LerpFloat(-80, -10, 1f - minigun.ClipSizeF), 4f, Colors.PcCold.ColorRgba, false, 8f);
+        var sectorLineInfo = new LineDrawingInfo(12f, Colors.PcDark.ColorRgba);
+        var circle = new Circle(ship.Transform.Position, 250f);
+        circle.DrawSectorLines(-80f, -10f, 0f, sectorLineInfo, 0.75f);
+        circle.DrawSectorLines(-100f, -170f, 0f, sectorLineInfo, 0.75f);
+        circle.DrawSectorLines(170f, 10f, 0f, sectorLineInfo, 0.75f);
 
-        if (cannon.ReloadF > 0f)
-        {
-            CircleDrawing.DrawCircleSectorLines(ship.Transform.Position, 250f, -100, ShapeMath.LerpFloat(-100, -170, cannon.ReloadF), 4f, Colors.PcWarm.ColorRgba, false, 8f);
-        }
-        else CircleDrawing.DrawCircleSectorLines(ship.Transform.Position, 250f, -100, ShapeMath.LerpFloat(-100, -170, 1f - cannon.ClipSizeF), 4f, Colors.PcCold.ColorRgba, false, 8f);
-
-
-        CircleDrawing.DrawCircleSectorLines(ship.Transform.Position, 250f, 170, ShapeMath.LerpFloat(170, 10, ship.HealthF), 4f, Colors.PcWarm.ColorRgba, false, 8f);
+        sectorLineInfo = new LineDrawingInfo(4f, Colors.PcWarm.ColorRgba);
+        circle.DrawSectorLines(-80, ShapeMath.LerpFloat(-80, -10, minigun.ReloadF > 0f ?  minigun.ReloadF : 1f - minigun.ClipSizeF), 0f, sectorLineInfo, 0.75f);
+        circle.DrawSectorLines(-100, ShapeMath.LerpFloat(-100, -170, cannon.ReloadF > 0f ?  cannon.ReloadF : 1f - cannon.ClipSizeF), 0f, sectorLineInfo, 0.75f);
+        circle.DrawSectorLines(170, ShapeMath.LerpFloat(170, 10, ship.HealthF), 0f, sectorLineInfo, 0.75f);
     }
     protected override void OnDrawGameUIExample(ScreenInfo gameUi)
     {
@@ -853,12 +845,14 @@ protected override void OnDrawUIExample(ScreenInfo ui)
         var multiDestructorStripedBarRect = multiDestructorRectBar.GetProgressRect(multiDestructorF, 0f, 1f, 0f, 0f).ApplyMargins(0.01f, 0.01f, 0.04f, 0.04f);
         LineDrawingInfo stripedBarInfo = new LineDrawingInfo(thickness, Colors.Warm, LineCapType.Capped, 4);
 
-        singleDestructorRect.DrawCorners(new LineDrawingInfo(thickness, Colors.Warm, LineCapType.Capped, 4), cornerLength);
+        // singleDestructorRect.DrawCorners(new LineDrawingInfo(thickness, Colors.Warm, LineCapType.Capped, 4), cornerLength);
+        singleDestructorRect.DrawCorners(thickness, Colors.Warm, cornerLength);
         singleDestructorRectBar.Draw(Colors.Medium);
         singleDestructorStripedBarRect.DrawStriped(singleDestructorRectBar.Width * 0.015f, -15, stripedBarInfo);
 
 
-        multiDestructorRect.DrawCorners(new LineDrawingInfo(thickness, Colors.Warm, LineCapType.Capped, 4), cornerLength);
+        // multiDestructorRect.DrawCorners(new LineDrawingInfo(thickness, Colors.Warm, LineCapType.Capped, 4), cornerLength);
+        multiDestructorRect.DrawCorners(thickness, Colors.Warm, cornerLength);
         multiDestructorRectBar.Draw(Colors.Medium);
         multiDestructorStripedBarRect.DrawStriped(multiDestructorRectBar.Width * 0.015f, 15, stripedBarInfo);
 

Examples/Scenes/ExampleScenes/EndlessSpaceExampleSource/AsteroidObstacle.cs

@@ -27,6 +27,7 @@ internal class AsteroidObstacle : CollisionObject
     private PolygonCollider collider;
     private readonly Polygon? outsideShape;
     public Triangulation Triangulation;
+    public Triangulation OutlineTriangulation;
     private Rect bb;
 
     private float damageFlashTimer = 0f;
@@ -84,6 +85,7 @@ public AsteroidObstacle(Polygon relativeShape, Vector2 pos, float size, bool big
         var shape = collider.GetPolygonShape(); 
         bb = shape.GetBoundingBox();
         Triangulation = shape.Triangulate();
+        OutlineTriangulation = shape.GenerateOutlineTriangulation(EndlessSpaceCollision.AsteroidLineThickness, 0, 2f, false, false)?? [];
 
         if (big)
         {
@@ -134,6 +136,7 @@ public void MoveTo(Vector2 newPosition)
         var moved = newPosition - Transform.Position;
         Transform = Transform.SetPosition(newPosition);
         Triangulation.ChangePosition(moved);
+        OutlineTriangulation.ChangePosition(moved);
         outsideShape?.ChangePosition(moved);
         // moved = true;
     }
@@ -182,6 +185,7 @@ public override void Update(GameTime time, ScreenInfo game, ScreenInfo gameUi,
 
         var moved = Transform.Position - prevPosition;
         Triangulation.ChangePosition(moved);
+        OutlineTriangulation.ChangePosition(moved);
         outsideShape?.ChangePosition(moved);
     }
     public Polygon GetShape() => collider.GetPolygonShape();
@@ -220,7 +224,8 @@ public override void DrawGame(ScreenInfo game)
         if (EndlessSpaceCollision.AsteroidLineThickness > 1 && outsideShape != null)
         {
             var c = damageFlashTimer > 0f ? Colors.PcWarm.ColorRgba : Colors.PcHighlight.ColorRgba;
-            collider.GetPolygonShape().DrawLines(EndlessSpaceCollision.AsteroidLineThickness, c);
+            OutlineTriangulation.Draw(c);//this works with transparent colors as well
+            // collider.GetPolygonShape().DrawLines(EndlessSpaceCollision.AsteroidLineThickness, c);
             if (Big)
             {
                 perimeter = outsideShape.DrawGappedOutline(perimeter, GappedLineInfo, gappedOutlineInfo);

Examples/Scenes/ExampleScenes/EndlessSpaceExampleSource/Autogun.cs

@@ -5,6 +5,7 @@
 using ShapeEngine.Geometry.CircleDef;
 using ShapeEngine.Geometry.CollisionSystem;
 using ShapeEngine.Geometry.CollisionSystem.CollisionHandlerDef;
+using ShapeEngine.Geometry.QuadDef;
 using ShapeEngine.Geometry.RectDef;
 using ShapeEngine.Geometry.SegmentDef;
 using ShapeEngine.StaticLib;
@@ -141,7 +142,8 @@ public void Draw()
             float sideScaleFactor = ShapeMath.LerpFloat(0.2f, 0.5f, targetingAnimationF);
             // float targetingAnimationRotation = ShapeMath.LerpFloat(-15, 15, targetingAnimationF);
             var bb = curTarget.GetBoundingBox();
-            bb.DrawLinesScaled(new LineDrawingInfo(6f, c), 45f, bb.Center, sideScaleFactor, 0.5f); //DrawLines(4f, c);
+            var bbQuad = new Quad(bb, 45f, bb.Center);
+            bbQuad.DrawLinesScaled(new LineDrawingInfo(6f, c), sideScaleFactor, 0.5f);
 
             var targetPos = curTarget.GetBoundingBox().Center;
             pos.Draw(5f, c);

Examples/Scenes/ExampleScenes/EndlessSpaceExampleSource/Destructor.cs

@@ -1,6 +1,7 @@
 using System.Numerics;
 using ShapeEngine.Color;
 using ShapeEngine.Core.Structs;
+using ShapeEngine.Geometry;
 using ShapeEngine.Geometry.CircleDef;
 using ShapeEngine.Geometry.CollisionSystem;
 using ShapeEngine.StaticLib;
@@ -111,7 +112,7 @@ public override void DrawGame(ScreenInfo game)
         var angle = Velocity.AngleDeg();
         var startAngle = angle - 50f;
         var endAngle = angle + 50f;
-        RingDrawing.DrawSectorRingLines(circle.Center, circle.Radius * 0.75f, circle.Radius, startAngle, endAngle, thickness, color, 4f);
+        circle.DrawRingSectorLines(circle.Radius * 0.25f, startAngle, endAngle, 0f, thickness * 0.5f, color, 0.6f);
     }
 
     public override void DrawGameUI(ScreenInfo gameUi)

Examples/Scenes/ExampleScenes/EndlessSpaceExampleSource/ExplosivePayload.cs

@@ -61,7 +61,8 @@ protected virtual void DrawSmoke()
         var f = 1f - (SmokeTimer / Info.SmokeDuration);
         var color = Colors.Warm.Lerp(Colors.PcMedium.ColorRgba.SetAlpha(50), f);
         var size = ShapeMath.LerpFloat(Info.Radius * 0.5f, Info.Radius * 3f, f);
-        CircleDrawing.DrawCircle(CurPosition, size, color, 24);
+        var circle = new Circle(CurPosition, size);
+        circle.Draw(color, 0.6f);
     }
 
     public bool IsFinished() => finished;
@@ -97,14 +98,10 @@ public void Draw()
         if (travelTimer > 0f)
         {
             var f = TravelF;
-            CircleDrawing.DrawCircle(TargetLocation, 12f, Colors.PcCold.ColorRgba, 24);
-            CircleDrawing.DrawCircleLines(TargetLocation, Info.Radius * (1f - f), 6f, Colors.PcMedium.ColorRgba, 6);
-
-            // var f = TravelF;
-            // ShapeDrawing.DrawCircleLines(targetLocation, Size, 6f, Colors.Dark, 6);
-            // ShapeDrawing.DrawCircleSectorLines(targetLocation, Size, 0f, 359f * f, 6f, Colors.Special, false, 4f);
-            // ShapeDrawing.DrawCircleSectorLines(targetLocation, Size / 12, 0f, 359f * f, 6f, Colors.Special, false, 4f);
-            // ShapeDrawing.DrawCircle(targetLocation, 12f, Colors.Special, 24);
+            var circle = new Circle(TargetLocation, 12f);
+            circle.Draw(Colors.PcCold.ColorRgba, 0.2f);
+            circle = circle.SetRadius(Info.Radius * (1f - f));
+            circle.DrawLines(6f, Colors.PcMedium.ColorRgba, 0.6f);
 
             var lineEnd = ShapeVec.Lerp(StartLocation, TargetLocation, f);
             var w = lineEnd - EndlessSpaceCollision.DestroyerPosition;

Examples/Scenes/ExampleScenes/EndlessSpaceExampleSource/LaserBeamParticle.cs

@@ -46,6 +46,8 @@ public void Draw()
         var color = paletteColor.ColorRgba;
         var s = ShapeMath.LerpFloat(size, size * 0.25f, lifetimeF);
         var c = color.Lerp(color.ChangeAlpha(150), lifetimeF);
-        CircleDrawing.DrawCircleFast(position, s, c);
+
+        var circle = new Circle(position, s);
+        circle.DrawFast(c);
     }
 }

Examples/Scenes/ExampleScenes/EndlessSpaceExampleSource/PayloadMarkerSimple.cs

@@ -1,4 +1,5 @@
 using Examples.PayloadSystem;
+using ShapeEngine.Geometry;
 using ShapeEngine.Geometry.CircleDef;
 using ShapeEngine.StaticLib;
 
@@ -15,17 +16,22 @@ public override void Draw()
     {
         if (!Launched) return;
 
+
         if (TravelF > 0f)
         {
+            var circle = new Circle(Location, 15f);
             if (visible)
             {
-                CircleDrawing.DrawCircle(Location, 15, Colors.Cold, 24);
-            }  
-            CircleDrawing.DrawCircleSectorLines(Location, 25f, 0, 359 * TravelF, 4f, Colors.Cold, false, 4f);
+                circle.Draw(Colors.Cold, 0.2f);
+            }
+
+            circle = circle.SetRadius(25f);
+            circle.DrawSectorLines(0, 359 * TravelF, 0f, new LineDrawingInfo(4f, Colors.Cold), 0.2f);
         }
         else
         {
-            CircleDrawing.DrawCircle(Location, 15, Colors.Cold, 24);
+            var circle = new Circle(Location, 15f);
+            circle.Draw(Colors.Cold, 0.2f);
         }
 
 

Examples/Scenes/ExampleScenes/EndlessSpaceExampleSource/PayloadTargetingSystemBarrage.cs

@@ -28,6 +28,7 @@ public Vector2 GetTargetPosition(int curActivation, int maxActivations)
 
     public void DrawTargetArea(float f, ColorRgba color)
     {
-        CircleDrawing.DrawCircleLines(curPosition, radius * f, 6f, color);
+        var circle = new Circle(curPosition, radius * f);
+        circle.DrawLines(6f, color, 0.1f);
     }
 }

Examples/Scenes/ExampleScenes/EndlessSpaceExampleSource/Penetrator.cs

@@ -50,9 +50,9 @@ protected override void DrawSmoke()
         {
             var f = 1f - (SmokeTimer / Info.SmokeDuration);
             var color = Colors.PcWarm.ColorRgba.Lerp(Colors.PcMedium.ColorRgba.SetAlpha(50), f);
-            var size = Info.Radius; // ShapeMath.LerpFloat(Info.Radius * 0.5f, Info.Radius * 3f, f);
-            CircleDrawing.DrawCircle(CurPosition, size, color, 24);
-            // ShapeDrawing.DrawCircle(CurPosition, Info.Radius * 0.05f , color, 18);
+            var size = Info.Radius;
+            var circle = new Circle(CurPosition, size);
+            circle.Draw(color, 0.65f);
         }
 
     }