🚧Improve testing app (#1029)

* Start work for issue #950

* chore: swap the grad start and stop color controls

* test: update the flip image for the non animated scene

* test: add new audio content

* test: setup scene to choose different audio files

* test: remove small artifacts from animation

* fix: fix issue with hard coded values

* test: show audio type in audio scene

* test: change default window size

* test: increase size of background image to match default win size

* test: improve label and speed

* test: improve shape scene

* test: improve keyboard input scene

Testing/VelaptorTesting/Content/Atlas/Main-Atlas.json

@@ -2,68 +2,68 @@
   {
     "$type": "Velaptor.Graphics.AtlasSubTextureData, Velaptor",
 
-    "Bounds": "0, 0, 30, 36",
+    "Bounds": "0, 0, 30, 38",
     "FrameIndex": 0,
     "Name": "samus"
   },
   {
     "$type": "Velaptor.Graphics.AtlasSubTextureData, Velaptor",
-    "Bounds": "31, 0, 30, 36",
+    "Bounds": "31, 0, 30, 38",
     "FrameIndex": 1,
     "Name": "samus"
   },
   {
     "$type": "Velaptor.Graphics.AtlasSubTextureData, Velaptor",
-    "Bounds": "62, 0, 30, 36",
+    "Bounds": "62, 0, 30, 38",
     "FrameIndex": 2,
     "Name": "samus"
   },
   {
     "$type": "Velaptor.Graphics.AtlasSubTextureData, Velaptor",
-    "Bounds": "93, 0, 30, 36",
+    "Bounds": "93, 0, 30, 38",
     "FrameIndex": 3,
     "Name": "samus"
   },
   {
     "$type": "Velaptor.Graphics.AtlasSubTextureData, Velaptor",
-    "Bounds": "124, 0, 30, 36",
+    "Bounds": "124, 0, 30, 38",
     "FrameIndex": 4,
     "Name": "samus"
   },
   {
     "$type": "Velaptor.Graphics.AtlasSubTextureData, Velaptor",
-    "Bounds": "155, 0, 30, 36",
+    "Bounds": "155, 0, 30, 38",
     "FrameIndex": 5,
     "Name": "samus"
   },
   {
     "$type": "Velaptor.Graphics.AtlasSubTextureData, Velaptor",
-    "Bounds": "186, 0, 30, 36",
+    "Bounds": "186, 0, 30, 38",
     "FrameIndex": 6,
     "Name": "samus"
   },
   {
     "$type": "Velaptor.Graphics.AtlasSubTextureData, Velaptor",
-    "Bounds": "217, 0, 30, 36",
+    "Bounds": "217, 0, 30, 38",
     "FrameIndex": 7,
     "Name": "samus"
   },
   {
     "$type": "Velaptor.Graphics.AtlasSubTextureData, Velaptor",
-    "Bounds": "248, 0, 30, 36",
+    "Bounds": "248, 0, 30, 38",
     "FrameIndex": 8,
     "Name": "samus"
   },
   {
     "$type": "Velaptor.Graphics.AtlasSubTextureData, Velaptor",
-    "Bounds": "279, 0, 30, 36",
+    "Bounds": "279, 0, 30, 38",
     "FrameIndex": 9,
     "Name": "samus"
   },
   {
     "$type": "Velaptor.Graphics.AtlasSubTextureData, Velaptor",
-    "Bounds": "3, 39, 75, 75",
+    "Bounds": "0, 39, 100, 100",
     "FrameIndex": -1,
-    "Name": "octagon-flip"
+    "Name": "logo-flip"
   }
 ]

Testing/VelaptorTesting/MainWindow.cs

