feat: angle supported

Author: JeremyMeissner

FreeFrame/Components/Shapes/Shape.cs

@@ -6,7 +6,7 @@
 
 namespace FreeFrame.Components.Shapes
 {
-    public abstract class Shape
+    public abstract class Shape : IDrawable
     {
         bool _isMoveable = true;
         bool _isResizeable = true;
@@ -40,9 +40,6 @@ public Shape()
             Id = Guid.NewGuid();
         }
 
-        /// <summary>
-        /// Trigge draw element through OpenGL context
-        /// </summary>
         public virtual void Draw(Vector2i clientSize, Camera camera)
         {
             //Console.WriteLine("Draw {0}, {1}, {2}", GetType().Name, Id, GetHashCode());

FreeFrame/IDrawable.cs

@@ -0,0 +1,22 @@
+using OpenTK.Mathematics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FreeFrame
+{
+    public interface IDrawable
+    {
+        List<Renderer> Vaos
+        {
+            get;
+        }
+        /// <summary>
+        /// Trigge draw element through OpenGL context
+        /// </summary>
+        public void Draw(Vector2i clientSize, Camera camera);
+        public void DeleteObjects();
+    }
+}

FreeFrame/Renderer.cs

@@ -102,26 +102,15 @@ public void Draw(Vector2i clientSize, Camera camera, Color4 color, Shape shape)
             int uProjection = _shader.GetUniformLocation("u_Projection");
             _shader.SetUniformMat4(uProjection, camera.GetViewMatrix());
 
+            int uRadius = _shader.GetUniformLocation("u_Radius");
+            _shader.SetUniformFloat(uRadius, shape.CornerRadius);
+
+            int uSize = _shader.GetUniformLocation("u_Size");
+            _shader.SetUniformVec2(uSize, new Vector2(shape.Width, shape.Height));
+
+            int uPosition = _shader.GetUniformLocation("u_Position");
+            _shader.SetUniformVec2(uPosition, new Vector2(shape.X, shape.Y));
 
-            Type type = shape.GetType();
-            if (type == typeof(SVGCircle))
-            {
-                int uRadius = _shader.GetUniformLocation("u_Radius");
-                int uPosition = _shader.GetUniformLocation("u_Position");
-
-                _shader.SetUniformFloat(uRadius, shape.Width / 2);
-                _shader.SetUniformVec2(uPosition, new Vector2(shape.X + shape.Width / 2, shape.Y + shape.Height / 2)); 
-            }
-            else if (type == typeof(SVGRectangle))
-            {
-                int uRadius = _shader.GetUniformLocation("u_Radius");
-                int uSize = _shader.GetUniformLocation("u_Size");
-                int uPosition = _shader.GetUniformLocation("u_Position");
-
-                _shader.SetUniformFloat(uRadius, ((SVGRectangle)shape).CornerRadius);
-                _shader.SetUniformVec2(uSize, new Vector2(shape.Width, shape.Height)); 
-                _shader.SetUniformVec2(uPosition, new Vector2(shape.X, shape.Y)); // Invert y axis
-            }
 
             GL.BindVertexArray(VertexArrayObjectID);
 

FreeFrame/Selector.cs

@@ -9,7 +9,7 @@
 
 namespace FreeFrame
 {
-    public class Selector
+    public class Selector : IDrawable
     {
         public struct Area
         {
@@ -33,17 +33,17 @@ public enum SelectorType
             None
         }
 
-        private List<(Renderer vao, Area hitbox, SelectorType type)> _vaos;
+        private List<(Renderer vao, Area hitbox, SelectorType type)> _vaos;  // TODO: Just have a List<Renderer> like Shape in order to put it in the interface
+
+        public List<Renderer> Vaos { get => null; set => _ = value; } // TODO: Just have a List<Renderer> like Shape in order to put it in the interface
 
         public Selector()
         {
             _vaos = new List<(Renderer vao, Area hitbox, SelectorType type)>();
         }
         public void Select(Shape shape)
         {
-            _vaos.ForEach(i => i.vao.DeleteObjects());
-            _vaos.Clear();
-
+            DeleteObjects();
 
             // Edge
             Area hitbox = new Area
@@ -98,6 +98,11 @@ public void Draw(Vector2i clientSize, Camera camera)
             GL.Disable(EnableCap.LineSmooth);
 
         }
+        /// <summary>
+        /// Return true if the given mouse position is in the selector hitbox
+        /// </summary>
+        /// <param name="mousePosition">Mouse position</param>
+        /// <returns>true if touching the selector (and give the selector type), false otherwise (and null) </returns>
         public (bool, SelectorType?) HitBox(Vector2i mousePosition)
         {
             if (_vaos.Count > 0)
@@ -106,5 +111,11 @@ public void Draw(Vector2i clientSize, Camera camera)
                         return (true, part.type);
             return (false, null);
         }
+
+        public void DeleteObjects()
+        {
+            _vaos.ForEach(i => i.vao.DeleteObjects());
+            _vaos.Clear();
+        }
     }
 }

FreeFrame/Shaders/circle.frag

@@ -5,6 +5,7 @@ layout(location = 0) out vec4 color;
 uniform vec2 u_Resolution;
 uniform vec4 u_Color;
 uniform vec2 u_Position;
+uniform vec2 u_Size;
 uniform float u_Radius;
 
 // Draw a circle at a given position with radius and color
@@ -18,7 +19,9 @@ void main() {
 
 	vec2 uv = gl_FragCoord.xy;
 
-	vec2 position = vec2(u_Position.x, u_Resolution.y - u_Position.y);  // Invert y axis
+	float radius = u_Size.x / 2.0;
 
-	color = circle(uv, position, u_Radius, u_Color);
+	vec2 position = vec2(u_Position.x + u_Size.x / 2.0, u_Resolution.y - (u_Position.y + u_Size.y / 2.0));  // Invert y axis
+
+	color = circle(uv, position, radius, u_Color);
 }

FreeFrame/Shaders/shader.vert

@@ -7,8 +7,22 @@ uniform mat4 u_Transformation;
 uniform mat4 u_View;
 uniform mat4 u_Projection;
 
+uniform vec2 u_Resolution;
+uniform vec2 u_Position;
+uniform vec2 u_Size;
+
 
 void main()
 {
-	gl_Position = u_Transformation * (u_Model_To_NDC * vec4(position,1.0, 1.0)); // * u_View * u_Projection);
+	vec4 finalPosition = vec4(position,1.0, 1.0);
+
+	finalPosition -= vec4(u_Position.x + u_Size.x/2.0, u_Position.y + u_Size.y/2.0, 0.0, 0.0);
+
+	finalPosition = finalPosition * u_Transformation;
+
+	finalPosition += vec4(u_Position.x + u_Size.x/2.0, u_Position.y + u_Size.y/2.0, 0.0, 0.0);
+
+	finalPosition = u_Model_To_NDC * finalPosition;
+
+	gl_Position = finalPosition; // * u_View * u_Projection);
 }