refactor: timeline

Author: JeremyMeissner

FreeFrame/Camera.cs

@@ -43,19 +43,28 @@ public Shape()
             Id = Guid.NewGuid();
         }
 
-        public virtual void Draw(Vector2i clientSize, Camera camera)
+        public virtual void Draw(Vector2i clientSize)
         {
             //Console.WriteLine("Draw {0}, {1}, {2}", GetType().Name, Id, GetHashCode());
             foreach (Renderer vao in Vaos)
-                vao.Draw(clientSize, camera, Color, this);
+                vao.Draw(clientSize, Color, this);
         }
         public void DeleteObjects()
         {
             foreach (Renderer vao in Vaos)
                 vao.DeleteObjects();
             Vaos.Clear();
         }
-        public Shape Clone() => (Shape)MemberwiseClone();
+        public Shape ShallowCopy() => (Shape)MemberwiseClone();
+        public Shape DeepCopy()
+        {
+            Shape shape = (Shape)MemberwiseClone();
+            shape.Id = Guid.NewGuid();
+            shape.DeleteObjects();
+            shape.Vaos = new List<Renderer>();
+            shape.ImplementObject();
+            return shape;
+        }
 
 
         /// <summary>
@@ -86,6 +95,7 @@ public static string ColorToHexadecimal(Color4 color)
             a = (int)(color.A * 255);
             return '#' + r.ToString("X2") + g.ToString("X2") + b.ToString("X2") + a.ToString("X2");
         }
+
     }
 
 }

FreeFrame/Components/Shapes/Shape.cs

@@ -16,7 +16,7 @@ List<Renderer> Vaos
         /// <summary>
         /// Trigge draw element through OpenGL context
         /// </summary>
-        public void Draw(Vector2i clientSize, Camera camera);
+        public void Draw(Vector2i clientSize);
         public void DeleteObjects();
     }
 }

FreeFrame/IDrawable.cs

@@ -47,7 +47,7 @@ public Renderer(float[] vertices, uint[] indexes, PrimitiveType primitiveType, S
                 _shader = new Shader("Shaders/shader.vert", "Shaders/rectangle.frag");
             ImplementObjects(vertices, indexes);
         }
-        public void Draw(Vector2i clientSize, Camera camera, Color4 color, Matrix4 transformation)
+        public void Draw(Vector2i clientSize, Color4 color, Matrix4 transformation)
         {
             _shader.Use();
 
@@ -66,17 +66,11 @@ public void Draw(Vector2i clientSize, Camera camera, Color4 color, Matrix4 trans
             int uTransformation = _shader.GetUniformLocation("u_Transformation");
             _shader.SetUniformMat4(uTransformation, transformation);
 
-            int uView = _shader.GetUniformLocation("u_View");
-            _shader.SetUniformMat4(uView, camera.GetViewMatrix());
-
-            int uProjection = _shader.GetUniformLocation("u_Projection");
-            _shader.SetUniformMat4(uProjection, camera.GetViewMatrix());
-
             GL.BindVertexArray(VertexArrayObjectID);
 
             GL.DrawElements(_primitiveType, _indexCount, DrawElementsType.UnsignedInt, 0);
         }
-        public void Draw(Vector2i clientSize, Camera camera, Color4 color, Shape shape)
+        public void Draw(Vector2i clientSize, Color4 color, Shape shape)
         {
             _shader.Use();
             // Applied projection matrix
@@ -95,12 +89,6 @@ public void Draw(Vector2i clientSize, Camera camera, Color4 color, Shape shape)
             Matrix4 rotation = Matrix4.CreateRotationZ(MathHelper.DegreesToRadians(shape.Angle));
             _shader.SetUniformMat4(uTransformation, rotation);
 
-            int uView = _shader.GetUniformLocation("u_View");
-            _shader.SetUniformMat4(uView, camera.GetViewMatrix());
-
-            int uProjection = _shader.GetUniformLocation("u_Projection");
-            _shader.SetUniformMat4(uProjection, camera.GetViewMatrix());
-
             int uRadius = _shader.GetUniformLocation("u_Radius");
             _shader.SetUniformFloat(uRadius, shape.CornerRadius);
 

FreeFrame/Renderer.cs

@@ -83,7 +83,7 @@ public void Select(Shape shape)
                 _vaos.Add((new Renderer(hitbox.ToFloatArray(), new uint[] { 0, 1, 2, 0, 2, 3 }, PrimitiveType.Triangles), hitbox, SelectorType.Resize));
         }
 
-        public void Draw(Vector2i clientSize, Camera camera)
+        public void Draw(Vector2i clientSize)
         {
             GL.Enable(EnableCap.LineSmooth);
             GL.LineWidth(3.0f);                 
@@ -95,9 +95,9 @@ public void Draw(Vector2i clientSize, Camera camera)
             foreach ((Renderer vao, Area _, SelectorType type) part in _vaos)
             {
                 if (part.type == SelectorType.Edge)
-                    part.vao.Draw(clientSize, camera, new Color4(0, 125, 200, 255), transformation);
+                    part.vao.Draw(clientSize, new Color4(0, 125, 200, 255), transformation);
                 else
-                    part.vao.Draw(clientSize, camera, new Color4(0, 125, 255, 255), transformation);
+                    part.vao.Draw(clientSize, new Color4(0, 125, 255, 255), transformation);
             }
 
             GL.Disable(EnableCap.LineSmooth);

FreeFrame/Selector.cs

@@ -4,8 +4,6 @@ layout(location = 0) in vec2 position;
 
 uniform mat4 u_Model_To_NDC;
 uniform mat4 u_Transformation;
-uniform mat4 u_View;
-uniform mat4 u_Projection;
 
 uniform vec2 u_Resolution;
 uniform vec2 u_Position;