refactor: whole structure

FreeFrame/Components/Importer.cs

@@ -22,13 +22,12 @@ static private (List<Shape>, SortedDictionary<int, List<Shape>>, bool) ImportFro
 
             using (XmlReader reader = XmlReader.Create(pStream))
             {
-
-
+                try
+                {
                     while (reader.Read())
                     {
                         if (reader.HasAttributes)
                         {
-                            //Console.WriteLine("Attributes of <" + reader.Name + ">");
                             switch (reader.Name)
                             {
                                 case "xml":
@@ -61,9 +60,6 @@ static private (List<Shape>, SortedDictionary<int, List<Shape>>, bool) ImportFro
                         }
 
                     }
-                // TODO: Fix trycatch
-                try
-                {
                 }
                 catch (Exception)
                 {

FreeFrame/Components/Shapes/Path/DrawAttribute.cs

@@ -839,77 +839,4 @@ public override void UpdateLast()
             }
         }
     }
-
-    /// <summary>
-    /// EllipticalArc, Elliptical Arc Curve, A or a.
-    /// Use to draw an ellipse.
-    /// More info: https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/d#elliptical_arc_curve
-    /// </summary>
-    public class EllipticalArc : DrawAttribute
-    {
-        int _rx;
-        int _ry;
-        int _angle;
-        bool _largeArcFlag;
-        bool _sweepFlag;
-
-        public EllipticalArc() { }
-
-        /// <summary>
-        /// Use to draw an ellipse. 
-        /// </summary>
-        /// <param name="rx">radius x of the ellipse</param>
-        /// <param name="ry">radius y of the ellipse</param>
-        /// <param name="angle">rotation (in degrees) relative to the x-axis</param>
-        /// <param name="largeArcFlag">either 0 (large arc) or 1 (small arc)</param>
-        /// <param name="sweepFlag">either 0 (clockwise arc) or 1 (counterclockwise arc)</param>
-        /// <param name="x">new current point x</param>
-        /// <param name="y">new current point y</param>
-        /// <param name="isRelative">if true, the points becames relatives to the last point</param>
-        public EllipticalArc(Group rx, Group ry, Group angle, Group largeArcFlag, Group sweepFlag, Group x, Group y, bool isRelative = false) : this(Convert.ToInt32(rx.Value), Convert.ToInt32(ry.Value), Convert.ToInt32(angle.Value), Convert.ToInt32(largeArcFlag.Value) == 0 ? false : true, Convert.ToInt32(sweepFlag.Value) == 0 ? false : true, Convert.ToInt32(x.Value), Convert.ToInt32(y.Value), isRelative) { }
-
-        /// <summary>
-        /// Use to draw an ellipse. 
-        /// </summary>
-        /// <param name="rx">radius x of the ellipse</param>
-        /// <param name="ry">radius y of the ellipse</param>
-        /// <param name="angle">rotation (in degrees) relative to the x-axis</param>
-        /// <param name="largeArcFlag">either 0 (large arc) or 1 (small arc)</param>
-        /// <param name="sweepFlag">either 0 (clockwise arc) or 1 (counterclockwise arc)</param>
-        /// <param name="x">new current point x</param>
-        /// <param name="y">new current point y</param>
-        /// <param name="isRelative">if true, the points becames relatives to the last point</param>
-        public EllipticalArc(int rx, int ry, int angle, bool largeArcFlag, bool sweepFlag, int x, int y, bool isRelative = false)
-        {
-            _rx = rx;
-            _ry = ry;
-            _angle = angle;
-            _largeArcFlag = largeArcFlag;
-            _sweepFlag = sweepFlag;
-            X = x;
-            Y = y;
-            IsRelative = isRelative;
-        }
-
-        public override List<Vector2i> GetSelectablePoints()
-        {
-            throw new NotImplementedException();
-        }
-
-        public override float[] GetVertices()
-        {
-            throw new NotImplementedException();
-        }
-        public override uint[] GetVerticesIndexes()
-        {
-            throw new NotImplementedException();
-        }
-
-        public override string ToString() => String.Format("{0} {1} {2} {3} {4} {5} {6},{7}", IsRelative ? 'a' : 'A', _rx, _ry, _angle, Convert.ToInt32(_largeArcFlag), Convert.ToInt32(_sweepFlag), X, Y);
-
-        public override void UpdateLast()
-        {
-            throw new NotImplementedException();
-        }
-    }
 }

