diff --git a/src/BizHawk.Bizware.Test/BizHawk.Bizware.Test.csproj b/src/BizHawk.Bizware.Test/BizHawk.Bizware.Test.csproj
index 618552def8..c1dbf06a11 100644
--- a/src/BizHawk.Bizware.Test/BizHawk.Bizware.Test.csproj
+++ b/src/BizHawk.Bizware.Test/BizHawk.Bizware.Test.csproj
@@ -5,7 +5,6 @@
$(DefineConstants);EXE_PROJECT
- disable
$(ProjectDir)bin
diff --git a/src/BizHawk.Bizware.Test/Program.cs b/src/BizHawk.Bizware.Test/Program.cs
index b442789b6a..24453a4a61 100644
--- a/src/BizHawk.Bizware.Test/Program.cs
+++ b/src/BizHawk.Bizware.Test/Program.cs
@@ -1,8 +1,9 @@
using System;
-using System.Collections.Generic;
using System.Drawing;
using System.IO;
+using System.Linq;
using System.Reflection;
+using System.Threading;
using System.Windows.Forms;
using BizHawk.Bizware.BizwareGL;
@@ -11,7 +12,7 @@ using BizHawk.Client.EmuHawk;
namespace BizHawk.Bizware.Test
{
- class Program
+ public static class Program
{
static Program()
{
@@ -21,7 +22,7 @@ namespace BizHawk.Bizware.Test
{
var firstAsm = Array.Find(AppDomain.CurrentDomain.GetAssemblies(), asm => asm.FullName == args.Name);
if (firstAsm is not null) return firstAsm;
- var guessFilename = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "dll", $"{new AssemblyName(args.Name).Name}.dll");
+ var guessFilename = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "dll", $"{new AssemblyName(args.Name).Name}.dll");
return File.Exists(guessFilename) ? Assembly.LoadFile(guessFilename) : null;
}
};
@@ -29,42 +30,56 @@ namespace BizHawk.Bizware.Test
public static void Main() => RunTest();
+ private sealed class TestForm : Form
+ {
+ public TestForm()
+ {
+ SuspendLayout();
+ AutoScaleDimensions = new(6F, 13F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new(292, 273);
+ Name = "TestForm";
+ Text = "TestForm";
+ ResumeLayout();
+ }
+ }
+
private static void RunTest()
{
IGL igl = new IGL_TK(2, 0, false);
-
- List testArts = new List();
- ArtManager am = new ArtManager(igl);
- foreach (var name in typeof(Program).Assembly.GetManifestResourceNames())
- if (name.Contains("flame"))
- testArts.Add(am.LoadArt(typeof(Program).Assembly.GetManifestResourceStream(name)));
- var smile = am.LoadArt(typeof(Program).Assembly.GetManifestResourceStream("BizHawk.Bizware.Test.TestImages.smile.png"));
- am.Close(true);
+ ArtManager am = new(igl);
+ var testArts = typeof(Program).Assembly.GetManifestResourceNames().Where(s => s.Contains("flame"))
+ .Select(s => am.LoadArt(ReflectionCache.EmbeddedResourceStream(s.Substring(21)))) // ReflectionCache adds back the prefix
+ .ToList();
+ var smile = am.LoadArt(ReflectionCache.EmbeddedResourceStream("TestImages.smile.png"));
+ am.Close();
StringRenderer sr;
- using (var xml = typeof(Program).Assembly.GetManifestResourceStream("BizHawk.Bizware.Test.TestImages.courier16px.fnt"))
- using (var tex = typeof(Program).Assembly.GetManifestResourceStream("BizHawk.Bizware.Test.TestImages.courier16px_0.png"))
+ using (var xml = ReflectionCache.EmbeddedResourceStream("TestImages.courier16px.fnt"))
+ using (var tex = ReflectionCache.EmbeddedResourceStream("TestImages.courier16px_0.png"))
+ {
sr = new StringRenderer(igl, xml, tex);
+ }
- GuiRenderer gr = new GuiRenderer(igl);
+ GuiRenderer gr = new(igl);
- TestForm tf = new TestForm();
- RetainedGraphicsControl c = new RetainedGraphicsControl(igl);
- tf.Controls.Add(c);
- c.Dock = System.Windows.Forms.DockStyle.Fill;
- tf.FormClosing += (object sender, System.Windows.Forms.FormClosingEventArgs e) =>
- {
- tf.Controls.Remove(c);
- c.Dispose();
- c = null;
- };
+ RetainedGraphicsControl? c = new(igl) { Dock = DockStyle.Fill };
+ TestForm tf = new() { Controls = { c } };
+ tf.FormClosing += (_, _) =>
+ {
+ tf.Controls.Remove(c);
+ c.Dispose();
+ c = null;
+ };
tf.Show();
- //tf.Paint += (object sender, PaintEventArgs e) => c.Refresh();
+#if false
+ tf.Paint += (_, _) => c.Refresh();
+#endif
c.SetVsync(false);
- //create a render target
- RenderTarget rt = igl.CreateRenderTarget(60, 60);
+ // create a render target
+ var rt = igl.CreateRenderTarget(60, 60);
rt.Bind();
igl.SetClearColor(Color.Blue);
igl.Clear(ClearBufferMask.ColorBufferBit);
@@ -73,35 +88,32 @@ namespace BizHawk.Bizware.Test
gr.End();
rt.Unbind();
- Texture2d rttex2d = igl.LoadTexture(rt.Texture2d.Resolve());
+ var rttex2d = igl.LoadTexture(rt.Texture2d.Resolve());
- //test retroarch shader
- RenderTarget rt2 = igl.CreateRenderTarget(240, 240);
+ // test retroarch shader
+ var rt2 = igl.CreateRenderTarget(240, 240);
rt2.Bind();
igl.SetClearColor(Color.CornflowerBlue);
igl.Clear(ClearBufferMask.ColorBufferBit);
RetroShader shader;
- using (var stream = typeof(Program).Assembly.GetManifestResourceStream("BizHawk.Bizware.Test.TestImages.4xSoft.glsl"))
- shader = new RetroShader(igl, new System.IO.StreamReader(stream).ReadToEnd());
+ using (var stream = ReflectionCache.EmbeddedResourceStream("TestImages.4xSoft.glsl"))
+ {
+ shader = new(igl, new StreamReader(stream).ReadToEnd());
+ }
igl.SetBlendState(igl.BlendNoneCopy);
shader.Run(rttex2d, new Size(60, 60), new Size(240, 240), true);
-
- bool running = true;
- c.MouseClick += (object sender, MouseEventArgs e) =>
+ var running = true;
+ c.MouseClick += (_, args) =>
{
- if(e.Button == MouseButtons.Left)
- running ^= true;
- if (e.Button == MouseButtons.Right)
- c.Retain ^= true;
+ if (args.Button == MouseButtons.Left) running ^= true;
+ else if (args.Button == MouseButtons.Right) c.Retain ^= true;
};
- DateTime start = DateTime.Now;
- int wobble = 0;
- for (; ; )
+ var start = DateTime.Now;
+ var wobble = 0;
+ while (c is not null)
{
- if (c == null) break;
-
if (running)
{
c.Begin();
@@ -109,7 +121,7 @@ namespace BizHawk.Bizware.Test
igl.SetClearColor(Color.Red);
igl.Clear(ClearBufferMask.ColorBufferBit);
- int frame = (int)((DateTime.Now - start).TotalSeconds) % testArts.Count;
+ var frame = (int) (DateTime.Now - start).TotalSeconds % testArts.Count;
gr.Begin(c.ClientSize.Width, c.ClientSize.Height);
gr.SetBlendState(igl.BlendNormal);
@@ -127,7 +139,7 @@ namespace BizHawk.Bizware.Test
gr.Draw(rt2.Texture2d, 0, 0);
gr.SetCornerColor(0, new(1.0f, 1.0f, 1.0f, 1.0f));
gr.SetModulateColorWhite();
- gr.Modelview.Translate((float)Math.Sin(wobble / 360.0f) * 50, 0);
+ gr.Modelview.Translate((float) Math.Sin(wobble / 360.0f) * 50, 0);
gr.Modelview.Translate(100, 100);
gr.Modelview.Push();
gr.Modelview.Translate(testArts[frame].Width, 0);
@@ -142,13 +154,12 @@ namespace BizHawk.Bizware.Test
gr.End();
-
c.SwapBuffers();
c.End();
}
- System.Windows.Forms.Application.DoEvents();
- System.Threading.Thread.Sleep(0);
+ Application.DoEvents();
+ Thread.Sleep(0);
}
}
}
diff --git a/src/BizHawk.Bizware.Test/TestForm.Designer.cs b/src/BizHawk.Bizware.Test/TestForm.Designer.cs
deleted file mode 100644
index 5cf840d839..0000000000
--- a/src/BizHawk.Bizware.Test/TestForm.Designer.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-namespace BizHawk.Bizware.Test
-{
- partial class TestForm
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.SuspendLayout();
- //
- // TestForm
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(292, 273);
- this.Name = "TestForm";
- this.Text = "TestForm";
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
-
- }
-}
\ No newline at end of file
diff --git a/src/BizHawk.Bizware.Test/TestForm.cs b/src/BizHawk.Bizware.Test/TestForm.cs
deleted file mode 100644
index b5054cd7dc..0000000000
--- a/src/BizHawk.Bizware.Test/TestForm.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-namespace BizHawk.Bizware.Test
-{
- public partial class TestForm : Form
- {
- public TestForm()
- {
- InitializeComponent();
- }
- }
-}
diff --git a/src/BizHawk.Bizware.Test/TestForm.resx b/src/BizHawk.Bizware.Test/TestForm.resx
deleted file mode 100644
index 29dcb1b3a3..0000000000
--- a/src/BizHawk.Bizware.Test/TestForm.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file