Skip to content

Commit f520c1d

Browse files
JeremyMeissnerJeremyMeissner
committed
refactor: Renderer
1 parent 172e538 commit f520c1d

8 files changed

Lines changed: 25 additions & 28 deletions

File tree

‎FreeFrame/Components/Shapes/SVGCircle.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ public override List<Vector2i> GetSelectablePoints()
4747

4848
public override void ImplementObject()
4949
{
50-
foreach (Renderer vao in Vaos)
50+
foreach (Renderer vao in Renderers)
5151
vao.DeleteObjects();
52-
Vaos.Clear();
52+
Renderers.Clear();
5353

54-
Vaos.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.Triangles, this));
54+
Renderers.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.Triangles, this));
5555
}
5656

5757
public override void Move(Vector2i position)

‎FreeFrame/Components/Shapes/SVGLine.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public SVGLine(int x1, int y1, int x2, int y2, string color)
4040

4141
ImplementObject();
4242
}
43-
public override float[] GetVertices() => new float[] { X, Y, Width + X, Height + Y }; // x, y, x, y, x, y, ... (clockwise)
43+
public override float[] GetVertices() => new float[] { X, Y, X + Width, Y + Height }; // x, y, x, y, x, y, ... (clockwise)
4444
public override uint[] GetVerticesIndexes() => new uint[] { 0, 1 }; // TODO: please dont hardcode
4545
public override string ToString() => $"<line x1=\"{X}\" y1=\"{Y}\" x2=\"{Width + X}\" y2=\"{Height + Y}\" fill=\"{ColorToHexadecimal(Color)}\"/>";
4646
public override List<Vector2i> GetSelectablePoints()
@@ -52,11 +52,11 @@ public override List<Vector2i> GetSelectablePoints()
5252
}
5353
public override void ImplementObject()
5454
{
55-
foreach (Renderer vao in Vaos)
55+
foreach (Renderer vao in Renderers)
5656
vao.DeleteObjects();
57-
Vaos.Clear();
57+
Renderers.Clear();
5858

59-
Vaos.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.Lines, this ));
59+
Renderers.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.Lines, this ));
6060
}
6161
public override void Move(Vector2i position)
6262
{

‎FreeFrame/Components/Shapes/SVGPath.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,11 @@ public override void Move(Vector2i position)
161161
attrType == typeof(SmoothQuadraticBezierCurveTo) ||
162162
attrType == typeof(EllipticalArc))
163163
{
164-
Vaos.Add(new Renderer(attr.GetVertices(), attr.GetVerticesIndexes(), PrimitiveType.LineStrip, this));
164+
Renderers.Add(new Renderer(attr.GetVertices(), attr.GetVerticesIndexes(), PrimitiveType.LineStrip, this));
165165
}
166166
else
167167
{
168-
Vaos.Add(new Renderer(attr.GetVertices(), attr.GetVerticesIndexes(), PrimitiveType.Lines, this));
168+
Renderers.Add(new Renderer(attr.GetVertices(), attr.GetVerticesIndexes(), PrimitiveType.Lines, this));
169169
}
170170
attr.UpdateLast(); // Update Last's inner variables
171171
}

‎FreeFrame/Components/Shapes/SVGPolygon.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ public override uint[] GetVerticesIndexes()
103103

104104
public override void ImplementObject()
105105
{
106-
foreach (Renderer vao in Vaos)
106+
foreach (Renderer vao in Renderers)
107107
vao.DeleteObjects();
108-
Vaos.Clear();
108+
Renderers.Clear();
109109

110110
if (_points.Count == 3) // Triangle
111-
Vaos.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.Triangles, this));
111+
Renderers.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.Triangles, this));
112112
else
113-
Vaos.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.LineLoop, this));
113+
Renderers.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.LineLoop, this));
114114

115115
}
116116

‎FreeFrame/Components/Shapes/SVGRectangle.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ public SVGRectangle(int width, int height, int x, int y, int rx, int ry, string
4545
}
4646
public override void ImplementObject()
4747
{
48-
foreach (Renderer vao in Vaos)
48+
foreach (Renderer vao in Renderers)
4949
vao.DeleteObjects();
50-
Vaos.Clear();
50+
Renderers.Clear();
5151

52-
Vaos.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.Triangles, this));
52+
Renderers.Add(new Renderer(GetVertices(), GetVerticesIndexes(), PrimitiveType.Triangles, this));
5353
}
5454
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)
5555
public override uint[] GetVerticesIndexes() => new uint[] { 0, 1, 2, 0, 2, 3 }; // TODO: please dont hardcode
@@ -58,8 +58,6 @@ public override string ToString()
5858
return $"<rect x=\"{X}\" y=\"{Y}\" width=\"{Width}\" height=\"{Height}\" rx=\"{CornerRadius}\" ry=\"{CornerRadius}\" fill=\"{ColorToHexadecimal(Color)}\"/>";
5959
}
6060

