chore: change timeline logic

JeremyMeissner · JeremyMeissner · commit 548a88d3c4b4 · 2022-05-13T16:28:35.000+02:00
diff --git a/FreeFrame/Components/Importer.cs b/FreeFrame/Components/Importer.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using System.Xml;
 using FreeFrame.Components.Shapes;
+using OpenTK.Mathematics;
 
 namespace FreeFrame.Components
 {
@@ -66,5 +67,28 @@ static public (List<Shape>, bool) ImportFromString(string pString)
 
             return ImportFromStream(new MemoryStream(byteArray));
         }
+
+        static public void ExportToFile(List<Shape> shapes, Vector2i clientSize)
+        {
+
+            using (FileStream fs = new FileStream("output.svg", FileMode.Create))
+            {
+                byte[] bytes = Encoding.ASCII.GetBytes($@"<?xml version=""1.0"" encoding=""utf-8"" ?>
+<svg xmlns=""http://www.w3.org/2000/svg"" version=""1.1"" width=""{clientSize.X}"" height=""{clientSize.Y}"" >" + Environment.NewLine);
+
+                for (int i = 0; i < bytes.Length; i++)
+                    fs.WriteByte(bytes[i]);
+
+                foreach (Shape shape in shapes)
+                {
+                    bytes = Encoding.ASCII.GetBytes(shape.ToString() + Environment.NewLine);
+                    for (int i = 0; i < bytes.Length; i++)
+                        fs.WriteByte(bytes[i]);
+                }
+                bytes = Encoding.ASCII.GetBytes("</svg>");
+                for (int i = 0; i < bytes.Length; i++)
+                    fs.WriteByte(bytes[i]);
+            }
+        }
     }
 }
diff --git a/FreeFrame/Components/Shapes/SVGCircle.cs b/FreeFrame/Components/Shapes/SVGCircle.cs
@@ -27,7 +27,7 @@ public SVGCircle(int r, int cx, int cy)
             ImplementObject();
         }
 
-        public override string ToString() => $"cx: {X + Width / 2}, cy: {Y + Height / 2}, r: {Width / 2}";
+        public override string ToString() => $"<circle cx=\"{X + Width / 2}\" cy=\"{Y + Height / 2}\" r=\"{Width / 2}\" fill=\"{ColorToHexadecimal(Color)}\"/>";
 
         public override float[] GetVertices() => new float[] { X, Y, X + Width, Y, X + Width, Y + Height, X, Y + Height }; // x, y, x, y, x, y, ... (clockwise)
         public override uint[] GetVerticesIndexes() => new uint[] { 0, 1, 2, 0, 2, 3 }; // TODO: please dont hardcode
diff --git a/FreeFrame/Components/Shapes/SVGLine.cs b/FreeFrame/Components/Shapes/SVGLine.cs
@@ -39,7 +39,7 @@ public SVGLine(int x1, int y1, int x2, int y2)
         }
         public override float[] GetVertices() => new float[] { X, Y, Width + X, Height + Y }; // x, y, x, y, x, y, ... (clockwise)
         public override uint[] GetVerticesIndexes() => new uint[] { 0, 1 }; // TODO: please dont hardcode
-        public override string ToString() => $"x1: {X}, y1: {Y}, x2: {Width + X}, y2: {Height + Y}";
+        public override string ToString() => $"<line x1=\"{X}\" y1=\"{Y}\" x2=\"{Width + X}\" y2=\"{Height + Y}\" fill=\"{ColorToHexadecimal(Color)}\"/>";
         public override List<Vector2i> GetSelectablePoints()
         {
             List<Vector2i> points = new();
diff --git a/FreeFrame/Components/Shapes/SVGPath.cs b/FreeFrame/Components/Shapes/SVGPath.cs
@@ -186,9 +186,9 @@ public override List<Vector2i> GetSelectablePoints()
 
         public override string ToString()
         {
-            string output = "d: ";
+            string output = "<path d=\"";
             DrawAttributes.ForEach(d => output += d.ToString() + " ");
-            return output.Trim();
+            return output.Trim() + $"\" fill=\"{ColorToHexadecimal(Color)}\"/>";
         }
     }
 }