FreeFrame/Components/Shapes/SVGPath.cs

@@ -81,9 +81,6 @@ public SVGPath(XmlReader reader)
                         case 't':
                             DrawAttributes.Add(new SmoothQuadraticBezierCurveTo(match.Groups[1], match.Groups[2], c == 't')); // 't' is relative and 'T' absolute
                             break;
-                        case 'a':
-                            DrawAttributes.Add(new EllipticalArc(match.Groups[1], match.Groups[2], match.Groups[3], match.Groups[4], match.Groups[5], match.Groups[6], match.Groups[7], c == 'a')); // 'a' is relative and 'A' absolute
-                            break;
                         case 'z':
                             DrawAttributes.Add(new LineTo(_x0, _y0));
                             break;
@@ -158,7 +155,6 @@ public override void Move(Vector2i position)
                 Type attrType = attr.GetType();
                 if (attr.IsRelative == false) // Update position of each absolute attr
                 {
-                    //Console.WriteLine("{0} is relative? =>{1}", attr.GetType().Name, attr.IsRelative);
                     if (deltaX == null || deltaY == null)
                     {
                         // Get delta X and Y only one time
@@ -185,8 +181,7 @@ public override void Move(Vector2i position)
                 if (attrType == typeof(CurveTo) ||
                     attrType == typeof(SmoothCurveTo) ||
                     attrType == typeof(QuadraticBezierCurveTo) ||
-                    attrType == typeof(SmoothQuadraticBezierCurveTo) ||
-                    attrType == typeof(EllipticalArc)) // Only thoses are LineStrip type
+                    attrType == typeof(SmoothQuadraticBezierCurveTo)) // Only thoses are LineStrip type
                 {
                     Renderers.Add(new Renderer(attr.GetVertices(), attr.GetVerticesIndexes(), PrimitiveType.LineStrip, this));
                 }

FreeFrame/Lib/ImGuiTools/ImGuiController.cs

@@ -284,8 +284,6 @@ private void RenderImDrawData(ImDrawDataPtr draw_data)
                     int newSize = (int)Math.Max(_vertexBufferSize * 1.5f, vertexSize);
                     GL.NamedBufferData(_vertexBuffer, newSize, IntPtr.Zero, BufferUsageHint.DynamicDraw);
                     _vertexBufferSize = newSize;
-
-                    Console.WriteLine($"Resized dear imgui vertex buffer to new size {_vertexBufferSize}");
                 }
 
                 int indexSize = cmd_list.IdxBuffer.Size * sizeof(ushort);
@@ -294,8 +292,6 @@ private void RenderImDrawData(ImDrawDataPtr draw_data)
                     int newSize = (int)Math.Max(_indexBufferSize * 1.5f, indexSize);
                     GL.NamedBufferData(_indexBuffer, newSize, IntPtr.Zero, BufferUsageHint.DynamicDraw);
                     _indexBufferSize = newSize;
-
-                    Console.WriteLine($"Resized dear imgui index buffer to new size {_indexBufferSize}");
                 }
             }
 

FreeFrame/Renderer.cs

@@ -165,14 +165,13 @@ public void ImplementObjects(float[] vertices, uint[] indexes)
             _indexCount = indexes.Length;
         }
         /// <summary>
-        /// Delete all the buffer objects and shader
+        /// Delete all the buffer objects
         /// </summary>
         public void DeleteObjects()
         {
             GL.DeleteBuffer(VertexBufferObjectID);
             GL.DeleteBuffer(IndexBufferObjectID);
             GL.DeleteVertexArray(VertexArrayObjectID);
-            _shader.Delete();
         }
     }
 }

FreeFrame/Shader.cs

