refactor: Renderer

FreeFrame/Components/Shapes/SVGCircle.cs

@@ -47,11 +47,11 @@ public override List<Vector2i> GetSelectablePoints()
 
         public override void ImplementObject()
         {
-            foreach (Renderer vao in Vaos)
+            foreach (Renderer vao in Renderers)
                 vao.DeleteObjects();
-            Vaos.Clear();
+            Renderers.Clear();
 
-            Vaos.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.Triangles, this));
+            Renderers.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.Triangles, this));
         }
 
         public override void Move(Vector2i position)

FreeFrame/Components/Shapes/SVGLine.cs

@@ -40,7 +40,7 @@ public SVGLine(int x1, int y1, int x2, int y2, string color)
 
             ImplementObject();
         }
-        public override float[] GetVertices() => new float[] { X, Y, Width + X, Height + Y }; // x, y, x, y, x, y, ... (clockwise)
+        public override float[] GetVertices() => new float[] { X, Y, X + Width, Y + Height }; // x, y, x, y, x, y, ... (clockwise)
         public override uint[] GetVerticesIndexes() => new uint[] { 0, 1 }; // TODO: please dont hardcode
         public override string ToString() => $"<line x1=\"{X}\" y1=\"{Y}\" x2=\"{Width + X}\" y2=\"{Height + Y}\" fill=\"{ColorToHexadecimal(Color)}\"/>";
         public override List<Vector2i> GetSelectablePoints()
@@ -52,11 +52,11 @@ public override List<Vector2i> GetSelectablePoints()
         }
         public override void ImplementObject()
         {
-            foreach (Renderer vao in Vaos)
+            foreach (Renderer vao in Renderers)
                 vao.DeleteObjects();
-            Vaos.Clear();
+            Renderers.Clear();
 
-            Vaos.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.Lines, this ));
+            Renderers.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.Lines, this ));
         }
         public override void Move(Vector2i position)
         {

FreeFrame/Components/Shapes/SVGPath.cs

@@ -161,11 +161,11 @@ public override void Move(Vector2i position)
                     attrType == typeof(SmoothQuadraticBezierCurveTo) ||
                     attrType == typeof(EllipticalArc))
                 {
-                    Vaos.Add(new Renderer(attr.GetVertices(), attr.GetVerticesIndexes(), PrimitiveType.LineStrip, this));
+                    Renderers.Add(new Renderer(attr.GetVertices(), attr.GetVerticesIndexes(), PrimitiveType.LineStrip, this));
                 }
                 else
                 {
-                    Vaos.Add(new Renderer(attr.GetVertices(), attr.GetVerticesIndexes(), PrimitiveType.Lines, this));
+                    Renderers.Add(new Renderer(attr.GetVertices(), attr.GetVerticesIndexes(), PrimitiveType.Lines, this));
                 }
                 attr.UpdateLast(); // Update Last's inner variables 
             }

FreeFrame/Components/Shapes/SVGPolygon.cs

@@ -103,14 +103,14 @@ public override uint[] GetVerticesIndexes()
 
         public override void ImplementObject()
         {
-            foreach (Renderer vao in Vaos)
+            foreach (Renderer vao in Renderers)
                 vao.DeleteObjects();
-            Vaos.Clear();
+            Renderers.Clear();
 
             if (_points.Count == 3) // Triangle
-                Vaos.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.Triangles, this));
+                Renderers.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.Triangles, this));
             else
-                Vaos.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.LineLoop, this));
+                Renderers.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.LineLoop, this));
 
         }
 

FreeFrame/Components/Shapes/SVGRectangle.cs

@@ -45,11 +45,11 @@ public SVGRectangle(int width, int height, int x, int y, int rx, int ry, string
         }
         public override void ImplementObject()
         {
-            foreach (Renderer vao in Vaos)
+            foreach (Renderer vao in Renderers)
                 vao.DeleteObjects();
-            Vaos.Clear();
+            Renderers.Clear();
 
-            Vaos.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.Triangles, this));
+            Renderers.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.Triangles, this));
         }
         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
