Alienjack/AxibugEmuOnline
1
0
Fork 0
forked from sin365/AxibugEmuOnline
Code Pull Requests Activity

StoicGoose核心除即时存档之外 实现CoreInterface（主要Input） | 一些注释

Browse Source
This commit is contained in:
sin365 2025-09-08 18:16:59 +08:00
parent efe1c1d810
commit 99d0d76566
6 changed files with 225 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AxibugEmuOnline.Client/Assets/Script/AppMain/Emulator/EssgeeEmulator/UEssgeeInterface/UEGKeyboard.cs
View File

@ -12,7 +12,7 @@ public class UEGKeyboard : MonoBehaviour
{
public EssgeeControllerMapper ControllerMapper { get; private set; }
public Dictionary<ulong, EssgeeMotionKey> dictKey2Motion = new Dictionary<ulong, EssgeeMotionKey>();
public Dictionary<ulong, KeyCode> dictMotion2RealKey = new Dictionary<ulong, KeyCode>()
/*public Dictionary<ulong, KeyCode> dictMotion2RealKey = new Dictionary<ulong, KeyCode>()
{
{ EssgeeUnityKey.P1_UP,KeyCode.W},
{ EssgeeUnityKey.P1_DOWN,KeyCode.S},
@ -54,7 +54,7 @@ public class UEGKeyboard : MonoBehaviour
{ EssgeeUnityKey.P4_BTN_4,KeyCode.F12},
{ EssgeeUnityKey.P4_POTION_1,KeyCode.F12},
{ EssgeeUnityKey.P4_POTION_2,KeyCode.F12},
};
};*/
public ulong[] CheckList;
public EssgeeMotionKey[] mCurrKey = new EssgeeMotionKey[0];
List<EssgeeMotionKey> temp = new List<EssgeeMotionKey>();

209
AxibugEmuOnline.Client/Assets/Script/AppMain/Emulator/StoicGooseEmulator/StoicGooseInterface/SGKeyboard.cs
View File

@ -1,3 +1,6 @@
using AxibugEmuOnline.Client.ClientCore;
using AxibugEmuOnline.Client.Event;
using AxibugEmuOnline.Client.Settings;
using StoicGooseUnity;
using System;
using System.Collections.Generic;
@ -6,12 +9,14 @@ using UnityEngine;
public class SGKeyboard : MonoBehaviour
{
Dictionary<KeyCode, StoicGooseKey> dictKey2SGKey = new Dictionary<KeyCode, StoicGooseKey>();
KeyCode[] checkKeys;
public SGControllerMapper ControllerMapper { get; private set; }
//Dictionary<KeyCode, StoicGooseKey> dictKey2SGKey = new Dictionary<KeyCode, StoicGooseKey>();
//KeyCode[] checkKeys;
long currInput;
private void Awake()
{
SetVerticalOrientation(false);
ControllerMapper = new SGControllerMapper();
//SetVerticalOrientation(false);
}
@ -22,31 +27,187 @@ public class SGKeyboard : MonoBehaviour
internal void SetVerticalOrientation(bool isVerticalOrientation)
{
dictKey2SGKey[KeyCode.Return] = StoicGooseKey.Start;
dictKey2SGKey[KeyCode.W] = StoicGooseKey.X1;
dictKey2SGKey[KeyCode.S] = StoicGooseKey.X2;
dictKey2SGKey[KeyCode.A] = StoicGooseKey.X3;
dictKey2SGKey[KeyCode.D] = StoicGooseKey.X4;
dictKey2SGKey[KeyCode.G] = StoicGooseKey.Y1;
dictKey2SGKey[KeyCode.V] = StoicGooseKey.Y2;
dictKey2SGKey[KeyCode.C] = StoicGooseKey.Y3;
dictKey2SGKey[KeyCode.B] = StoicGooseKey.Y4;
dictKey2SGKey[KeyCode.Return] = StoicGooseKey.Start;
dictKey2SGKey[KeyCode.J] = StoicGooseKey.B;
dictKey2SGKey[KeyCode.K] = StoicGooseKey.A;
checkKeys = dictKey2SGKey.Keys.ToArray();
//TODO 横屏竖屏
//dictKey2SGKey[KeyCode.Return] = StoicGooseKey.Start;
//dictKey2SGKey[KeyCode.W] = StoicGooseKey.X1;
//dictKey2SGKey[KeyCode.S] = StoicGooseKey.X2;
//dictKey2SGKey[KeyCode.A] = StoicGooseKey.X3;
//dictKey2SGKey[KeyCode.D] = StoicGooseKey.X4;
//dictKey2SGKey[KeyCode.G] = StoicGooseKey.Y1;
//dictKey2SGKey[KeyCode.V] = StoicGooseKey.Y2;
//dictKey2SGKey[KeyCode.C] = StoicGooseKey.Y3;
//dictKey2SGKey[KeyCode.B] = StoicGooseKey.Y4;
//dictKey2SGKey[KeyCode.Return] = StoicGooseKey.Start;
//dictKey2SGKey[KeyCode.J] = StoicGooseKey.B;
//dictKey2SGKey[KeyCode.K] = StoicGooseKey.A;
//checkKeys = dictKey2SGKey.Keys.ToArray();
}
public void Update_InputData()
internal void SetInputData(ulong inputData)
{
currInput = 0;
for (int i = 0; i < checkKeys.Length; i++)
currInput = (long)inputData;
}
public ulong Update_InputData()
{
KeyCode key = checkKeys[i];
if (Input.GetKey(key))
ulong tempLocalInputAllData = 0;
tempLocalInputAllData |= ControllerMapper.Controller0.GetSingleAllInput();
tempLocalInputAllData |= ControllerMapper.Controller1.GetSingleAllInput();
tempLocalInputAllData |= ControllerMapper.Controller2.GetSingleAllInput();
tempLocalInputAllData |= ControllerMapper.Controller3.GetSingleAllInput();
return tempLocalInputAllData;
//currInput = tempLocalInputAllData;
//currInput = 0;
//for (int i = 0; i < checkKeys.Length; i++)
//{
// KeyCode key = checkKeys[i];
// if (Input.GetKey(key))
// {
// currInput |= (long)dictKey2SGKey[key];
// }
//}
}
}
public class SGControllerMapper : IControllerSetuper
{
currInput |= (long)dictKey2SGKey[key];
}
}
public SGController Controller0 = new SGController(0);
public SGController Controller1 = new SGController(1);
public SGController Controller2 = new SGController(2);
public SGController Controller3 = new SGController(3);
ulong mCurrAllInput;
public void SetConnect(uint? con0ToSlot = null,
uint? con1ToSlot = null,
uint? con2ToSlot = null,
uint? con3ToSlot = null)
{
Controller0.ConnectSlot = con0ToSlot;
Controller1.ConnectSlot = con1ToSlot;
Controller2.ConnectSlot = con2ToSlot;
Controller3.ConnectSlot = con3ToSlot;
}
public int? GetSlotConnectingControllerIndex(int slotIndex)
{
if (Controller0.ConnectSlot.HasValue && Controller0.ConnectSlot.Value == slotIndex) return 0;
else if (Controller1.ConnectSlot.HasValue && Controller1.ConnectSlot.Value == slotIndex) return 1;
else if (Controller2.ConnectSlot.HasValue && Controller2.ConnectSlot.Value == slotIndex) return 2;
else if (Controller3.ConnectSlot.HasValue && Controller3.ConnectSlot.Value == slotIndex) return 3;
else return null;
}
public IController GetSlotConnectingController(int slotIndex)
{
if (Controller0.ConnectSlot.HasValue && Controller0.ConnectSlot.Value == slotIndex) return Controller0;
else if (Controller1.ConnectSlot.HasValue && Controller1.ConnectSlot.Value == slotIndex) return Controller1;
else if (Controller2.ConnectSlot.HasValue && Controller2.ConnectSlot.Value == slotIndex) return Controller2;
else if (Controller3.ConnectSlot.HasValue && Controller3.ConnectSlot.Value == slotIndex) return Controller3;
else return null;
}
static HashSet<uint> s_temp = new HashSet<uint>();
public uint? GetFreeSlotIndex()
{
s_temp.Clear();
s_temp.Add(0);
s_temp.Add(1);
s_temp.Add(2);
s_temp.Add(3);
if (Controller0.ConnectSlot.HasValue) s_temp.Remove(Controller0.ConnectSlot.Value);
if (Controller1.ConnectSlot.HasValue) s_temp.Remove(Controller1.ConnectSlot.Value);
if (Controller2.ConnectSlot.HasValue) s_temp.Remove(Controller2.ConnectSlot.Value);
if (Controller3.ConnectSlot.HasValue) s_temp.Remove(Controller3.ConnectSlot.Value);
if (s_temp.Count > 0) return s_temp.First();
else return null;
}
public void LetControllerConnect(int conIndex, uint slotIndex)
{
SGController targetController;
switch (conIndex)
{
case 0: targetController = Controller0; break;
case 1: targetController = Controller1; break;
case 2: targetController = Controller2; break;
case 3: targetController = Controller3; break;
default:
throw new System.Exception($"Not Allowed conIndex Range: {conIndex}");
break;
}
if (targetController.ConnectSlot.HasValue) return;
targetController.ConnectSlot = slotIndex;
Eventer.Instance.PostEvent(EEvent.OnControllerConnectChanged);
}
}
public class SGController : IController
{
public ulong CurrLocalSingleAllInput { get; private set; }
int mControllerIndex;
uint? mConnectSlot;
/// <summary>
/// 指示该手柄连接的手柄插槽
/// <para><c>这个值代表了该手柄在实际游戏中控制的Player</c></para>
/// <value>[0,3] 例外:为空代表未连接</value>
/// </summary>
public uint? ConnectSlot
{
get { return mConnectSlot; }
set { mConnectSlot = value; }
}
/// <summary>
/// 控制器编号
/// <para><c>此编号并非对应游戏中的player1,player2,player3,player4,仅仅作为本地4个手柄的实例</c></para>
/// <value>[0,3]</value>
/// </summary>
public int ControllerIndex
{
get { return mControllerIndex; }
set { mControllerIndex = value; /*this.LoadControlKeyForConfig();*/ }
}
public SGController(int controllerIndex)
{
ControllerIndex = controllerIndex;
}
public bool AnyButtonDown()
{
return GetKeyMapper().AnyKeyDown(mControllerIndex);
}
public StoicGooseBinding GetKeyMapper()
{
return App.settings.KeyMapper.GetBinder<StoicGooseBinding>(UStoicGoose.instance.Platform);
}
public ulong GetSingleAllInput()
{
if (!ConnectSlot.HasValue)
return 0;
CurrLocalSingleAllInput = 0;
StoicGooseBinding essgeeKeys = GetKeyMapper();
if (essgeeKeys.GetKey(StoicGooseKey.X1, mControllerIndex)) CurrLocalSingleAllInput |= (ulong)StoicGooseKey.X1;
if (essgeeKeys.GetKey(StoicGooseKey.X2, mControllerIndex)) CurrLocalSingleAllInput |= (ulong)StoicGooseKey.X2;
if (essgeeKeys.GetKey(StoicGooseKey.X3, mControllerIndex)) CurrLocalSingleAllInput |= (ulong)StoicGooseKey.X3;
if (essgeeKeys.GetKey(StoicGooseKey.X4, mControllerIndex)) CurrLocalSingleAllInput |= (ulong)StoicGooseKey.X4;
if (essgeeKeys.GetKey(StoicGooseKey.Y1, mControllerIndex)) CurrLocalSingleAllInput |= (ulong)StoicGooseKey.Y1;
if (essgeeKeys.GetKey(StoicGooseKey.Y2, mControllerIndex)) CurrLocalSingleAllInput |= (ulong)StoicGooseKey.Y2;
if (essgeeKeys.GetKey(StoicGooseKey.Y3, mControllerIndex)) CurrLocalSingleAllInput |= (ulong)StoicGooseKey.Y3;
if (essgeeKeys.GetKey(StoicGooseKey.Y4, mControllerIndex)) CurrLocalSingleAllInput |= (ulong)StoicGooseKey.Y4;
if (essgeeKeys.GetKey(StoicGooseKey.Start, mControllerIndex)) CurrLocalSingleAllInput |= (ulong)StoicGooseKey.Start;
return CurrLocalSingleAllInput;
}
}