@@ -61,12 +61,5 @@ int CompileShader(string uri, ShaderType type)
         /// Use the current shaders
         /// </summary>
         public void Use() => GL.UseProgram(_program);
-
-        /// <summary>
-        /// Delete the program/shaders
-        /// </summary>
-        public void Delete() { }  //GL.DeleteProgram(_program);
-        ~Shader() => Delete(); 
-        //TODO: Make deletion program correctly
     }
 }

FreeFrame/Window.cs

@@ -714,7 +714,6 @@ private void ShowUI()
                     _selectedShape = Shapes[i];
                     _selector.Select(Shapes[i]);
                     _userMode = UserMode.Edit;
-                    Console.WriteLine("New shape selected through tree view");
                 }
                 if (i - 1 >= 0)
                 {
@@ -945,7 +944,6 @@ private void ShowUI()
                         {
                             if (shape.Id == _selectedShape.Id)
                             {
-                                Console.WriteLine("Already exist");
                                 _timeline.SortedTimeline[_timeline.TimelineIndex].Remove(shape);
                                 break;
                             }
@@ -1094,36 +1092,31 @@ private void ShowUI()
                 if (picker.Draw())
                 {
                     ResetSelection();
-                    //bool compatibilityFlag = false;
-
-                    switch (_importMode)
-                    {
-                        case ImportMode.Workspace:
-                            ImportFreeFrameWorkspace(picker.SelectedFile);
-                            break;
-                        case ImportMode.Add:
-                            (List<Shape> newShapes, SortedDictionary<int, List<Shape>> newTimeline, _dialogCompatibility) = Importer.ImportFromFile(picker.SelectedFile);
-                            Shapes.AddRange(newShapes);
-                            break;
-                        case ImportMode.Override:
-                            (Shapes, _timeline.SortedTimeline, _dialogCompatibility) = Importer.ImportFromFile(picker.SelectedFile);
-                            _timeline.ResetTimeline();
-                            break;
-                        default:
-                            break;
-                    }
-                    // TODO: Fix trycatch
                     try
                     {
+                        switch (_importMode)
+                        {
+                            case ImportMode.Workspace:
+                                ImportFreeFrameWorkspace(picker.SelectedFile);
+                                break;
+                            case ImportMode.Add:
+                                (List<Shape> newShapes, SortedDictionary<int, List<Shape>> newTimeline, _dialogCompatibility) = Importer.ImportFromFile(picker.SelectedFile);
+                                Shapes.AddRange(newShapes);
+                                break;
+                            case ImportMode.Override:
+                                (Shapes, _timeline.SortedTimeline, _dialogCompatibility) = Importer.ImportFromFile(picker.SelectedFile);
+                                _timeline.ResetTimeline();
+                                break;
+                            default:
+                                break;
+                        }
+
                     }
                     catch (Exception)
                     {
                         _dialogError = true;
                     }
 
-                    //if (compatibilityFlag)
-                    //    _dialogCompatibility = true;
-
                     FilePicker.Clear();
                 }
                 _dialogFilePicker = false;
@@ -1134,7 +1127,7 @@ private void ShowUI()
             if (_dialogCompatibility)
                 ImGui.OpenPopup("Compatibility Problem");
 
-            if (ImGui.BeginPopupModal("Compatibility Problem")) // ImGuiWindowFlags.AlwaysAutoResize
+            if (ImGui.BeginPopupModal("Compatibility Problem"))
             {
                 ImGui.Text("Some SVG elements are not compatible. Go to the list of compatible SVG elements");
                 ImGui.Separator();
@@ -1149,7 +1142,7 @@ private void ShowUI()
             // Error alert
             if (_dialogError)
                 ImGui.OpenPopup("Error Problem");
-            if (ImGui.BeginPopupModal("Error Problem")) // ImGuiWindowFlags.AlwaysAutoResize
+            if (ImGui.BeginPopupModal("Error Problem"))
             {
                 ImGui.Text("There was an error while importing the file, please check the syntax");
                 ImGui.Separator();