sin365/Essgee.Unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

规整代码

Browse Source
This commit is contained in:
sin365 2025-02-17 15:47:53 +08:00
parent 1ceb8ef211
commit 78515fec78
29 changed files with 17 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Plugins/Essgee.Unity/Configuration.cs
View File

@ -1,7 +1,4 @@
using Essgee.Emulation.Configuration; using Essgee.Emulation.Configuration;
using Essgee.Utilities;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;

4
Assets/Plugins/Essgee.Unity/Emulation/Audio/CGBAudio.cs
View File

@ -1,6 +1,4 @@
using System.Collections.Generic; namespace Essgee.Emulation.Audio
namespace Essgee.Emulation.Audio
{ {
public partial class CGBAudio : DMGAudio, IAudio public partial class CGBAudio : DMGAudio, IAudio
{ {

3
Assets/Plugins/Essgee.Unity/Emulation/Audio/DMGAudio.cs
View File

@ -2,10 +2,7 @@
using Essgee.Exceptions; using Essgee.Exceptions;
using Essgee.Utilities; using Essgee.Utilities;
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Unity.VisualScripting.Dependencies.Sqlite;
namespace Essgee.Emulation.Audio namespace Essgee.Emulation.Audio
{ {

5
Assets/Plugins/Essgee.Unity/Emulation/Audio/SN76489.cs
View File

@ -2,12 +2,9 @@
using Essgee.Exceptions; using Essgee.Exceptions;
using Essgee.Utilities; using Essgee.Utilities;
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using UnityEngine.Playables;
using static Essgee.Emulation.Utilities; using static Essgee.Emulation.Utilities;
using static UnityEditor.Experimental.AssetDatabaseExperimental.AssetDatabaseCounters;
namespace Essgee.Emulation.Audio namespace Essgee.Emulation.Audio
{ {
@ -188,7 +185,7 @@ namespace Essgee.Emulation.Audio
data.MemberData[nameof(channelCounters)] = channelCounters.ToByteArray(); data.MemberData[nameof(channelCounters)] = channelCounters.ToByteArray();
data.MemberData[nameof(channelOutput)] = channelOutput.ToByteArray(); data.MemberData[nameof(channelOutput)] = channelOutput.ToByteArray();
data.MemberData[nameof(latchedChannel)] = BitConverter.GetBytes( latchedChannel); data.MemberData[nameof(latchedChannel)] = BitConverter.GetBytes(latchedChannel);
data.MemberData[nameof(latchedType)] = BitConverter.GetBytes(latchedType); data.MemberData[nameof(latchedType)] = BitConverter.GetBytes(latchedType);
data.MemberData[nameof(noiseLfsr)] = BitConverter.GetBytes(noiseLfsr); data.MemberData[nameof(noiseLfsr)] = BitConverter.GetBytes(noiseLfsr);

5
Assets/Plugins/Essgee.Unity/Emulation/Audio/SegaSMSPSG.cs
View File

@ -1,7 +1,4 @@
using static UnityEditor.Experimental.AssetDatabaseExperimental.AssetDatabaseCounters; namespace Essgee.Emulation.Audio
using System;
namespace Essgee.Emulation.Audio
{ {
public class SegaSMSPSG : SN76489 public class SegaSMSPSG : SN76489
{ {

2
Assets/Plugins/Essgee.Unity/Emulation/CPU/ICPU.cs
View File

@ -1,6 +1,6 @@
namespace Essgee.Emulation.CPU namespace Essgee.Emulation.CPU
{ {
interface ICPU: IAxiStatus interface ICPU : IAxiStatus
{ {
void Startup(); void Startup();
void Shutdown(); void Shutdown();

1
Assets/Plugins/Essgee.Unity/Emulation/CPU/SM83.cs
View File

@ -2,7 +2,6 @@
using Essgee.Utilities; using Essgee.Utilities;
using System; using System;
using System.Linq; using System.Linq;
using Unity.VisualScripting;
using static Essgee.Emulation.Utilities; using static Essgee.Emulation.Utilities;
namespace Essgee.Emulation.CPU namespace Essgee.Emulation.CPU

2
Assets/Plugins/Essgee.Unity/Emulation/Cartridges/ICartridge.cs
View File

@ -1,6 +1,6 @@
namespace Essgee.Emulation.Cartridges namespace Essgee.Emulation.Cartridges
{ {
internal interface ICartridge :IAxiStatus internal interface ICartridge : IAxiStatus
{ {
void LoadRom(byte[] data); void LoadRom(byte[] data);
void LoadRam(byte[] data); void LoadRam(byte[] data);

2
Assets/Plugins/Essgee.Unity/Emulation/Cartridges/Sega/CodemastersCartridge.cs
View File

@ -29,7 +29,7 @@ namespace Essgee.Emulation.Cartridges.Sega
ramData = data.MemberData[nameof(ramData)]; ramData = data.MemberData[nameof(ramData)];
pagingRegisters = data.MemberData[nameof(pagingRegisters)]; pagingRegisters = data.MemberData[nameof(pagingRegisters)];
bankMask = data.MemberData[nameof(bankMask)].First(); bankMask = data.MemberData[nameof(bankMask)].First();
isRamEnabled = BitConverter.ToBoolean( data.MemberData[nameof(isRamEnabled)]); isRamEnabled = BitConverter.ToBoolean(data.MemberData[nameof(isRamEnabled)]);
} }
public AxiEssgssStatusData SaveAxiStatus() public AxiEssgssStatusData SaveAxiStatus()

1
Assets/Plugins/Essgee.Unity/Emulation/Cartridges/Sega/Multicart4PakAllActionCartridge.cs
View File

@ -1,7 +1,6 @@
using Essgee.Exceptions; using Essgee.Exceptions;
using Essgee.Utilities; using Essgee.Utilities;
using System; using System;
using UnityEngine.Playables;
namespace Essgee.Emulation.Cartridges.Sega namespace Essgee.Emulation.Cartridges.Sega
{ {

1
Assets/Plugins/Essgee.Unity/Emulation/Cartridges/Sega/SegaSGCartridge.cs
View File

@ -1,7 +1,6 @@
using Essgee.Utilities; using Essgee.Utilities;
using System; using System;
using System.Linq; using System.Linq;
using UnityEngine.Playables;
namespace Essgee.Emulation.Cartridges.Sega namespace Essgee.Emulation.Cartridges.Sega
{ {

2
Assets/Plugins/Essgee.Unity/Emulation/Configuration/ColecoVision.cs
View File

@ -1,6 +1,4 @@
using Essgee.Utilities; using Essgee.Utilities;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace Essgee.Emulation.Configuration namespace Essgee.Emulation.Configuration
{ {

1
Assets/Plugins/Essgee.Unity/Emulation/Configuration/GameBoy.cs
View File

@ -2,7 +2,6 @@
using Essgee.Emulation.ExtDevices.Nintendo; using Essgee.Emulation.ExtDevices.Nintendo;
using Essgee.Utilities; using Essgee.Utilities;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using System; using System;
namespace Essgee.Emulation.Configuration namespace Essgee.Emulation.Configuration

1
Assets/Plugins/Essgee.Unity/Emulation/Configuration/GameBoyColor.cs
View File

@ -2,7 +2,6 @@
using Essgee.Emulation.ExtDevices.Nintendo; using Essgee.Emulation.ExtDevices.Nintendo;
using Essgee.Utilities; using Essgee.Utilities;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using System; using System;
namespace Essgee.Emulation.Configuration namespace Essgee.Emulation.Configuration

2
Assets/Plugins/Essgee.Unity/Emulation/Configuration/GameGear.cs
View File

@ -1,6 +1,4 @@
using Essgee.Utilities; using Essgee.Utilities;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace Essgee.Emulation.Configuration namespace Essgee.Emulation.Configuration
{ {

2
Assets/Plugins/Essgee.Unity/Emulation/Configuration/MasterSystem.cs
View File

@ -1,6 +1,4 @@
using Essgee.Utilities; using Essgee.Utilities;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace Essgee.Emulation.Configuration namespace Essgee.Emulation.Configuration
{ {

5
Assets/Plugins/Essgee.Unity/Emulation/Configuration/SC3000.cs
View File

@ -1,7 +1,4 @@
using Newtonsoft.Json; namespace Essgee.Emulation.Configuration
using Newtonsoft.Json.Converters;
namespace Essgee.Emulation.Configuration
{ {
//todo Unity [ElementPriority(1)] //todo Unity [ElementPriority(1)]
public class SC3000 : IConfiguration public class SC3000 : IConfiguration

5
Assets/Plugins/Essgee.Unity/Emulation/Configuration/SG1000.cs
View File

@ -1,7 +1,4 @@
using Newtonsoft.Json; namespace Essgee.Emulation.Configuration
using Newtonsoft.Json.Converters;
namespace Essgee.Emulation.Configuration
{ {
//todo Unity [ElementPriority(0)] //todo Unity [ElementPriority(0)]
public class SG1000 : IConfiguration public class SG1000 : IConfiguration

1
Assets/Plugins/Essgee.Unity/Emulation/EmulatorHandler.cs
View File

@ -5,7 +5,6 @@ using Essgee.Metadata;
using Essgee.Utilities; using Essgee.Utilities;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Threading; using System.Threading;

2
Assets/Plugins/Essgee.Unity/Emulation/Machines/ColecoVision.cs
View File

@ -263,7 +263,7 @@ namespace Essgee.Emulation.Machines
vdp.LoadAxiStatus(data.ClassData[nameof(vdp)]); vdp.LoadAxiStatus(data.ClassData[nameof(vdp)]);
psg.LoadAxiStatus(data.ClassData[nameof(psg)]); psg.LoadAxiStatus(data.ClassData[nameof(psg)]);
portControls1 = BitConverter.ToUInt16( data.MemberData[nameof(portControls1)]); portControls1 = BitConverter.ToUInt16(data.MemberData[nameof(portControls1)]);
portControls2 = BitConverter.ToUInt16(data.MemberData[nameof(portControls2)]); portControls2 = BitConverter.ToUInt16(data.MemberData[nameof(portControls2)]);
controlsReadMode = data.MemberData[nameof(controlsReadMode)].First(); controlsReadMode = data.MemberData[nameof(controlsReadMode)].First();
isNmi = BitConverter.ToBoolean(data.MemberData[nameof(isNmi)]); isNmi = BitConverter.ToBoolean(data.MemberData[nameof(isNmi)]);

4
Assets/Plugins/Essgee.Unity/Emulation/Machines/GameGear.cs
View File

@ -326,14 +326,14 @@ namespace Essgee.Emulation.Machines
{ {
AxiEssgssStatusData data = new AxiEssgssStatusData(); AxiEssgssStatusData data = new AxiEssgssStatusData();
data.MemberData[nameof(configuration.Region)] = configuration.Region.ToByteArray(); data.MemberData[nameof(configuration.Region)] = configuration.Region.ToByteArray();
data.ClassData[nameof(bootstrap)] = bootstrap.SaveAxiStatus(); data.ClassData[nameof(bootstrap)] = bootstrap.SaveAxiStatus();
data.ClassData[nameof(cartridge)] = cartridge.SaveAxiStatus(); data.ClassData[nameof(cartridge)] = cartridge.SaveAxiStatus();
data.MemberData[nameof(wram)] = wram; data.MemberData[nameof(wram)] = wram;
data.ClassData[nameof(cpu)] = cpu.SaveAxiStatus(); data.ClassData[nameof(cpu)] = cpu.SaveAxiStatus();
data.ClassData[nameof(vdp)] = vdp.SaveAxiStatus(); data.ClassData[nameof(vdp)] = vdp.SaveAxiStatus();
data.ClassData[nameof(psg)] = psg.SaveAxiStatus(); data.ClassData[nameof(psg)] = psg.SaveAxiStatus();
data.MemberData[nameof(portMemoryControl)] = BitConverter.GetBytes(portMemoryControl); data.MemberData[nameof(portMemoryControl)] = BitConverter.GetBytes(portMemoryControl);
data.MemberData[nameof(portIoControl)] = BitConverter.GetBytes(portIoControl); data.MemberData[nameof(portIoControl)] = BitConverter.GetBytes(portIoControl);
data.MemberData[nameof(hCounterLatched)] = BitConverter.GetBytes(hCounterLatched); data.MemberData[nameof(hCounterLatched)] = BitConverter.GetBytes(hCounterLatched);

2
Assets/Plugins/Essgee.Unity/Emulation/Machines/IMachine.cs
View File

@ -5,7 +5,7 @@ using System.Collections.Generic;
namespace Essgee.Emulation.Machines namespace Essgee.Emulation.Machines
{ {
public interface IMachine:IAxiStatus public interface IMachine : IAxiStatus
{ {
event EventHandler<SendLogMessageEventArgs> SendLogMessage; event EventHandler<SendLogMessageEventArgs> SendLogMessage;
event EventHandler<EventArgs> EmulationReset; event EventHandler<EventArgs> EmulationReset;

4
Assets/Plugins/Essgee.Unity/Emulation/Machines/MasterSystem.cs
View File

@ -340,9 +340,9 @@ namespace Essgee.Emulation.Machines
{ {
AxiEssgssStatusData data = new AxiEssgssStatusData(); AxiEssgssStatusData data = new AxiEssgssStatusData();
data.MemberData[nameof(configuration.TVStandard)] = configuration.TVStandard.ToByteArray(); data.MemberData[nameof(configuration.TVStandard)] = configuration.TVStandard.ToByteArray();
data.MemberData[nameof(configuration.Region)] = configuration.Region.ToByteArray(); data.MemberData[nameof(configuration.Region)] = configuration.Region.ToByteArray();
if(bootstrap != null) if (bootstrap != null)
data.ClassData[nameof(bootstrap)] = bootstrap.SaveAxiStatus(); data.ClassData[nameof(bootstrap)] = bootstrap.SaveAxiStatus();
data.ClassData[nameof(cartridge)] = cartridge.SaveAxiStatus(); data.ClassData[nameof(cartridge)] = cartridge.SaveAxiStatus();

1
Assets/Plugins/Essgee.Unity/Emulation/Video/SegaGGVDP.cs
View File

@ -1,7 +1,6 @@
using Essgee.EventArguments; using Essgee.EventArguments;
using Essgee.Utilities; using Essgee.Utilities;
using System; using System;
using System.Runtime.InteropServices;
using static Essgee.Emulation.Utilities; using static Essgee.Emulation.Utilities;
namespace Essgee.Emulation.Video namespace Essgee.Emulation.Video

2
Assets/Plugins/Essgee.Unity/Emulation/Video/SegaSMSVDP.cs
View File

@ -4,8 +4,6 @@ using System;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Unity.Mathematics;
using Unity.VisualScripting;
using static Essgee.Emulation.Utilities; using static Essgee.Emulation.Utilities;
namespace Essgee.Emulation.Video namespace Essgee.Emulation.Video

1
Assets/Plugins/Essgee.Unity/Emulation/Video/TMS99xxA.cs
View File

@ -5,7 +5,6 @@ using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using static Essgee.Emulation.Utilities; using static Essgee.Emulation.Utilities;
using static UnityEditor.Experimental.AssetDatabaseExperimental.AssetDatabaseCounters;
namespace Essgee.Emulation.Video namespace Essgee.Emulation.Video
{ {

2
Assets/Plugins/Essgee.Unity/EventArguments/EnqueueSamplesEventArgs.cs
View File

@ -20,7 +20,7 @@ namespace Essgee.EventArguments
//} //}
//public static EnqueueSamplesEventArgs Create(int numChannels, short[][] channelSamples, bool[] isMuted, short[] mixedSamples) //public static EnqueueSamplesEventArgs Create(int numChannels, short[][] channelSamples, bool[] isMuted, short[] mixedSamples)
public static EnqueueSamplesEventArgs Create(int numChannels, short*[] channelSamples, bool[] isMuted, short* mixedSamples,int mixedSamplesLength) public static EnqueueSamplesEventArgs Create(int numChannels, short*[] channelSamples, bool[] isMuted, short* mixedSamples, int mixedSamplesLength)
{ {
var eventArgs = ObjectPoolAuto.Acquire<EnqueueSamplesEventArgs>(); var eventArgs = ObjectPoolAuto.Acquire<EnqueueSamplesEventArgs>();
eventArgs.NumChannels = numChannels; eventArgs.NumChannels = numChannels;

2
Assets/Plugins/Essgee.Unity/IAxiStatus.cs
View File

@ -1,10 +1,8 @@
using Essgee.Utilities;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.Serialization.Formatters.Binary; using System.Runtime.Serialization.Formatters.Binary;
using System.Text;
[Serializable] [Serializable]
public class AxiEssgssStatusData public class AxiEssgssStatusData

4
Assets/Plugins/Essgee.Unity/Metadata/GameMetadataHandler.cs
View File

@ -18,7 +18,7 @@ namespace Essgee.Metadata
public interface IGameMetaReources public interface IGameMetaReources
{ {
public bool GetCartMetadataDatabase(out string loadedData); public bool GetCartMetadataDatabase(out string loadedData);
public bool GetDatBytes(string DatName,out byte[] loadedData); public bool GetDatBytes(string DatName, out byte[] loadedData);
} }
public class GameMetadataHandler public class GameMetadataHandler
@ -37,7 +37,7 @@ namespace Essgee.Metadata
{ {
gameMetaReources = metaresources; gameMetaReources = metaresources;
if(!gameMetaReources.GetCartMetadataDatabase(out string loadedData)) if (!gameMetaReources.GetCartMetadataDatabase(out string loadedData))
throw new HandlerException("CartMetadataDatabase file not found"); throw new HandlerException("CartMetadataDatabase file not found");
cartMetadataDatabase = JsonConvert.DeserializeObject<List<CartridgeJSON>>(loadedData); cartMetadataDatabase = JsonConvert.DeserializeObject<List<CartridgeJSON>>(loadedData);