diff --git a/FreeFrame/Components/Shapes/SVGRectangle.cs b/FreeFrame/Components/Shapes/SVGRectangle.cs
@@ -50,8 +50,12 @@ public override void ImplementObject()
         }
         public override float[] GetVertices() => new float[] { X, Y, X + Width, Y, X + Width, Y + Height, X, Y + Height }; // x, y, x, y, x, y, ... (clockwise)
         public override uint[] GetVerticesIndexes() => new uint[] { 0, 1, 2, 0, 2, 3 }; // TODO: please dont hardcode
+        public override string ToString()
+        {
+            return $"<rect x=\"{X}\" y=\"{Y}\" width=\"{Width}\" height=\"{Height}\" rx=\"{CornerRadius}\" ry=\"{CornerRadius}\" fill=\"{ColorToHexadecimal(Color)}\"/>";
+        }
+            
 
-        public override string ToString() => $"x: {X}, y: {Y}, width: {Width}, height: {Height}, rx: {CornerRadius}, ry: {CornerRadius}";
 
         public override List<Vector2i> GetSelectablePoints()
         {
diff --git a/FreeFrame/Components/Shapes/Shape.cs b/FreeFrame/Components/Shapes/Shape.cs
@@ -76,6 +76,16 @@ public void DeleteObjects()
         public abstract void Move(Vector2i position);
         public abstract void Resize(Vector2i size);
         public abstract override string ToString();
+
+        public static string ColorToHexadecimal(Color4 color)
+        {
+            int r, g, b, a;
+            r = (int)(color.R * 255);
+            g = (int)(color.G * 255);
+            b = (int)(color.B * 255);
+            a = (int)(color.A * 255);
+            return '#' + r.ToString("X2") + g.ToString("X2") + b.ToString("X2") + a.ToString("X2");
+        }
     }
 
 }
diff --git a/FreeFrame/FreeFrame.csproj b/FreeFrame/FreeFrame.csproj
@@ -8,10 +8,17 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="AnimatedGif" Version="1.0.5" />
     <PackageReference Include="Delaunator" Version="1.0.9" />
+    <PackageReference Include="Emgu.CV" Version="4.5.5.4823" />
+    <PackageReference Include="Emgu.CV.Bitmap" Version="4.5.5.4823" />
+    <PackageReference Include="Emgu.CV.runtime.ubuntu.20.04-x64" Version="4.5.5.4823" />
+    <PackageReference Include="Emgu.CV.runtime.windows" Version="4.5.5.4823" />
+    <PackageReference Include="GifMotion" Version="1.0.4" />
     <PackageReference Include="ImGui.NET" Version="1.87.3" />
     <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
     <PackageReference Include="OpenTK" Version="4.7.1" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.1" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
 
diff --git a/FreeFrame/Program.cs b/FreeFrame/Program.cs
@@ -15,7 +15,8 @@ static void Main()
             NativeWindowSettings nativeWindowSettings = new()
             {
                 Size = new Vector2i(800, 600),
-                Title = "FreeFrame"
+                Title = "FreeFrame",
+                NumberOfSamples = 8,
             };
             using Window window = new(GameWindowSettings.Default, nativeWindowSettings); // Create window context (GLFW, OpenGL)
 
