From 68151f3433e9fe3f6a26e6eeb78ef396dc66c657 Mon Sep 17 00:00:00 2001 From: sin365 <353374337@qq.com> Date: Mon, 31 Mar 2025 14:06:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3ColecoVision=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E8=A7=A3=E5=86=B3GameGear=E5=88=86=E8=BE=A8?= =?UTF-8?q?=E7=8E=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Emulation/Machines/ColecoVision.cs | 6 +- .../Essgee.Unity/Emulation/Video/SegaGGVDP.cs | 14 +- .../Metadata/GameMetadataHandler.cs | 11 +- .../Utilities/XInput/Controller.cs | 178 ------------------ .../Utilities/XInput/Controller.cs.meta | 2 - .../Utilities/XInput/ControllerManager.cs | 30 --- .../XInput/ControllerManager.cs.meta | 2 - .../Utilities/XInput/ControllerState.cs | 116 ------------ .../Utilities/XInput/ControllerState.cs.meta | 2 - .../Utilities/XInput/NativeMethods.cs | 25 --- .../Utilities/XInput/NativeMethods.cs.meta | 2 - .../Utilities/XInput/XInputCapabilities.cs | 47 ----- .../XInput/XInputCapabilities.cs.meta | 2 - .../Utilities/XInput/XInputGamepad.cs | 51 ----- .../Utilities/XInput/XInputGamepad.cs.meta | 2 - .../Utilities/XInput/XInputState.cs | 14 -- .../Utilities/XInput/XInputState.cs.meta | 2 - .../Utilities/XInput/XInputVibration.cs | 14 -- .../Utilities/XInput/XInputVibration.cs.meta | 2 - .../Essgee.Unity/Dat/Bootstrap.meta} | 2 +- ...BIOS] ColecoVision (USA, Europe).col.bytes | Bin 0 -> 8192 bytes ... ColecoVision (USA, Europe).col.bytes.meta | 7 + Assets/Scripts/UEssgee.cs | 10 +- .../UEssgeeInterface/UEGVideoPlayer.cs | 5 + 24 files changed, 35 insertions(+), 511 deletions(-) delete mode 100644 Assets/Plugins/Essgee.Unity/Utilities/XInput/Controller.cs delete mode 100644 Assets/Plugins/Essgee.Unity/Utilities/XInput/Controller.cs.meta delete mode 100644 Assets/Plugins/Essgee.Unity/Utilities/XInput/ControllerManager.cs delete mode 100644 Assets/Plugins/Essgee.Unity/Utilities/XInput/ControllerManager.cs.meta delete mode 100644 Assets/Plugins/Essgee.Unity/Utilities/XInput/ControllerState.cs delete mode 100644 Assets/Plugins/Essgee.Unity/Utilities/XInput/ControllerState.cs.meta delete mode 100644 Assets/Plugins/Essgee.Unity/Utilities/XInput/NativeMethods.cs delete mode 100644 Assets/Plugins/Essgee.Unity/Utilities/XInput/NativeMethods.cs.meta delete mode 100644 Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputCapabilities.cs delete mode 100644 Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputCapabilities.cs.meta delete mode 100644 Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputGamepad.cs delete mode 100644 Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputGamepad.cs.meta delete mode 100644 Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputState.cs delete mode 100644 Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputState.cs.meta delete mode 100644 Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputVibration.cs delete mode 100644 Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputVibration.cs.meta rename Assets/{Plugins/Essgee.Unity/Utilities/XInput.meta => Resources/Essgee.Unity/Dat/Bootstrap.meta} (77%) create mode 100644 Assets/Resources/Essgee.Unity/Dat/Bootstrap/[BIOS] ColecoVision (USA, Europe).col.bytes create mode 100644 Assets/Resources/Essgee.Unity/Dat/Bootstrap/[BIOS] ColecoVision (USA, Europe).col.bytes.meta diff --git a/Assets/Plugins/Essgee.Unity/Emulation/Machines/ColecoVision.cs b/Assets/Plugins/Essgee.Unity/Emulation/Machines/ColecoVision.cs index fab8dd1..b700e3b 100644 --- a/Assets/Plugins/Essgee.Unity/Emulation/Machines/ColecoVision.cs +++ b/Assets/Plugins/Essgee.Unity/Emulation/Machines/ColecoVision.cs @@ -5,6 +5,7 @@ using Essgee.Emulation.Configuration; using Essgee.Emulation.CPU; using Essgee.Emulation.Video; using Essgee.EventArguments; +using Essgee.Metadata; using Essgee.Utilities; using System; using System.Collections.Generic; @@ -182,7 +183,10 @@ namespace Essgee.Emulation.Machines private void LoadBios() { - var (type, bootstrapRomData) = CartridgeLoader.Load(configuration.BiosRom, "ColecoVision BIOS"); + + //var (type, bootstrapRomData) = CartridgeLoader.Load(configuration.BiosRom, "ColecoVision BIOS"); + //直接加载BootStrap + GameMetadataHandler.instance.gameMetaReources.GetDatBytes("Bootstrap/[BIOS] ColecoVision (USA, Europe).col", out byte[] bootstrapRomData); bios = new ColecoCartridge(bootstrapRomData.Length, 0); bios.LoadRom(bootstrapRomData); } diff --git a/Assets/Plugins/Essgee.Unity/Emulation/Video/SegaGGVDP.cs b/Assets/Plugins/Essgee.Unity/Emulation/Video/SegaGGVDP.cs index 3986fab..d3b08b0 100644 --- a/Assets/Plugins/Essgee.Unity/Emulation/Video/SegaGGVDP.cs +++ b/Assets/Plugins/Essgee.Unity/Emulation/Video/SegaGGVDP.cs @@ -51,19 +51,11 @@ namespace Essgee.Emulation.Video //GCHandle? lasyRenderHandle; protected override void PrepareRenderScreen() { - //// 固定数组，防止垃圾回收器移动它 - //var bitmapcolorRect_handle = GCHandle.Alloc(outputFramebuffer.Clone() as byte[], GCHandleType.Pinned); - //// 获取数组的指针 - //IntPtr mFrameDataPtr = bitmapcolorRect_handle.AddrOfPinnedObject(); - - var eventArgs = RenderScreenEventArgs.Create(numVisiblePixels, numVisibleScanlines, outputFramebuffer_Ptr); + //var eventArgs = RenderScreenEventArgs.Create(numVisiblePixels, numVisibleScanlines, outputFramebuffer_Ptr); + //这里要改成viewport的中间区域的分辨率 + var eventArgs = RenderScreenEventArgs.Create(Viewport.Width, Viewport.Height, outputFramebuffer_Ptr); OnRenderScreen(eventArgs); eventArgs.Release(); - //if (lasyRenderHandle != null) - // lasyRenderHandle.Value.Free(); - //lasyRenderHandle = bitmapcolorRect_handle; - - //OnRenderScreen(new RenderScreenEventArgs(Viewport.Width, Viewport.Height, outputFramebuffer.Clone() as byte[])); } private bool ModifyAndVerifyCoordinates(ref int x, ref int y) diff --git a/Assets/Plugins/Essgee.Unity/Metadata/GameMetadataHandler.cs b/Assets/Plugins/Essgee.Unity/Metadata/GameMetadataHandler.cs index 995d081..75a630d 100644 --- a/Assets/Plugins/Essgee.Unity/Metadata/GameMetadataHandler.cs +++ b/Assets/Plugins/Essgee.Unity/Metadata/GameMetadataHandler.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Xml.Serialization; -using UnityEngine.Timeline; namespace Essgee.Metadata { @@ -20,10 +19,11 @@ namespace Essgee.Metadata public class GameMetadataHandler { + public static GameMetadataHandler instance; //static string datDirectoryPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Assets", "No-Intro"); //static string metadataDatabaseFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Assets", "MetadataDatabase.json"); - IGameMetaReources gameMetaReources; + public IGameMetaReources gameMetaReources; //readonly Dictionary datFiles; readonly List cartMetadataDatabase; @@ -32,6 +32,7 @@ namespace Essgee.Metadata public GameMetadataHandler(IGameMetaReources metaresources) { + instance = this; gameMetaReources = metaresources; //if (!gameMetaReources.GetCartMetadataDatabase(out string loadedData)) @@ -357,6 +358,12 @@ namespace Essgee.Metadata ////EssgeeLogger.EnqueueMessageSuccess($"Metadata initialized; {NumKnownGames} game(s) known across {NumKnownSystems} system(s)."); } + ~GameMetadataHandler() + { + if(instance == this) + instance = null; + } + public GameMetadata GetGameMetadata(string datFilename, string romFilename, uint romCrc32, int romSize) { /* Sanity checks */ diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput/Controller.cs b/Assets/Plugins/Essgee.Unity/Utilities/XInput/Controller.cs deleted file mode 100644 index be0ade9..0000000 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput/Controller.cs +++ /dev/null @@ -1,178 +0,0 @@ -using System; - -namespace Essgee.Utilities.XInput -{ - public class Controller - { - XInputState inputStatesCurrent, inputStatesPrev; - bool timedVibrationEnabled; - DateTime vibrationStopTime; - - public bool IsConnected { get; private set; } - public int UserIndex { get; private set; } - - public Controller(int index) - { - inputStatesCurrent = inputStatesPrev = new XInputState(); - timedVibrationEnabled = false; - vibrationStopTime = DateTime.Now; - - IsConnected = false; - UserIndex = index; - } - - public void Update() - { - XInputState newInputState = new XInputState(); - Errors result = (Errors)NativeMethods.GetState(UserIndex, ref newInputState); - if (result == Errors.Success) - { - IsConnected = true; - inputStatesPrev = inputStatesCurrent; - inputStatesCurrent = newInputState; - - if ((inputStatesCurrent.Gamepad.sThumbLX < XInputGamepad.LeftThumbDeadzone && inputStatesCurrent.Gamepad.sThumbLX > -XInputGamepad.LeftThumbDeadzone) && - (inputStatesCurrent.Gamepad.sThumbLY < XInputGamepad.LeftThumbDeadzone && inputStatesCurrent.Gamepad.sThumbLY > -XInputGamepad.LeftThumbDeadzone)) - { - inputStatesCurrent.Gamepad.sThumbLX = inputStatesCurrent.Gamepad.sThumbLY = 0; - } - - if ((inputStatesCurrent.Gamepad.sThumbRX < XInputGamepad.RightThumbDeadzone && inputStatesCurrent.Gamepad.sThumbRX > -XInputGamepad.RightThumbDeadzone) && - (inputStatesCurrent.Gamepad.sThumbRY < XInputGamepad.RightThumbDeadzone && inputStatesCurrent.Gamepad.sThumbRY > -XInputGamepad.RightThumbDeadzone)) - { - inputStatesCurrent.Gamepad.sThumbRX = inputStatesCurrent.Gamepad.sThumbRY = 0; - } - - if (inputStatesCurrent.Gamepad.bLeftTrigger < XInputGamepad.TriggerThreshold) inputStatesCurrent.Gamepad.bLeftTrigger = 0; - if (inputStatesCurrent.Gamepad.bRightTrigger < XInputGamepad.TriggerThreshold) inputStatesCurrent.Gamepad.bRightTrigger = 0; - - if (timedVibrationEnabled && DateTime.Now >= vibrationStopTime) - { - timedVibrationEnabled = false; - Vibrate(0.0f, 0.0f); - } - } - else if (result == Errors.DeviceNotConnected) - { - IsConnected = false; - } - else - throw new Exception(string.Format("Error code {0}", (int)result)); - } - - //public ControllerState GetControllerState() - //{ - // return new ControllerState - // { - // Buttons = inputStatesCurrent.Gamepad.Buttons, - // LeftThumbstick = new ThumbstickPosition(inputStatesCurrent.Gamepad.sThumbLX / 32768.0f, inputStatesCurrent.Gamepad.sThumbLY / 32768.0f), - // RightThumbstick = new ThumbstickPosition(inputStatesCurrent.Gamepad.sThumbRX / 32768.0f, inputStatesCurrent.Gamepad.sThumbRY / 32768.0f), - // LeftTrigger = (inputStatesCurrent.Gamepad.bLeftTrigger / 255.0f), - // RightTrigger = (inputStatesCurrent.Gamepad.bRightTrigger / 255.0f) - // }; - //} - - public bool IsDPadUpPressed() - { - return inputStatesCurrent.Gamepad.Buttons.HasFlag(Buttons.DPadUp); - } - - public bool IsDPadDownPressed() - { - return inputStatesCurrent.Gamepad.Buttons.HasFlag(Buttons.DPadDown); - } - - public bool IsDPadLeftPressed() - { - return inputStatesCurrent.Gamepad.Buttons.HasFlag(Buttons.DPadLeft); - } - - public bool IsDPadRightPressed() - { - return inputStatesCurrent.Gamepad.Buttons.HasFlag(Buttons.DPadRight); - } - - public bool IsStartPressed() - { - return inputStatesCurrent.Gamepad.Buttons.HasFlag(Buttons.Start); - } - - public bool IsBackPressed() - { - return inputStatesCurrent.Gamepad.Buttons.HasFlag(Buttons.Back); - } - - public bool IsLeftThumbPressed() - { - return inputStatesCurrent.Gamepad.Buttons.HasFlag(Buttons.LeftThumb); - } - - public bool IsRightThumbPressed() - { - return inputStatesCurrent.Gamepad.Buttons.HasFlag(Buttons.RightThumb); - } - - public bool IsLeftShoulderPressed() - { - return inputStatesCurrent.Gamepad.Buttons.HasFlag(Buttons.LeftShoulder); - } - - public bool IsRightShoulderPressed() - { - return inputStatesCurrent.Gamepad.Buttons.HasFlag(Buttons.RightShoulder); - } - - public bool IsAPressed() - { - return inputStatesCurrent.Gamepad.Buttons.HasFlag(Buttons.A); - } - - public bool IsBPressed() - { - return inputStatesCurrent.Gamepad.Buttons.HasFlag(Buttons.B); - } - - public bool IsXPressed() - { - return inputStatesCurrent.Gamepad.Buttons.HasFlag(Buttons.X); - } - - public bool IsYPressed() - { - return inputStatesCurrent.Gamepad.Buttons.HasFlag(Buttons.Y); - } - - public void Vibrate(float leftMotor, float rightMotor) - { - XInputVibration vibrationState = new XInputVibration(); - vibrationState.wLeftMotorSpeed = (ushort)(leftMotor * 65535.0f); - vibrationState.wRightMotorSpeed = (ushort)(rightMotor * 65535.0f); - NativeMethods.SetState(UserIndex, ref vibrationState); - } - - public void Vibrate(float leftMotor, float rightMotor, TimeSpan duration) - { - Vibrate(leftMotor, rightMotor); - - vibrationStopTime = DateTime.Now.Add(duration); - timedVibrationEnabled = true; - } - } - - public class ThumbstickPosition - { - public float X { get; private set; } - public float Y { get; private set; } - - public ThumbstickPosition(float x, float y) - { - X = x; - Y = y; - } - - public override string ToString() - { - return string.Format(System.Globalization.CultureInfo.InvariantCulture, "({0}, {1})", X, Y); - } - } -} diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput/Controller.cs.meta b/Assets/Plugins/Essgee.Unity/Utilities/XInput/Controller.cs.meta deleted file mode 100644 index 146f2f1..0000000 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput/Controller.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 208c78465e149914e92390762f768a04 \ No newline at end of file diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput/ControllerManager.cs b/Assets/Plugins/Essgee.Unity/Utilities/XInput/ControllerManager.cs deleted file mode 100644 index ea562e9..0000000 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput/ControllerManager.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; - -namespace Essgee.Utilities.XInput -{ - public static class ControllerManager - { - const int maxControllers = 4; - - static Controller[] controllers; - - static ControllerManager() - { - controllers = new Controller[maxControllers]; - for (int i = 0; i < controllers.Length; i++) - controllers[i] = new Controller(i); - } - - public static Controller GetController(int index) - { - if (index < 0 || index >= maxControllers) throw new Exception("Controller index out of range"); - return controllers[index]; - } - - public static void Update() - { - for (int i = 0; i < controllers.Length; i++) - controllers[i].Update(); - } - } -} diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput/ControllerManager.cs.meta b/Assets/Plugins/Essgee.Unity/Utilities/XInput/ControllerManager.cs.meta deleted file mode 100644 index e0cc01e..0000000 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput/ControllerManager.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: d3b109e035af2d0488fee85624c9a90b \ No newline at end of file diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput/ControllerState.cs b/Assets/Plugins/Essgee.Unity/Utilities/XInput/ControllerState.cs deleted file mode 100644 index 57c2cba..0000000 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput/ControllerState.cs +++ /dev/null @@ -1,116 +0,0 @@ -//namespace Essgee.Utilities.XInput -//{ -// public class ControllerState -// { -// public Buttons Buttons { get; set; } -// public ThumbstickPosition LeftThumbstick { get; set; } -// public ThumbstickPosition RightThumbstick { get; set; } -// public float LeftTrigger { get; set; } -// public float RightTrigger { get; set; } - -// public bool IsConnected { get; set; } -// public int UserIndex { get; set; } - -// public ControllerState() -// { -// Buttons = Buttons.None; -// LeftThumbstick = new ThumbstickPosition(0.0f, 0.0f); -// RightThumbstick = new ThumbstickPosition(0.0f, 0.0f); -// LeftTrigger = 0.0f; -// RightTrigger = 0.0f; - -// IsConnected = false; -// UserIndex = -1; -// } - -// public bool IsAnyUpDirectionPressed() -// { -// return IsDPadUpPressed() || LeftThumbstick.Y > 0.5f; -// } - -// public bool IsAnyDownDirectionPressed() -// { -// return IsDPadDownPressed() || LeftThumbstick.Y < -0.5f; -// } - -// public bool IsAnyLeftDirectionPressed() -// { -// return IsDPadLeftPressed() || LeftThumbstick.X < -0.5f; -// } - -// public bool IsAnyRightDirectionPressed() -// { -// return IsDPadRightPressed() || LeftThumbstick.X > 0.5f; -// } - -// public bool IsDPadUpPressed() -// { -// return Buttons.HasFlag(Buttons.DPadUp); -// } - -// public bool IsDPadDownPressed() -// { -// return Buttons.HasFlag(Buttons.DPadDown); -// } - -// public bool IsDPadLeftPressed() -// { -// return Buttons.HasFlag(Buttons.DPadLeft); -// } - -// public bool IsDPadRightPressed() -// { -// return Buttons.HasFlag(Buttons.DPadRight); -// } - -// public bool IsStartPressed() -// { -// return Buttons.HasFlag(Buttons.Start); -// } - -// public bool IsBackPressed() -// { -// return Buttons.HasFlag(Buttons.Back); -// } - -// public bool IsLeftThumbPressed() -// { -// return Buttons.HasFlag(Buttons.LeftThumb); -// } - -// public bool IsRightThumbPressed() -// { -// return Buttons.HasFlag(Buttons.RightThumb); -// } - -// public bool IsLeftShoulderPressed() -// { -// return Buttons.HasFlag(Buttons.LeftShoulder); -// } - -// public bool IsRightShoulderPressed() -// { -// return Buttons.HasFlag(Buttons.RightShoulder); -// } - -// public bool IsAPressed() -// { -// return Buttons.HasFlag(Buttons.A); -// } - -// public bool IsBPressed() -// { -// return Buttons.HasFlag(Buttons.B); -// } - -// public bool IsXPressed() -// { -// return Buttons.HasFlag(Buttons.X); -// } - -// public bool IsYPressed() -// { -// return Buttons.HasFlag(Buttons.Y); -// } -// } -//} diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput/ControllerState.cs.meta b/Assets/Plugins/Essgee.Unity/Utilities/XInput/ControllerState.cs.meta deleted file mode 100644 index da9a3ae..0000000 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput/ControllerState.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 62cf2ece5ee5c44458ac5646bb2f8af8 \ No newline at end of file diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput/NativeMethods.cs b/Assets/Plugins/Essgee.Unity/Utilities/XInput/NativeMethods.cs deleted file mode 100644 index c7dc807..0000000 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput/NativeMethods.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Runtime.InteropServices; - -namespace Essgee.Utilities.XInput -{ - static class NativeMethods - { - const string dllName = "xinput9_1_0.dll"; - - public const int FlagGamepad = 0x00000001; - - [DllImport(dllName, EntryPoint = "XInputGetState")] - public static extern int GetState(int dwUserIndex, ref XInputState pState); - [DllImport(dllName, EntryPoint = "XInputSetState")] - public static extern int SetState(int dwUserIndex, ref XInputVibration pVibration); - [DllImport(dllName, EntryPoint = "XInputGetCapabilities")] - public static extern int GetCapabilities(int dwUserIndex, int dwFlags, ref XInputCapabilities pCapabilities); - } - - public enum Errors - { - Success = 0x00000000, - BadArguments = 0x000000A0, - DeviceNotConnected = 0x0000048F - } -} diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput/NativeMethods.cs.meta b/Assets/Plugins/Essgee.Unity/Utilities/XInput/NativeMethods.cs.meta deleted file mode 100644 index 3f0a5cf..0000000 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput/NativeMethods.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 2f4639905082c50448ca8a1477b55057 \ No newline at end of file diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputCapabilities.cs b/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputCapabilities.cs deleted file mode 100644 index 08da7a8..0000000 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputCapabilities.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using System.Runtime.InteropServices; - -namespace Essgee.Utilities.XInput -{ - /* https://msdn.microsoft.com/en-us/library/windows/desktop/microsoft.directx_sdk.reference.xinput_capabilities%28v=vs.85%29.aspx */ - [StructLayout(LayoutKind.Explicit)] - public struct XInputCapabilities - { - [FieldOffset(0)] - byte type; - [FieldOffset(1)] - byte subType; - [FieldOffset(2)] - ushort flags; - [FieldOffset(4)] - public XInputGamepad Gamepad; - [FieldOffset(16)] - public XInputVibration Vibration; - - public DeviceType Type { get { return (DeviceType)type; } } - public DeviceSubType SubType { get { return (DeviceSubType)subType; } } - public DeviceFlags Flags { get { return (DeviceFlags)flags; } } - } - - public enum DeviceType - { - Gamepad = 0x01 - } - - public enum DeviceSubType - { - Gamepad = 0x01, - Wheel = 0x02, - ArcadeStick = 0x03, - FlightStick = 0x04, - DancePad = 0x05, - Guitar = 0x06, - DrumKit = 0x08 - } - - [Flags] - public enum DeviceFlags - { - VoiceSupported = 0x0004 - } -} diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputCapabilities.cs.meta b/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputCapabilities.cs.meta deleted file mode 100644 index c916d61..0000000 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputCapabilities.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 400677b412126194caf14f5d627b34a2 \ No newline at end of file diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputGamepad.cs b/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputGamepad.cs deleted file mode 100644 index 4ebf55b..0000000 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputGamepad.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Runtime.InteropServices; - -namespace Essgee.Utilities.XInput -{ - /* https://msdn.microsoft.com/en-us/library/windows/desktop/microsoft.directx_sdk.reference.xinput_gamepad%28v=vs.85%29.aspx */ - [StructLayout(LayoutKind.Explicit)] - public struct XInputGamepad - { - [FieldOffset(0)] - ushort wButtons; - [FieldOffset(2)] - public byte bLeftTrigger; - [FieldOffset(3)] - public byte bRightTrigger; - [FieldOffset(4)] - public short sThumbLX; - [FieldOffset(6)] - public short sThumbLY; - [FieldOffset(8)] - public short sThumbRX; - [FieldOffset(10)] - public short sThumbRY; - - public const int LeftThumbDeadzone = 7849; - public const int RightThumbDeadzone = 8689; - public const int TriggerThreshold = 30; - - public Buttons Buttons { get { return (Buttons)wButtons; } } - } - - [Flags] - public enum Buttons - { - None = 0x0000, - DPadUp = 0x0001, - DPadDown = 0x0002, - DPadLeft = 0x0004, - DPadRight = 0x0008, - Start = 0x0010, - Back = 0x0020, - LeftThumb = 0x0040, - RightThumb = 0x0080, - LeftShoulder = 0x0100, - RightShoulder = 0x0200, - A = 0x1000, - B = 0x2000, - X = 0x4000, - Y = 0x8000 - } -} diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputGamepad.cs.meta b/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputGamepad.cs.meta deleted file mode 100644 index 86f6d2b..0000000 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputGamepad.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: dee5c4630dd189049abf4d41bd4348d8 \ No newline at end of file diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputState.cs b/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputState.cs deleted file mode 100644 index fb5dd6b..0000000 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputState.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Runtime.InteropServices; - -namespace Essgee.Utilities.XInput -{ - /* https://msdn.microsoft.com/en-us/library/windows/desktop/microsoft.directx_sdk.reference.xinput_state%28v=vs.85%29.aspx */ - [StructLayout(LayoutKind.Explicit)] - public struct XInputState - { - [FieldOffset(0)] - public uint dwPacketNumber; - [FieldOffset(4)] - public XInputGamepad Gamepad; - } -} diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputState.cs.meta b/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputState.cs.meta deleted file mode 100644 index 64bb742..0000000 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputState.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: b18170cd37fc33d4ba897ffbe7198deb \ No newline at end of file diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputVibration.cs b/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputVibration.cs deleted file mode 100644 index f48be3d..0000000 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputVibration.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Runtime.InteropServices; - -namespace Essgee.Utilities.XInput -{ - /* https://msdn.microsoft.com/en-us/library/windows/desktop/microsoft.directx_sdk.reference.xinput_vibration%28v=vs.85%29.aspx */ - [StructLayout(LayoutKind.Explicit)] - public struct XInputVibration - { - [FieldOffset(0)] - public ushort wLeftMotorSpeed; - [FieldOffset(2)] - public ushort wRightMotorSpeed; - } -} diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputVibration.cs.meta b/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputVibration.cs.meta deleted file mode 100644 index c25fa98..0000000 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput/XInputVibration.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 66e6171736477a944b9299a66469f407 \ No newline at end of file diff --git a/Assets/Plugins/Essgee.Unity/Utilities/XInput.meta b/Assets/Resources/Essgee.Unity/Dat/Bootstrap.meta similarity index 77% rename from Assets/Plugins/Essgee.Unity/Utilities/XInput.meta rename to Assets/Resources/Essgee.Unity/Dat/Bootstrap.meta index 0e74294..e2f2c87 100644 --- a/Assets/Plugins/Essgee.Unity/Utilities/XInput.meta +++ b/Assets/Resources/Essgee.Unity/Dat/Bootstrap.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 37b3e1d7093e0f545807ab54c1209c8b +guid: ca91f4d917d2a354b97e24c5a2ce35b4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Resources/Essgee.Unity/Dat/Bootstrap/[BIOS] ColecoVision (USA, Europe).col.bytes b/Assets/Resources/Essgee.Unity/Dat/Bootstrap/[BIOS] ColecoVision (USA, Europe).col.bytes new file mode 100644 index 0000000000000000000000000000000000000000..ba4b278e59f55b41df8bbc22cbd27ff857e6cc7c GIT binary patch literal 8192 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Essgee.Unity/Dat/Bootstrap/[BIOS] ColecoVision (USA, Europe).col.bytes.meta b/Assets/Resources/Essgee.Unity/Dat/Bootstrap/[BIOS] ColecoVision (USA, Europe).col.bytes.meta new file mode 100644 index 0000000..9ef2c8c --- /dev/null +++ b/Assets/Resources/Essgee.Unity/Dat/Bootstrap/[BIOS] ColecoVision (USA, Europe).col.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: efcafc093c10d4b46823dab15640a334 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UEssgee.cs b/Assets/Scripts/UEssgee.cs index c6246f5..cf17e6b 100644 --- a/Assets/Scripts/UEssgee.cs +++ b/Assets/Scripts/UEssgee.cs @@ -6,7 +6,6 @@ using Essgee.Exceptions; using Essgee.Extensions; using Essgee.Metadata; using Essgee.Utilities; -using Essgee.Utilities.XInput; using System; using System.Collections.Generic; using System.IO; @@ -50,7 +49,8 @@ public class Essgeeinit : MonoBehaviour //LoadAndRunCartridge("G:/Phantasy Star (USA, Europe) (Rev A).zip"); //LoadAndRunCartridge("G:/Ninja_Gaiden_(UE)_type_A_[!].sms"); //LoadAndRunCartridge("G:/SML2.gb"); - LoadAndRunCartridge("G:/BaiduNetdiskDownload/ս-Թս[]1.11.gbc"); + LoadAndRunCartridge("G:/SonicTheHedgehog(Japan).zip"); + //LoadAndRunCartridge("G:/BaiduNetdiskDownload/ս-Թս[]1.11.gbc"); } void OnDisable() @@ -601,7 +601,7 @@ public class Essgeeinit : MonoBehaviour graphicsHandler.SubmitVideo(e.Width, e.Height, e.FrameDataPtr, 0); // TODO: create emulation "EndOfFrame" event for this? - ControllerManager.Update(); + //ControllerManager.Update(); //}); } @@ -697,8 +697,8 @@ public class Essgeeinit : MonoBehaviour private void EmulatorHandler_EnableRumble(object sender, EventArgs e) { - if (EmuStandInfo.Configuration.EnableXInput && EmuStandInfo.Configuration.EnableRumble) - ControllerManager.GetController(0).Vibrate(0.0f, 0.5f, TimeSpan.FromSeconds(0.1f)); + //if (EmuStandInfo.Configuration.EnableXInput && EmuStandInfo.Configuration.EnableRumble) + // ControllerManager.GetController(0).Vibrate(0.0f, 0.5f, TimeSpan.FromSeconds(0.1f)); } private void EmulatorHandler_PauseChanged(object sender, EventArgs e) diff --git a/Assets/Scripts/UEssgeeInterface/UEGVideoPlayer.cs b/Assets/Scripts/UEssgeeInterface/UEGVideoPlayer.cs index b939945..4e3205f 100644 --- a/Assets/Scripts/UEssgeeInterface/UEGVideoPlayer.cs +++ b/Assets/Scripts/UEssgeeInterface/UEGVideoPlayer.cs @@ -98,6 +98,11 @@ public class UEGVideoPlayer : MonoBehaviour mWidth = width; mHeight = height; bHadData = true; + } + + if (mWidth != width && mHeight != height) + { + } //Debug.Log($"frame_number -> {frame_number}"); }