6
AxibugEmuOnline.Client/Assets/Script/AppMain/Emulator/StoicGooseEmulator/StoicGooseInterface/SGSoundPlayer.cs
View File

@ -10,6 +10,12 @@ public class SGSoundPlayer : MonoBehaviour//, ISoundPlayer
private TimeSpan lastElapsed;
public double audioFPS { get; private set; }
//TODO 是否需要和 AudioConfiguration关联起来
[HideInInspector]
public int sampleRate = 44100;
[HideInInspector]
public int channle = 2;
void Awake()
{
// »ñÈ¡µ±Ç°ÒôƵÅäÖÃ

32
AxibugEmuOnline.Client/Assets/Script/AppMain/Emulator/StoicGooseEmulator/UStoicGoose.cs
View File

@ -93,7 +93,6 @@ public class UStoicGoose : EmuCore<ulong>
Init();
//保存当前正在进行的游戏存档
if (emulatorHandler != null && !emulatorHandler.IsRunning)
{
@ -123,11 +122,17 @@ public class UStoicGoose : EmuCore<ulong>
public override IControllerSetuper GetControllerSetuper()
{
throw new NotImplementedException();
return inputHandler.ControllerMapper;
}
protected override bool OnPushEmulatorFrame(ulong InputData)
{
throw new NotImplementedException();
if (!emulatorHandler.IsRunning) return false;
//if (!bLogicUpdatePause) return false;
inputHandler.SetInputData(InputData);
emulatorHandler.Frame_Update();
return true;
}
protected override ulong ConvertInputDataFromNet(ReplayStep step)
@ -142,17 +147,17 @@ public class UStoicGoose : EmuCore<ulong>
protected override ulong GetLocalInput()
{
throw new NotImplementedException();
return inputHandler.Update_InputData();
}
protected override void AfterPushFrame()
{
throw new NotImplementedException();
}
public override void GetAudioParams(out int frequency, out int channels)
{
throw new NotImplementedException();
channels = soundHandler.channle;
frequency = soundHandler.sampleRate;
}
#endregion
@ -177,15 +182,16 @@ public class UStoicGoose : EmuCore<ulong>
//Init();
//LoadAndRunCartridge("G:/BaiduNetdiskDownload/Rockman & Forte - Mirai Kara no Chousen Sha (J) [M][!].ws");
}
private void Update()
{
if (!emulatorHandler.IsRunning)
return;
inputHandler.Update_InputData();
//依靠外部核心驱动
//private void Update()
//{
// if (!emulatorHandler.IsRunning)
// return;
// inputHandler.Update_InputData();
// emulatorHandler.Frame_Update();
//}
emulatorHandler.Frame_Update();
}
void OnDestroy()
{
EmuClose();

1
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/KeyMapperSetting/KeyMapperSetting.cs
View File

@ -13,6 +13,7 @@ namespace AxibugEmuOnline.Client.Settings
Dictionary<Type, InternalEmuCoreBinder> m_bindersByType = new Dictionary<Type, InternalEmuCoreBinder>();
public KeyMapperSetting()
{
//反射拿所有核心的键位绑定
var baseType = typeof(InternalEmuCoreBinder);
foreach (var t in baseType.Assembly.ExportedTypes)
{

12
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/InputDevicesManager/Devices/PSVController_D.cs
View File

@ -6,9 +6,21 @@ namespace AxibugEmuOnline.Client.InputDevices
{
public override GamePadType PadType => GamePadType.PsvitaControl;
/// <summary>
/// X
/// </summary>
public Button_C Cross;
/// <summary>
/// O
/// </summary>
public Button_C Circle;
/// <summary>
/// 方框
/// </summary>
public Button_C Square;
/// <summary>
/// 三角
/// </summary>
public Button_C Triangle;
public Button_C L;
public Button_C R;