diff --git a/FreeFrame/Window.cs b/FreeFrame/Window.cs
diff --git a/FreeFrameTests/FreeFrameTests.csproj b/FreeFrameTests/FreeFrameTests.csproj

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public SVGCircle(int r, int cx, int cy)`
`27`	`27`	`ImplementObject();`
`28`	`28`	`}`
`29`	`29`
`30`		`- public override string ToString() => $"cx: {X + Width / 2}, cy: {Y + Height / 2}, r: {Width / 2}";`
	`30`	`+ public override string ToString() => $"<circle cx=\"{X + Width / 2}\" cy=\"{Y + Height / 2}\" r=\"{Width / 2}\" fill=\"{ColorToHexadecimal(Color)}\"/>";`
`31`	`31`
`32`	`32`	`public override float[] GetVertices() => new float[] { X, Y, X + Width, Y, X + Width, Y + Height, X, Y + Height }; // x, y, x, y, x, y, ... (clockwise)`
`33`	`33`	`public override uint[] GetVerticesIndexes() => new uint[] { 0, 1, 2, 0, 2, 3 }; // TODO: please dont hardcode`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public SVGLine(int x1, int y1, int x2, int y2)`
`39`	`39`	`}`
`40`	`40`	`public override float[] GetVertices() => new float[] { X, Y, Width + X, Height + Y }; // x, y, x, y, x, y, ... (clockwise)`
`41`	`41`	`public override uint[] GetVerticesIndexes() => new uint[] { 0, 1 }; // TODO: please dont hardcode`
`42`		`- public override string ToString() => $"x1: {X}, y1: {Y}, x2: {Width + X}, y2: {Height + Y}";`
	`42`	`+ public override string ToString() => $"<line x1=\"{X}\" y1=\"{Y}\" x2=\"{Width + X}\" y2=\"{Height + Y}\" fill=\"{ColorToHexadecimal(Color)}\"/>";`
`43`	`43`	`public override List<Vector2i> GetSelectablePoints()`
`44`	`44`	`{`
`45`	`45`	`List<Vector2i> points = new();`
Original file line number	Diff line number	Diff line change
`@@ -186,9 +186,9 @@ public override List<Vector2i> GetSelectablePoints()`
`186`	`186`
`187`	`187`	`public override string ToString()`
`188`	`188`	`{`
`189`		`- string output = "d: ";`
	`189`	`+ string output = "<path d=\"";`
`190`	`190`	`DrawAttributes.ForEach(d => output += d.ToString() + " ");`
`191`		`- return output.Trim();`
	`191`	`+ return output.Trim() + $"\" fill=\"{ColorToHexadecimal(Color)}\"/>";`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,12 @@ public override void ImplementObject()`
`50`	`50`	`}`
`51`	`51`	`public override float[] GetVertices() => new float[] { X, Y, X + Width, Y, X + Width, Y + Height, X, Y + Height }; // x, y, x, y, x, y, ... (clockwise)`
`52`	`52`	`public override uint[] GetVerticesIndexes() => new uint[] { 0, 1, 2, 0, 2, 3 }; // TODO: please dont hardcode`
	`53`	`+ public override string ToString()`
	`54`	`+ {`
	`55`	`+ return $"<rect x=\"{X}\" y=\"{Y}\" width=\"{Width}\" height=\"{Height}\" rx=\"{CornerRadius}\" ry=\"{CornerRadius}\" fill=\"{ColorToHexadecimal(Color)}\"/>";`
	`56`	`+ }`
	`57`	`+`
`53`	`58`
`54`		`- public override string ToString() => $"x: {X}, y: {Y}, width: {Width}, height: {Height}, rx: {CornerRadius}, ry: {CornerRadius}";`
`55`	`59`
`56`	`60`	`public override List<Vector2i> GetSelectablePoints()`
`57`	`61`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ static void Main()`
`15`	`15`	`NativeWindowSettings nativeWindowSettings = new()`
`16`	`16`	`{`
`17`	`17`	`Size = new Vector2i(800, 600),`
`18`		`- Title = "FreeFrame"`
	`18`	`+ Title = "FreeFrame",`
	`19`	`+ NumberOfSamples = 8,`
`19`	`20`	`};`
`20`	`21`	`using Window window = new(GameWindowSettings.Default, nativeWindowSettings); // Create window context (GLFW, OpenGL)`
`21`	`22`