diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs index 59a8cd03cd..dabf0cfce1 100644 --- a/BizHawk.Client.Common/RomLoader.cs +++ b/BizHawk.Client.Common/RomLoader.cs @@ -27,7 +27,6 @@ using BizHawk.Emulation.Cores.Computers.SinclairSpectrum; using BizHawk.Emulation.Cores.Arcades.MAME; using BizHawk.Emulation.DiscSystem; -using GPGX64 = BizHawk.Emulation.Cores.Consoles.Sega.gpgx; using BizHawk.Emulation.Cores.Consoles.Sega.Saturn; using BizHawk.Emulation.Cores.Consoles.NEC.PCFX; using BizHawk.Emulation.Cores.Computers.AmstradCPC; diff --git a/Bizware/BizHawk.Bizware.BizwareGL/BitmapBuffer.cs b/Bizware/BizHawk.Bizware.BizwareGL/BitmapBuffer.cs index 356c655a2e..8beafb5fcb 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL/BitmapBuffer.cs +++ b/Bizware/BizHawk.Bizware.BizwareGL/BitmapBuffer.cs @@ -4,11 +4,12 @@ using System; using System.Diagnostics; using System.Runtime.InteropServices; -using sd = System.Drawing; using System.Drawing.Imaging; using System.Drawing; using System.IO; +using sd = System.Drawing; + namespace BizHawk.Bizware.BizwareGL { /// diff --git a/Bizware/BizHawk.Bizware.BizwareGL/GdiPlusGuiRenderer.cs b/Bizware/BizHawk.Bizware.BizwareGL/GdiPlusGuiRenderer.cs index bd1b6fc100..18d9987558 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL/GdiPlusGuiRenderer.cs +++ b/Bizware/BizHawk.Bizware.BizwareGL/GdiPlusGuiRenderer.cs @@ -4,12 +4,13 @@ using System; using System.Diagnostics; using System.Collections; using System.Collections.Generic; -using sd = System.Drawing; using System.Drawing.Imaging; using OpenTK; using OpenTK.Graphics.OpenGL; +using sd = System.Drawing; + namespace BizHawk.Bizware.BizwareGL { public class GDIPlusGuiRenderer : IGuiRenderer diff --git a/Bizware/BizHawk.Bizware.BizwareGL/GuiRenderer.cs b/Bizware/BizHawk.Bizware.BizwareGL/GuiRenderer.cs index 124bafff37..2bd01fab0d 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL/GuiRenderer.cs +++ b/Bizware/BizHawk.Bizware.BizwareGL/GuiRenderer.cs @@ -6,11 +6,12 @@ using System; using System.Diagnostics; using System.Collections; using System.Collections.Generic; -using sd = System.Drawing; using OpenTK; using OpenTK.Graphics.OpenGL; +using sd = System.Drawing; + namespace BizHawk.Bizware.BizwareGL { /// diff --git a/Bizware/BizHawk.Bizware.BizwareGL/IGL.cs b/Bizware/BizHawk.Bizware.BizwareGL/IGL.cs index 8cc33a03c0..d7f59a55f6 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL/IGL.cs +++ b/Bizware/BizHawk.Bizware.BizwareGL/IGL.cs @@ -1,11 +1,12 @@ using System; using System.IO; using System.Drawing; -using swf=System.Windows.Forms; using OpenTK; using OpenTK.Graphics.OpenGL; +using swf = System.Windows.Forms; + namespace BizHawk.Bizware.BizwareGL { diff --git a/Bizware/BizHawk.Bizware.BizwareGL/IGL_GdiPlus.cs b/Bizware/BizHawk.Bizware.BizwareGL/IGL_GdiPlus.cs index 70dbb22d31..62b70ec935 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL/IGL_GdiPlus.cs +++ b/Bizware/BizHawk.Bizware.BizwareGL/IGL_GdiPlus.cs @@ -5,15 +5,15 @@ using System.Drawing; using System.Drawing.Imaging; using System.Windows.Forms; -using swf = System.Windows.Forms; -using sd = System.Drawing; -using sdi = System.Drawing.Imaging; - using OpenTK; using OpenTK.Graphics.OpenGL; using BizHawk.Bizware.BizwareGL; +using sd = System.Drawing; +using sdi = System.Drawing.Imaging; +using swf = System.Windows.Forms; + //TODO - maybe a layer to cache Graphics parameters (notably, filtering) ? namespace BizHawk.Bizware.BizwareGL diff --git a/Bizware/BizHawk.Bizware.BizwareGL/IGL_SlimDX9.cs b/Bizware/BizHawk.Bizware.BizwareGL/IGL_SlimDX9.cs index 9425667361..7d1b210871 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL/IGL_SlimDX9.cs +++ b/Bizware/BizHawk.Bizware.BizwareGL/IGL_SlimDX9.cs @@ -7,17 +7,17 @@ using System.Drawing; using System.Drawing.Imaging; using System.Windows.Forms; -using swf = System.Windows.Forms; -using sd = System.Drawing; -using sdi = System.Drawing.Imaging; - using BizHawk.Bizware.BizwareGL; using SlimDX.Direct3D9; -using d3d9=SlimDX.Direct3D9; using OpenTK; using OpenTK.Graphics; -using gl=OpenTK.Graphics.OpenGL; + +using d3d9 = SlimDX.Direct3D9; +using gl = OpenTK.Graphics.OpenGL; +using sd = System.Drawing; +using sdi = System.Drawing.Imaging; +using swf = System.Windows.Forms; //todo - do a better job selecting shader model? base on caps somehow? try several and catch compilation exceptions (yuck, exceptions) diff --git a/Bizware/BizHawk.Bizware.BizwareGL/IGL_TK.cs b/Bizware/BizHawk.Bizware.BizwareGL/IGL_TK.cs index 6a54bb0387..f910f39849 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL/IGL_TK.cs +++ b/Bizware/BizHawk.Bizware.BizwareGL/IGL_TK.cs @@ -14,16 +14,16 @@ using System.Reflection; using System.Threading; using System.IO; using System.Collections.Generic; -using sd = System.Drawing; -using sdi = System.Drawing.Imaging; -using swf=System.Windows.Forms; using BizHawk.Bizware.BizwareGL; using OpenTK; using OpenTK.Graphics; using OpenTK.Graphics.OpenGL; -using otkg = OpenTK.Graphics; + +using sd = System.Drawing; +using sdi = System.Drawing.Imaging; +using swf = System.Windows.Forms; namespace BizHawk.Bizware.BizwareGL { diff --git a/Bizware/BizHawk.Bizware.BizwareGL/StringRenderer.cs b/Bizware/BizHawk.Bizware.BizwareGL/StringRenderer.cs index 11e4d360b2..9f2e75769e 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL/StringRenderer.cs +++ b/Bizware/BizHawk.Bizware.BizwareGL/StringRenderer.cs @@ -2,10 +2,11 @@ //http://cyotek.com/blog/angelcode-bitmap-font-parsing-using-csharp using System; -using sd=System.Drawing; using System.Collections.Generic; using System.IO; +using sd=System.Drawing; + namespace BizHawk.Bizware.BizwareGL { public class StringRenderer : IDisposable diff --git a/Common.ruleset b/Common.ruleset index 361819e4a1..cfa5cc9354 100644 --- a/Common.ruleset +++ b/Common.ruleset @@ -169,9 +169,6 @@ - - -