refactor: timeline

Author: JeremyMeissner

FreeFrame/Components/Shapes/Shape.cs

@@ -19,14 +19,14 @@ public abstract class Shape : IDrawable
         #endregion
 
         private List<Renderer> vaos;
-        public virtual int X { get => _x; set => _x = value; }
-        public virtual int Y { get => _y; set => _y = value; }
-        public virtual int Width { get => _width; set => _width = value; }
-        public virtual int Height { get => _height; set => _height = value; }
+        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); }
+        public int Height { get => _height; set => _height = Math.Max(0, value); }
         public Color4 Color { get => _color; set => _color = value; }
+        public int Angle { get => _angle; set => _angle = value; }
         public bool IsMoveable { get => _isMoveable; protected set => _isMoveable = value; }
         public bool IsResizeable { get => _isResizeable; protected set => _isResizeable = value; }
-        public int Angle { get => _angle; set => _angle = value; }
         public bool IsAngleChangeable { get => _isAngleChangeable; set => _isAngleChangeable = value; }
         public bool IsCornerRadiusChangeable { get => _isCornerRadiusChangeable; set => _isCornerRadiusChangeable = value; }
         public int CornerRadius { get => _cornerRadius; set => _cornerRadius = value; }

FreeFrame/Timeline.cs

@@ -12,11 +12,11 @@ namespace FreeFrame
 {
     public class Timeline
     {
-        const int DEFAULT_FPS = 24;
-        const int MIN_FPS = 1;
-        const int MAX_FPS = 120;
-        const int MIN_TIMELINE = 1;
-        const int MAX_TIMELINE = 100;
+        public const int DEFAULT_FPS = 24;
+        public const int MIN_FPS = 1;
+        public const int MAX_FPS = 120;
+        public const int MIN_TIMELINE = 1;
+        public const int MAX_TIMELINE = 100;
 
         private int _ioTimeline;
         private int _ioFps;

FreeFrame/Window.cs

@@ -55,6 +55,8 @@ enum CreateMode
         int _ioWidth;
         int _ioHeight;
         System.Numerics.Vector4 _ioColor;
+
+        System.Numerics.Vector3 _ioBgColor;
         bool _dialogFilePicker = false;
         bool _dialogCompatibility = false;
 
@@ -88,8 +90,9 @@ protected override void OnLoad()
             base.OnLoad();
 
             //Helper.EnableDebugMode();
+            _ioBgColor = new System.Numerics.Vector3(0.1f, 0.1f, 0.1f);
+            GL.ClearColor(_ioBgColor.X, _ioBgColor.Y, _ioBgColor.Z, 1.0f);
 
-            GL.ClearColor(0.1f, 0.1f, 0.1f, 1.0f); // TODO: Magic value
             GL.Enable(EnableCap.Multisample);
 
             _userMode = UserMode.Idle;
@@ -138,7 +141,6 @@ protected override void OnUpdateFrame(FrameEventArgs e)
                         x = _mouseOriginalState.X;
                 }
                 Title += String.Format(" (delta x: {0} delta y: {1})", x - _mouseOriginalState.X, y - _mouseOriginalState.Y);
-
             }
 
             // Update title based on current context
@@ -161,26 +163,6 @@ protected override void OnRenderFrame(FrameEventArgs e)
 
             _timeline.OnRenderFrame(e, this);
 
-            if (KeyboardState.IsKeyDown(Keys.Q))
-            {
-                ////Console.WriteLine("Draw me please");
-                //foreach (KeyValuePair<int, List<Shape>> shapes in thetimeline)
-                //{
-                //    foreach (Shape shape in shapes.Value)
-                //    {
-                //        shape.ImplementObject();
-                //        shape.Draw(ClientSize);
-                //    }
-                //}
-                //if (_selectedShape != null)
-                //    _selectedShape.ImplementObject(); // Reset VAOS for selected shape
-            }
-
-            //if (KeyboardState.IsKeyDown(Keys.Space))
-            //    _userMode = UserMode.Move;
-            //else if (KeyboardState.WasKeyDown(Keys.Space) && KeyboardState.IsKeyDown(Keys.Space) == false)
-            //    _userMode = UserMode.Idle;
-
             if (KeyboardState.IsKeyDown(Keys.Escape))
                 ResetSelection();
 
@@ -639,17 +621,23 @@ public void ShowUI()
                 ImGui.EndTable();
             }
 
-            ImGui.Spacing();
-            ImGui.Separator();
             ImGui.Spacing();
 
-            ImGui.Text("Color");
-            ImGui.Spacing();
             if (SelectedShape == null)
                 ImGui.BeginDisabled();
-            ImGui.ColorEdit4("Color", ref _ioColor);
+            ImGui.Text("Color");
+            ImGui.ColorEdit4("##Color", ref _ioColor);
             if (SelectedShape == null)
                 ImGui.EndDisabled();
+
+            ImGui.Spacing();
+            ImGui.Separator();
+            ImGui.Spacing();
+
+            ImGui.Text("Background Color");
+            ImGui.Spacing();
+            if (ImGui.ColorEdit3("##BgColor", ref _ioBgColor))
+                GL.ClearColor(_ioBgColor.X, _ioBgColor.Y, _ioBgColor.Z, 1.0f);
             ImGui.End();
 
             // Tree view side
@@ -782,8 +770,6 @@ public void ShowUI()
                 if (picker.Draw())
                 {
                     ResetSelection();
-                    _timeline.ResetTimeline();
-                    //ResetTimeline();
                     bool compatibilityFlag;
 
                     switch (_importMode)
@@ -795,6 +781,7 @@ public void ShowUI()
                         case ImportMode.Override:
                         default:
                             (Shapes, compatibilityFlag) = Importer.ImportFromFile(picker.SelectedFile);
+                            _timeline.ResetTimeline();
                             break;
                     }
                     FilePicker.RemoveFilePicker(this);
@@ -850,8 +837,8 @@ static void HelpMarker(string desc)
 
         public void SaveCurrentScreenToMP4()
         {
-            using VideoWriter w = new VideoWriter("output.mp4", 12, new System.Drawing.Size(ClientSize.X, ClientSize.Y), true);
-            for (int i = 0; i <= 100; i++) // TODO: please dont hardcode this
+            using VideoWriter w = new VideoWriter("output.mp4", _timeline.IoFps, new System.Drawing.Size(ClientSize.X, ClientSize.Y), true);
+            for (int i = Timeline.MIN_TIMELINE; i <= Timeline.MAX_TIMELINE; i++) // TODO: please dont hardcode this
             {
                 RenderFrameBySecondIndex(i);
                 w.Write(TakeSnap().ToMat());
@@ -861,7 +848,7 @@ public void SaveCurrentScreenToGIF()
         {
             using (var gif = AnimatedGif.AnimatedGif.Create("output.gif", 1000 / _timeline.IoFps))
             {
-                for (int i = 0; i < 100; i++) // TODO: please dont hardcode this
+                for (int i = Timeline.MIN_TIMELINE; i <= Timeline.MAX_TIMELINE; i++) // TODO: please dont hardcode this
                 {
                     RenderFrameBySecondIndex(i);
                     gif.AddFrame(TakeSnap(), delay: -1, quality: GifQuality.Bit8);