61-
62-
6361
public override List<Vector2i> GetSelectablePoints()
6462
{
6563
List<Vector2i> points = new();

‎FreeFrame/Components/Shapes/Shape.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public abstract class Shape : IDrawable
1818
Guid _id;
1919
#endregion
2020

21-
private List<Renderer> vaos;
21+
private List<Renderer> renderers;
2222
public int X { get => _x; set => _x = value; }
2323
public int Y { get => _y; set => _y = value; }
2424
public int Width { get => _width; set => _width = Math.Max(0, value); }
@@ -31,37 +31,37 @@ public abstract class Shape : IDrawable
3131
public bool IsCornerRadiusChangeable { get => _isCornerRadiusChangeable; set => _isCornerRadiusChangeable = value; }
3232
public int CornerRadius { get => _cornerRadius; set => _cornerRadius = value; }
3333
public Guid Id { get => _id; private set => _id = value; }
34-
public List<Renderer> Vaos { get => vaos; protected set => vaos = value; }
34+
public List<Renderer> Renderers { get => renderers; protected set => renderers = value; }
3535
public string ShortId
3636
{
3737
get => Id.ToString().Substring(0, 6);
3838
}
3939
public Shape()
4040
{
41-
Vaos = new List<Renderer>();
41+
Renderers = new List<Renderer>();
4242
Color = Color4.Black;
4343
Id = Guid.NewGuid();
4444
}
4545

4646
public virtual void Draw(Vector2i clientSize)
4747
{
4848
//Console.WriteLine("Draw {0}, {1}, {2}", GetType().Name, Id, GetHashCode());
49-
foreach (Renderer vao in Vaos)
49+
foreach (Renderer vao in Renderers)
5050
vao.Draw(clientSize, Color, this);
5151
}
5252
public void DeleteObjects()
5353
{
54-
foreach (Renderer vao in Vaos)
54+
foreach (Renderer vao in Renderers)
5555
vao.DeleteObjects();
56-
Vaos.Clear();
56+
Renderers.Clear();
5757
}
5858
public Shape ShallowCopy() => (Shape)MemberwiseClone();
5959
public Shape DeepCopy()
6060
{
6161
Shape shape = (Shape)MemberwiseClone();
6262
shape.Id = Guid.NewGuid();
6363
shape.DeleteObjects();
64-
shape.Vaos = new List<Renderer>();
64+
shape.Renderers = new List<Renderer>();
6565
shape.ImplementObject();
6666
return shape;
6767
}

‎FreeFrame/Renderer.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public Renderer(PrimitiveType primitiveType)
3232
_shader = new Shader("Shaders/shader.vert", "Shaders/shader.frag");
3333
}
3434

35-
// TODO: rename this renderer?
3635
public Renderer(float[] vertices, uint[] indexes, PrimitiveType primitiveType) : this(primitiveType)
3736
{
3837
ImplementObjects(vertices, indexes);

‎FreeFrame/Window.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ private void ShowUIDebug()
464464

465465
if (_selectedShape != null)
466466
{
467-
foreach (Renderer vao in _selectedShape.Vaos)
467+
foreach (Renderer vao in _selectedShape.Renderers)
468468
{
469469
ImGui.Text(String.Format("VAO: {0}", vao.VertexArrayObjectID));
470470
ImGui.Text(String.Format("VBO: {0}", vao.VertexBufferObjectID));
@@ -515,7 +515,7 @@ private void ShowUIDebug()
515515
ImGui.Text(string.Format("{0}", shapes.Value[row].GetType().Name));
516516
ImGui.Text(string.Format("{0}", shapes.Value[row].Id));
517517
ImGui.Text(string.Format("{0}", shapes.Value[row].GetHashCode()));
518-
foreach (Renderer vao in shapes.Value[row].Vaos)
518+
foreach (Renderer vao in shapes.Value[row].Renderers)
519519
{
520520
ImGui.Text(String.Format("VAO: {0}", vao.VertexArrayObjectID));
521521
ImGui.Text(String.Format("VBO: {0}", vao.VertexBufferObjectID));

0 commit comments

Comments
 (0)