@@ -58,8 +58,6 @@ public override string ToString()
             return $"<rect x=\"{X}\" y=\"{Y}\" width=\"{Width}\" height=\"{Height}\" rx=\"{CornerRadius}\" ry=\"{CornerRadius}\" fill=\"{ColorToHexadecimal(Color)}\"/>";
         }
 
-
-
         public override List<Vector2i> GetSelectablePoints()
         {
             List<Vector2i> points = new();

FreeFrame/Components/Shapes/Shape.cs

@@ -18,7 +18,7 @@ public abstract class Shape : IDrawable
         Guid _id;
         #endregion
 
-        private List<Renderer> vaos;
+        private List<Renderer> renderers;
         public int X { get => _x; set => _x = value; }
         public int Y { get => _y; set => _y = value; }
         public int Width { get => _width; set => _width = Math.Max(0, value); }
@@ -31,37 +31,37 @@ public abstract class Shape : IDrawable
         public bool IsCornerRadiusChangeable { get => _isCornerRadiusChangeable; set => _isCornerRadiusChangeable = value; }
         public int CornerRadius { get => _cornerRadius; set => _cornerRadius = value; }
         public Guid Id { get => _id; private  set => _id = value; }
-        public List<Renderer> Vaos { get => vaos; protected set => vaos = value; }
+        public List<Renderer> Renderers { get => renderers; protected set => renderers = value; }
         public string ShortId
         {
             get => Id.ToString().Substring(0, 6);
         }
         public Shape() 
         {
-            Vaos = new List<Renderer>();
+            Renderers = new List<Renderer>();
             Color = Color4.Black;
             Id = Guid.NewGuid();
         }
 
         public virtual void Draw(Vector2i clientSize)
         {
             //Console.WriteLine("Draw {0}, {1}, {2}", GetType().Name, Id, GetHashCode());
-            foreach (Renderer vao in Vaos)
+            foreach (Renderer vao in Renderers)
                 vao.Draw(clientSize, Color, this);
         }
         public void DeleteObjects()
         {
-            foreach (Renderer vao in Vaos)
+            foreach (Renderer vao in Renderers)
                 vao.DeleteObjects();
-            Vaos.Clear();
+            Renderers.Clear();
         }
         public Shape ShallowCopy() => (Shape)MemberwiseClone();
         public Shape DeepCopy()
         {
             Shape shape = (Shape)MemberwiseClone();
             shape.Id = Guid.NewGuid();
             shape.DeleteObjects();
-            shape.Vaos = new List<Renderer>();
+            shape.Renderers = new List<Renderer>();
             shape.ImplementObject();
             return shape;
         }

FreeFrame/Renderer.cs

@@ -32,7 +32,6 @@ public Renderer(PrimitiveType primitiveType)
             _shader = new Shader("Shaders/shader.vert", "Shaders/shader.frag");
         }
 
-        // TODO: rename this renderer?
         public Renderer(float[] vertices, uint[] indexes, PrimitiveType primitiveType) : this(primitiveType)
         {
             ImplementObjects(vertices, indexes);

FreeFrame/Window.cs

@@ -464,7 +464,7 @@ private void ShowUIDebug()
 
             if (_selectedShape != null)
             {
-                foreach (Renderer vao in _selectedShape.Vaos)
+                foreach (Renderer vao in _selectedShape.Renderers)
                 {
                     ImGui.Text(String.Format("VAO: {0}", vao.VertexArrayObjectID));
                     ImGui.Text(String.Format("VBO: {0}", vao.VertexBufferObjectID));
@@ -515,7 +515,7 @@ private void ShowUIDebug()
                                     ImGui.Text(string.Format("{0}", shapes.Value[row].GetType().Name));
                                     ImGui.Text(string.Format("{0}", shapes.Value[row].Id));
                                     ImGui.Text(string.Format("{0}", shapes.Value[row].GetHashCode()));
-                                    foreach (Renderer vao in shapes.Value[row].Vaos)
+                                    foreach (Renderer vao in shapes.Value[row].Renderers)
                                     {
                                         ImGui.Text(String.Format("VAO: {0}", vao.VertexArrayObjectID));
                                         ImGui.Text(String.Format("VBO: {0}", vao.VertexBufferObjectID));