ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crusty old project that couldnt possibly be working now compiles and still doesnt work

This commit is contained in:
zeromus 2016-02-22 07:17:32 -06:00
parent 7abac10164
commit f96110e09e
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Client.MultiHawk/GlobalWin.cs
View File

@ -8,14 +8,14 @@ namespace BizHawk.Client.MultiHawk
{ {
public static Mainform MainForm; public static Mainform MainForm;
//public static ToolManager Tools; //public static ToolManager Tools;
//public static IGL GL; public static IGL GL;
//public static Bizware.BizwareGL.Drivers.OpenTK.IGL_TK IGL_GL; public static Bizware.BizwareGL.Drivers.OpenTK.IGL_TK IGL_GL;
//public static GLManager.ContextRef CR_GL; public static BizHawk.Client.EmuHawk.GLManager.ContextRef CR_GL;
//public static Sound Sound; //public static Sound Sound;
//public static PresentationPanel PresentationPanel; //public static PresentationPanel PresentationPanel;
//public static OSDManager OSD = new OSDManager(); //public static OSDManager OSD = new OSDManager();
//public static DisplayManager DisplayManager; //public static DisplayManager DisplayManager;
//public static GLManager GLManager; public static BizHawk.Client.EmuHawk.GLManager GLManager;
//input state which has been destined for game controller inputs are coalesced here //input state which has been destined for game controller inputs are coalesced here
//public static ControllerInputCoalescer ControllerInputCoalescer = new ControllerInputCoalescer(); //public static ControllerInputCoalescer ControllerInputCoalescer = new ControllerInputCoalescer();

11
BizHawk.Client.MultiHawk/Mainform.cs
View File

@ -33,7 +33,7 @@ namespace BizHawk.Client.MultiHawk
public Mainform(string[] args) public Mainform(string[] args)
{ {
GLManager.CreateInstance(); GLManager.CreateInstance(GlobalWin.IGL_GL);
InitializeComponent(); InitializeComponent();
_throttle = new BizHawk.Client.EmuHawk.Throttle(); _throttle = new BizHawk.Client.EmuHawk.Throttle();
@ -319,15 +319,16 @@ namespace BizHawk.Client.MultiHawk
Text = Path.GetFileNameWithoutExtension(StripArchivePath(path)), Text = Path.GetFileNameWithoutExtension(StripArchivePath(path)),
Emulator = loader.LoadedEmulator, Emulator = loader.LoadedEmulator,
GL = new Bizware.BizwareGL.Drivers.OpenTK.IGL_TK(), GL = new Bizware.BizwareGL.Drivers.OpenTK.IGL_TK(2,0,false),
GLManager = GLManager.Instance, GLManager = GLManager.Instance,
Game = loader.Game, Game = loader.Game,
CurrentRomPath = loader.CanonicalFullPath CurrentRomPath = loader.CanonicalFullPath
}; };
nextComm.RequestGLContext = () => ew.GLManager.CreateGLContext(); nextComm.ReleaseGLContext = (o) => GlobalWin.GLManager.ReleaseGLContext(o);
nextComm.ActivateGLContext = (gl) => ew.GLManager.Activate((GLManager.ContextRef)ew.GL); nextComm.RequestGLContext = (major, minor, forward) => GlobalWin.GLManager.CreateGLContext(major, minor, forward);
nextComm.DeactivateGLContext = () => ew.GLManager.Deactivate(); nextComm.ActivateGLContext = (gl) => GlobalWin.GLManager.Activate((GLManager.ContextRef)gl);
nextComm.DeactivateGLContext = () => GlobalWin.GLManager.Deactivate();
ew.CoreComm = nextComm; ew.CoreComm = nextComm;
ew.Init(); ew.Init();