@@ -39,8 +39,10 @@ public class MainWindow : Window
     /// </summary>
     public MainWindow()
     {
-        this.batcher = RendererFactory.CreateBatcher();
+        Width = 1920;
+        Height = 1080;
 
+        this.batcher = RendererFactory.CreateBatcher();
         this.keyboard = HardwareFactory.GetKeyboard();
 
         this.batcher.ClearColor = Color.FromArgb(255, 42, 42, 46);

Testing/VelaptorTesting/Scenes/AnimatedGraphicsScene.cs

@@ -1,4 +1,4 @@
-// <copyright file="AnimatedGraphicsScene.cs" company="KinsonDigital">
+// <copyright file="AnimatedGraphicsScene.cs" company="KinsonDigital">
 // Copyright (c) KinsonDigital. All rights reserved.
 // </copyright>
 
@@ -78,13 +78,13 @@ public override void LoadContent()
 
         var sldSpeed = ctrlFactory.CreateSlider();
         sldSpeed.Name = "sldSpeed";
-        sldSpeed.Text = "Speed:";
-        sldSpeed.Min = 8;
-        sldSpeed.Max = 500;
-        sldSpeed.Value = 32;
+        sldSpeed.Text = "Speed(fps):";
+        sldSpeed.Min = 0;
+        sldSpeed.Max = 60;
+        sldSpeed.Value = 60;
         sldSpeed.ValueChanged += (_, speed) =>
         {
-            this.animSpeed = speed;
+            this.animSpeed = 1000f / speed;
         };
 
         optForward.Selected += (_, _) =>

Testing/VelaptorTesting/Scenes/AudioScene.cs

@@ -7,6 +7,7 @@ namespace VelaptorTesting.Scenes;
 using System;
 using System.Drawing;
 using System.Globalization;
+using System.IO;
 using System.Numerics;
 using KdGui;
 using KdGui.Factories;
@@ -26,10 +27,12 @@ public class AudioScene : SceneBase
     private ILoader<IAudio>? loader;
     private IAudio? audio;
     private ISlider? sldPosition;
-    private string? lblCurrentTimeName;
-    private string? lblStateName;
     private string? lblRepeatsName;
     private string? lblLengthName;
+    private string? lblCurrentTimeName;
+    private string? lblStateName;
+    private string? lblAudioTypeName;
+    private string? currentAudioType = "OGG";
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AudioScene"/> class.
@@ -43,7 +46,7 @@ public override void LoadContent()
         this.backgroundManager.Load(new Vector2(WindowCenter.X, WindowCenter.Y));
 
         this.loader = ContentLoaderFactory.CreateAudioLoader();
-        this.audio = this.loader.Load("test-song", AudioBuffer.Stream);
+        this.audio = this.loader.Load("ridley-draygon-theme.ogg", AudioBuffer.Stream);
 
         CreateInfoCtrls();
         CreateAudioCtrls();
@@ -56,6 +59,9 @@ public override void Update(FrameTime frameTime)
     {
         var currentTime = GetFormattedTime(this.audio.Position.Minutes, this.audio.Position.Seconds);
 
+        var lblAudioType = this.grpInfoCtrls.GetControl<ILabel>(this.lblAudioTypeName);
+        lblAudioType.Text = $"Audio Type: {this.currentAudioType}";
+
         var lblLengthCtrl = this.grpInfoCtrls.GetControl<ILabel>(this.lblLengthName);
         lblLengthCtrl.Text = $"Audio Length: {GetFormattedTime(this.audio.Length.Minutes, this.audio.Length.Seconds)}";
 
@@ -69,6 +75,9 @@ public override void Update(FrameTime frameTime)
         base.Update(frameTime);
     }
 
+    /// <summary>
+    /// <inheritdoc cref="IDrawable.Render"/>
+    /// </summary>
     public override void Render()
     {
         this.backgroundManager?.Render();
@@ -130,41 +139,73 @@ private void CreateInfoCtrls()
         var lblDesc = this.ctrlFactory.CreateLabel();
         lblDesc.Name = nameof(lblDesc);
         lblDesc.Text = "Use the audio controls to manipulate the audio.";
+        lblDesc.Text += $"\n---------------------------------------------------------";
 
-        var lblState = this.ctrlFactory.CreateLabel();
-        lblState.Name = nameof(lblState);
-        this.lblStateName = nameof(lblState);
-        lblState.Text = "Audio State: Stopped";
+        var lblRepeats = this.ctrlFactory.CreateLabel();
+        lblRepeats.Name = nameof(lblRepeats);
+        this.lblRepeatsName = nameof(lblRepeats);
+        lblRepeats.Text = "Repeat Enabled: no";
 
-        var lblCurrentTime = this.ctrlFactory.CreateLabel();
-        this.lblCurrentTimeName = nameof(lblCurrentTime);
-        lblCurrentTime.Name = nameof(lblCurrentTime);
-        lblCurrentTime.Text = "Current Time: 00:00";
+        var lblAudioType = this.ctrlFactory.CreateLabel();
+        lblAudioType.Name = nameof(lblAudioType);
+        this.lblAudioTypeName = nameof(lblAudioType);
+        lblAudioType.Text = $"Audio Type: {this.currentAudioType ?? string.Empty}";
 
         var lblLength = this.ctrlFactory.CreateLabel();
         this.lblLengthName = nameof(lblLength);
         lblLength.Name = nameof(lblLength);
         lblLength.Text = "Audio Length: 00:00";
 
-        var lblRepeats = this.ctrlFactory.CreateLabel();
-        lblRepeats.Name = nameof(lblRepeats);
-        this.lblRepeatsName = nameof(lblRepeats);
-        lblRepeats.Text = "Repeat Enabled: no";
+        var lblCurrentTime = this.ctrlFactory.CreateLabel();
+        this.lblCurrentTimeName = nameof(lblCurrentTime);
+        lblCurrentTime.Name = nameof(lblCurrentTime);
+        lblCurrentTime.Text = "Current Time: 00:00";
+
+        var lblState = this.ctrlFactory.CreateLabel();
+        lblState.Name = nameof(lblState);
+        this.lblStateName = nameof(lblState);
+        lblState.Text = "Audio State: Stopped";
 
         this.grpInfoCtrls = this.ctrlFactory.CreateControlGroup();
         this.grpInfoCtrls.Title = "Audio Info";
         this.grpInfoCtrls.AutoSizeToFitContent = true;
         this.grpInfoCtrls.TitleBarVisible = false;
 
+        this.grpInfoCtrls.Add(lblDesc);
         this.grpInfoCtrls.Add(lblRepeats);
+        this.grpInfoCtrls.Add(lblAudioType);
         this.grpInfoCtrls.Add(lblLength);
         this.grpInfoCtrls.Add(lblCurrentTime);
         this.grpInfoCtrls.Add(lblState);
-        this.grpInfoCtrls.Add(lblDesc);
     }
 
     private void CreateAudioCtrls()
     {
+        var audioList = this.ctrlFactory.CreateComboBox();
+        audioList.Label = "Audio File";
+
+        audioList.Items.Add("Ridley Draygon Theme (OGG)");
+        audioList.Items.Add("Ridleys Hideout (MP3)");
+        audioList.Items.Add("Mother Brain Final Battle (OGG)");
+        audioList.SelectedItemIndexChanged += (_, i) =>
+        {
+            this.audio.Stop();
+            this.loader.Unload(this.audio);
+
+            var chosenItem = audioList.Items[i];
+            var audioName = chosenItem switch
+            {
+                "Ridley Draygon Theme (OGG)" => "ridley-draygon-theme.ogg",
+                "Ridleys Hideout (MP3)" => "ridleys-hideout.mp3",
+                "Mother Brain Final Battle (OGG)" => "mother-brain-final-battle.ogg",
+                _ => throw new ArgumentException($"The audio item '{chosenItem}' is not supported."),
+            };
+
+            this.audio = this.loader.Load(audioName, AudioBuffer.Stream);
+
+            this.currentAudioType = Path.GetExtension(this.audio.FilePath).ToUpper().TrimStart('.');
+        };
+
         var sldVolume = this.ctrlFactory.CreateSlider();
         sldVolume.Name = nameof(sldVolume);
         sldVolume.Min = 0f;
@@ -252,6 +293,7 @@ private void CreateAudioCtrls()
         this.grpAudioCtrls.AutoSizeToFitContent = true;
         this.grpAudioCtrls.TitleBarVisible = false;
 
+        this.grpAudioCtrls.Add(audioList);
         this.grpAudioCtrls.Add(sldVolume);
         this.grpAudioCtrls.Add(this.sldPosition);
         this.grpAudioCtrls.Add(btnRewind);

Testing/VelaptorTesting/Scenes/KeyboardScene.cs

@@ -55,8 +55,8 @@ public override void LoadContent()
         this.grpControls.AutoSizeToFitContent = true;
         this.grpControls.TitleBarVisible = false;
 
-        this.grpControls.Add(downKeys);
         this.grpControls.Add(instructions);
+        this.grpControls.Add(downKeys);
 
         base.LoadContent();
     }

Testing/VelaptorTesting/Scenes/NonAnimatedGraphicsScene.cs

@@ -158,10 +158,10 @@ public override void Render()
 
         this.textureRenderer.Render(
             this.mainAtlas,
-            "octagon-flip",
+            "logo-flip",
             new Vector2(WindowCenter.X, WindowCenter.Y),
             0F,
-            1f,
+            2f,
             Color.White,
             this.renderEffects);
 

Testing/VelaptorTesting/Scenes/ShapeScene.cs

@@ -288,7 +288,7 @@ private void CreateCircleCtrls()
         var cmbCircleSolidColor = this.ctrlFactory.CreateComboBox();
         cmbCircleSolidColor.Name = nameof(cmbCircleSolidColor);
         this.cmbCircleSolidColorName = nameof(cmbCircleSolidColor);
-        cmbCircleSolidColor.Label = "Solid Color:";
+        cmbCircleSolidColor.Label = "Color:";
         cmbCircleSolidColor.Width = 100;
         cmbCircleSolidColor.Items =
         [
@@ -388,8 +388,8 @@ private void CreateCircleGradCtrls()
             this.grpCircleClrGradCtrls.Position = new Point(WindowPadding, WindowCenter.Y - this.grpCircleClrGradCtrls.HalfHeight);
         };
         this.grpCircleClrGradCtrls.Add(cmbCircleGradType);
-        this.grpCircleClrGradCtrls.Add(cmbCircleGradStopColor);
         this.grpCircleClrGradCtrls.Add(cmbCircleGradStartColor);
+        this.grpCircleClrGradCtrls.Add(cmbCircleGradStopColor);
     }
 
     private void CreateRectGradCtrls()
