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

@@ -16,9 +16,10 @@
 using ShapeEngine.Geometry.TriangleDef;
 using ShapeEngine.Input;
 using ShapeEngine.Random;
+using ShapeEngine.ShapeClipper;
+
 namespace Examples.Scenes.ExampleScenes
 {
-
     public class AsteroidShard : GameObject
     {
         // private Polygon shape;
@@ -81,10 +82,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)
@@ -94,6 +98,7 @@ public override void DrawGameUI(ScreenInfo gameUi)
 
         public override Rect GetBoundingBox() { return shape.GetBoundingBox(); }
     }
+
     public class Asteroid : CollisionObject
     {
         internal class DamagedSegment
@@ -448,15 +453,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);
                 }
 
             }
@@ -529,7 +536,8 @@ internal enum ShapeType { None = 0, Triangle = 1, Rect = 2, Poly = 3};
         //Polygons testShapes = new();
         //Rect clipRect = new();
         //RectD clipperRect = new();
-
+        private static Polygon cutShapeBuffer = new();
+        private static FractureInfo fractureInfoBuffer = new();
         private readonly InputAction iaModeChange;
         private readonly InputAction iaAddShape;
         private readonly InputAction iaCutShape;
@@ -658,36 +666,36 @@ protected override void OnUpdateExample(GameTime time, ScreenInfo game, ScreenIn
         }
         private void OnAsteroidFractured(Asteroid a, Vector2 point)
         {
-            var cutShape = Polygon.Generate(point, Rng.Instance.RandI(6, 12), 35, 100);
-            if(cutShape != null) FractureAsteroid(a, cutShape);
+            cutShapeBuffer.Clear();
+            if (!Polygon.Generate(point, Rng.Instance.RandI(6, 12), 35, 100, cutShapeBuffer)) return;
+            if(cutShapeBuffer.Count > 0) FractureAsteroid(a, cutShapeBuffer);
         }
         private void FractureAsteroid(Asteroid a, Polygon cutShape)
         {
             RemoveAsteroid(a);
             var asteroidShape = a.GetPolygon();
             var color = a.GetColor();
-            var fracture = fractureHelper.Fracture(asteroidShape, cutShape);
+            fractureHelper.Fracture(asteroidShape, cutShape, fractureInfoBuffer);
 
-            foreach (var cutoutShape in fracture.Cutouts)
+            foreach (var cutoutShape in fractureInfoBuffer.Cutouts)
             {
                 lastCutOuts.Add(new Cutout(cutoutShape));
             }
 
             var center = cutShape.GetCentroid();
-            foreach (var piece in fracture.Pieces)
+            foreach (var piece in fractureInfoBuffer.Pieces)
             {
                 // Vector2 center = piece.GetCentroid();
                 AsteroidShard shard = new(piece, center, color);
                 SpawnArea?.AddGameObject(shard);
             }
-            if (fracture.NewShapes.Count > 0)
+            if (fractureInfoBuffer.NewShapes.Count > 0)
             {
-                foreach (var shape in fracture.NewShapes)
+                foreach (var shape in fractureInfoBuffer.NewShapes)
                 {
                     float shapeArea = shape.GetArea();
                     if (shapeArea > MinPieceArea)
                     {
-
                         var relativeInfo = shape.ToRelative();
 
                         Asteroid newAsteroid = new(relativeInfo.shape, relativeInfo.transform);
@@ -743,8 +751,7 @@ private void RegenerateShape()
         }
         private void GenerateTriangle()
         {
-            var shape = Polygon.Generate(curPos, 3, curSize / 2, curSize);
-            if (shape != null) curShape = shape;
+            Polygon.Generate(curPos, 3, curSize / 2, curSize, curShape);
         }
         private void GenerateRect()
         {
@@ -753,8 +760,7 @@ private void GenerateRect()
         }
         private void GeneratePoly()
         {
-            var shape = Polygon.Generate(curPos, 16, curSize * 0.25f, curSize);
-            if(shape != null) curShape = shape;
+            Polygon.Generate(curPos, 16, curSize * 0.25f, curSize, curShape);
         }
         private void PolyModeStarted()
         {
@@ -771,23 +777,6 @@ private void PolyModeEnded()
         }
         protected override void OnHandleInputExample(float dt, Vector2 mousePosGame, Vector2 mousePosGameUi, Vector2 mousePosUI)
         {
-            //clipRect = new(mousePosGame, new Vector2(100, 300), new Vector2(0f, 1f));
-            //clipperRect = clipRect.ToClipperRect();
-            //if (IsKeyPressed(KeyboardKey.KEY_NINE))
-            //{
-            //    Polygons newShapes = new Polygons();
-            //    foreach (var shape in testShapes)
-            //    {
-            //        if (shape.OverlapShape(clipRect))
-            //        {
-            //            var result = SClipper.ClipRect(clipRect, shape, 2, false).ToPolygons(true);
-            //            if (result.Count > 0) newShapes.AddRange(result);
-            //        }
-            //        else newShapes.Add(shape);
-            //    }
-            //    testShapes = newShapes;
-            //}
-
             if (CollisionHandler == null) return;
 
             var gamepad = Input.GamepadManager.LastUsedGamepad;
@@ -818,7 +807,6 @@ protected override void OnHandleInputExample(float dt, Vector2 mousePosGame, Vec
                         asteroid.Overlapped();
                     }
                 }
-
 
                 if (iaAddShape.State.Pressed) //add polygon (merge)
                 {
@@ -835,7 +823,12 @@ protected override void OnHandleInputExample(float dt, Vector2 mousePosGame, Vec
 
                             }
                         }
-                        var finalShapes = ShapeClipper.UnionMany(curShape.ToPolygon(), polys, Clipper2Lib.FillRule.NonZero).ToPolygons(true);
+
+                        Polygons finalShapes = new();
+                        var curPoly = curShape.ToPolygon();
+                        curPoly.ClipUnionMany(polys, finalShapes);
+                        finalShapes.RemoveAllHoles();
+                        // var finalShapes = curShape.ToPolygon().UnionMany(polys).ToPolygons(true);
                         if (finalShapes.Count > 0)
                         {
                             foreach (var f in finalShapes)
@@ -873,8 +866,8 @@ protected override void OnHandleInputExample(float dt, Vector2 mousePosGame, Vec
                     {
                         if (candidate is Asteroid asteroid)
                         {
+                            allCutOuts.Add(cutShape);
                             FractureAsteroid(asteroid, cutShape);
-
                         }
                     }
                     if (allCutOuts.Count > 0)

Examples/Scenes/ExampleScenes/BouncyCircles.cs

@@ -3,6 +3,7 @@
 using ShapeEngine.Core.GameDef;
 using ShapeEngine.Core.Structs;
 using ShapeEngine.Geometry.CircleDef;
+using ShapeEngine.Geometry.PointsDef;
 using ShapeEngine.Geometry.PolygonDef;
 using ShapeEngine.Geometry.RectDef;
 using ShapeEngine.Input;
@@ -52,7 +53,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)
@@ -89,13 +90,15 @@ public class BouncyCircles : ExampleScene
     {
         Rect boundaryRect;
 
+        private Polygon hull = new();
+
         private InputAction iaAdd;
         private InputAction iaToggleConvexHull;
         private readonly InputActionTree inputActionTree;
 
         private bool showConvexHull = false;
         private readonly List<GameObject> circles = new(65536);
-        private readonly List<Vector2> circlePoints = new(65536);
+        private readonly Points circlePoints = new(65536);
 
         public BouncyCircles()
         {
@@ -180,8 +183,13 @@ protected override void OnDrawGameExample(ScreenInfo game)
                 {
                     circlePoints.Add(circ.Transform.Position);
                 }
-                var hull = Polygon.FindConvexHull(circlePoints);
-                hull?.DrawLines(4f, Colors.Special);
+
+                if (circlePoints.Count > 0)
+                {
+                    hull.Clear();
+                    circlePoints.FindConvexHull(hull);
+                    hull.DrawLines(4f, Colors.Special); 
+                }
             }
 
         }

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/ControlNodeExampleScene.cs

@@ -73,24 +73,39 @@ public ControlNodeButton(string text, AnchorPoint anchor, Vector2 stretch)
             this.InputFilter = InputFilter.All;
         }
 
-        protected override bool GetPressedState()
+        protected override bool GetButtonPressedState()
         {
             if (!Selected) return false;
-            var acceptState = GameloopExamples.Instance.InputActionUIAccept.Consume(out _);
-            return acceptState is { Consumed: false, Pressed: true };
-
-            // if (!Selected) return false;
-            // return Raylib.IsKeyDown(KeyboardKey.Space);
+            //Always consumed for some reason...
+            // var acceptState = GameloopExamples.Instance.InputActionUIAccept.Consume(out _);
+            // return acceptState is { Consumed: false, Pressed: true };
+            return GameloopExamples.Instance.InputActionUIAccept.State.Pressed;
         }
 
-        protected override bool GetMousePressedState()
+        protected override bool GetMouseButtonPressedState()
         {
             if (!MouseInside) return false;
-            var acceptState = GameloopExamples.Instance.InputActionUIAcceptMouse.Consume(out _);
-            return acceptState is { Consumed: false, Pressed: true };
-
-            // if (!MouseInside) return false;
-            // return Raylib.IsMouseButtonDown(MouseButton.Left);
+            //Always consumed for some reason...
+            // var acceptState = GameloopExamples.Instance.InputActionUIAcceptMouse.Consume(out _);
+            // return acceptState is { Consumed: false, Pressed: true };
+            return GameloopExamples.Instance.InputActionUIAcceptMouse.State.Pressed;
+        }
+        protected override bool GetButtonReleasedState()
+        {
+            if (!Selected) return false;
+            //Always consumed for some reason...
+            // var acceptState = GameloopExamples.Instance.InputActionUIAccept.Consume(out _);
+            // return acceptState is { Consumed: false, Released: true };
+            return GameloopExamples.Instance.InputActionUIAccept.State.Released;
+        }
+
+        protected override bool GetMouseButtonReleasedState()
+        {
+            if (!MouseInside) return false;
+            //Always consumed for some reason...
+            // var acceptState = GameloopExamples.Instance.InputActionUIAcceptMouse.Consume(out _);
+            // return acceptState is { Consumed: false, Released: true };
+            return GameloopExamples.Instance.InputActionUIAcceptMouse.State.Released;
         }
 
         public override Direction GetNavigationDirection()

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);