@@ -457,8 +457,8 @@ private void CreateRectGradCtrls()
             this.grpRectClrGradCtrls.Position = new Point(WindowPadding, WindowCenter.Y - this.grpRectClrGradCtrls.HalfHeight);
         };
         this.grpRectClrGradCtrls.Add(cmbRectGradType);
-        this.grpRectClrGradCtrls.Add(cmbRectGradStopColor);
         this.grpRectClrGradCtrls.Add(cmbRectGradStartColor);
+        this.grpRectClrGradCtrls.Add(cmbRectGradStopColor);
     }
 
     private void CreateRectCtrls()
@@ -531,7 +531,7 @@ private void CreateRectCtrls()
         var cmbRectSolidColor = this.ctrlFactory.CreateComboBox();
         cmbRectSolidColor.Name = nameof(cmbRectSolidColor);
         this.cmbRectSolidColorName = nameof(cmbRectSolidColor);
-        cmbRectSolidColor.Label = "Solid Color:";
+        cmbRectSolidColor.Label = "Color:";
         cmbRectSolidColor.Width = 100;
         cmbRectSolidColor.Items =
         [

Testing/VelaptorTesting/VelaptorTesting.csproj

@@ -47,12 +47,18 @@
     <None Update="Content\Graphics\layered-rendering-background.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Content\Audio\test-song.ogg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="Content\Atlas\Main-Atlas.pdn">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Content\Audio\mother-brain-final-battle.ogg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Content\Audio\ridley-draygon-theme.ogg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Content\Audio\ridleys-hideout.mp3">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <ItemGroup>

Velaptor/OpenGL/GLWindow.cs

@@ -420,11 +420,8 @@ private void Init(uint width, uint height)
         this.glInputContext.Mice[0].MouseMove += GLMouseMove_MouseMove;
         this.glInputContext.Mice[0].Scroll += GLMouseInput_MouseScroll;
 
-        // Manually invoke the resize to set the viewport
-        // This will make sure that no strange issues occur during initialization.
-        // One strange issue was without this line and a window size of exactly 1280 x 720,
-        // all rendering would not occur.  This prevents this issue from occurring.
-        GLWindow_Resize(new Vector2D<int>(1280, 720));
+        // Manually invoke the resize to update the rest of the system such as the viewport.
+        GLWindow_Resize(new Vector2D<int>((int)width, (int)height));
 
         this.appService.Init();
     }