sin365/AxibugEmuOnline
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: sin365:c7c46aee157ac7d275debc6cfbb40ed0bc2dc85a
Branches Tags
sin365:master
sin365:dev_mame_timercount
sin365:dev_audiomix
sin365:psv_VirtualNes.Core归档
sin365:bak_AlphaFristLove
sin365:dev_beforeShader
sin365:dev_4VirtualNes
sin365:dev_basemynes
sin365:bak_baseOnEmulator.NES
sin365:beforinputsystem
..
compare: sin365:94ba08617fc54bce61b69b34981e72cda9200dc3
Branches Tags
sin365:master
sin365:dev_mame_timercount
sin365:dev_audiomix
sin365:psv_VirtualNes.Core归档
sin365:bak_AlphaFristLove
sin365:dev_beforeShader
sin365:dev_4VirtualNes
sin365:dev_basemynes
sin365:bak_baseOnEmulator.NES
sin365:beforinputsystem

No commits in common. "c7c46aee157ac7d275debc6cfbb40ed0bc2dc85a" and "94ba08617fc54bce61b69b34981e72cda9200dc3" have entirely different histories.
c7c46aee15 ... 94ba08617f

3 changed files with 130 additions and 138 deletions
Show Stats Expand all files Collapse all files

3
AxibugEmuOnline.Client/Assets/Plugins/Mame.Core/Motion/MameMainMotion.cs
View File

@ -97,8 +97,7 @@ namespace MAME.Core
return; return;
} }
//EmuTimer.lt = new List<EmuTimer.emu_timer>(); EmuTimer.lt = new List<EmuTimer.emu_timer>();
EmuTimer.instancingTimerList();
sSelect = RomInfo.Rom.Name; sSelect = RomInfo.Rom.Name;
Machine.mainMotion = this; Machine.mainMotion = this;
Machine.rom = RomInfo.Rom; Machine.rom = RomInfo.Rom;

263
AxibugEmuOnline.Client/Assets/Plugins/Mame.Core/emu/EmuTimer.cs
View File

@ -27,11 +27,6 @@ namespace MAME.Core
public Atime expire; public Atime expire;
}*/ }*/
public static void instancingTimerList()
{
lt = new List<emu_timer>();
}
public class emu_timer public class emu_timer
{ {
public TIME_ACT action; public TIME_ACT action;
@ -507,8 +502,7 @@ namespace MAME.Core
which.period = period; which.period = period;
timer_list_remove(which); timer_list_remove(which);
timer_list_insert(which); timer_list_insert(which);
//if (lt.IndexOf(which) == 0) if (lt.IndexOf(which) == 0)
if (lt[0] == which)
{ {
if (Cpuexec.activecpu >= 0 && Cpuexec.activecpu < Cpuexec.ncpu) if (Cpuexec.activecpu >= 0 && Cpuexec.activecpu < Cpuexec.ncpu)
{ {
@ -737,76 +731,75 @@ namespace MAME.Core
lt = new List<emu_timer>(); lt = new List<emu_timer>();
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
{ {
emu_timer etimer = new emu_timer(); lt.Add(new emu_timer());
lt.Add(etimer);
i1 = reader.ReadInt32(); i1 = reader.ReadInt32();
etimer.action = getactionbyindex(i1); lt[i].action = getactionbyindex(i1);
//etimer.func = getfuncbyindex(i1); //lt[i].func = getfuncbyindex(i1);
etimer.enabled = reader.ReadBoolean(); lt[i].enabled = reader.ReadBoolean();
etimer.temporary = reader.ReadBoolean(); lt[i].temporary = reader.ReadBoolean();
etimer.period.seconds = reader.ReadInt32(); lt[i].period.seconds = reader.ReadInt32();
etimer.period.attoseconds = reader.ReadInt64(); lt[i].period.attoseconds = reader.ReadInt64();
etimer.start.seconds = reader.ReadInt32(); lt[i].start.seconds = reader.ReadInt32();
etimer.start.attoseconds = reader.ReadInt64(); lt[i].start.attoseconds = reader.ReadInt64();
etimer.expire.seconds = reader.ReadInt32(); lt[i].expire.seconds = reader.ReadInt32();
etimer.expire.attoseconds = reader.ReadInt64(); lt[i].expire.attoseconds = reader.ReadInt64();
//if (etimer.func == "vblank_begin_callback") //if (lt[i].func == "vblank_begin_callback")
if (etimer.action == TIME_ACT.Video_vblank_begin_callback) if (lt[i].action == TIME_ACT.Video_vblank_begin_callback)
{ {
Video.vblank_begin_timer = etimer; Video.vblank_begin_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Video.vblank_begin_timer); lt.Add(Video.vblank_begin_timer);
} }
else if (etimer.action == TIME_ACT.Video_vblank_end_callback) else if (lt[i].action == TIME_ACT.Video_vblank_end_callback)
{ {
Video.vblank_end_timer = etimer; Video.vblank_end_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Video.vblank_end_timer); lt.Add(Video.vblank_end_timer);
} }
else if (etimer.action == TIME_ACT.Mame_soft_reset) else if (lt[i].action == TIME_ACT.Mame_soft_reset)
{ {
Mame.soft_reset_timer = etimer; Mame.soft_reset_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Mame.soft_reset_timer); lt.Add(Mame.soft_reset_timer);
} }
else if (etimer.action == TIME_ACT.Watchdog_watchdog_callback) else if (lt[i].action == TIME_ACT.Watchdog_watchdog_callback)
{ {
Watchdog.watchdog_timer = etimer; Watchdog.watchdog_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Watchdog.watchdog_timer); lt.Add(Watchdog.watchdog_timer);
} }
else if (etimer.action == TIME_ACT.Generic_irq_1_0_line_hold) else if (lt[i].action == TIME_ACT.Generic_irq_1_0_line_hold)
{ {
Cpuexec.timedint_timer = etimer; Cpuexec.timedint_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Cpuexec.timedint_timer); lt.Add(Cpuexec.timedint_timer);
} }
else if (etimer.action == TIME_ACT.YM2151_timer_callback_a) else if (lt[i].action == TIME_ACT.YM2151_timer_callback_a)
{ {
YM2151.PSG.timer_A = etimer; YM2151.PSG.timer_A = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(YM2151.PSG.timer_A); lt.Add(YM2151.PSG.timer_A);
} }
else if (etimer.action == TIME_ACT.YM2151_timer_callback_b) else if (lt[i].action == TIME_ACT.YM2151_timer_callback_b)
{ {
YM2151.PSG.timer_B = etimer; YM2151.PSG.timer_B = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(YM2151.PSG.timer_B); lt.Add(YM2151.PSG.timer_B);
} }
else if (etimer.action == TIME_ACT.Cpuexec_trigger_partial_frame_interrupt) else if (lt[i].action == TIME_ACT.Cpuexec_trigger_partial_frame_interrupt)
{ {
switch (Machine.sBoard) switch (Machine.sBoard)
{ {
case "CPS2": case "CPS2":
case "IGS011": case "IGS011":
case "Konami68000": case "Konami68000":
Cpuexec.cpu[0].partial_frame_timer = etimer; Cpuexec.cpu[0].partial_frame_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Cpuexec.cpu[0].partial_frame_timer); lt.Add(Cpuexec.cpu[0].partial_frame_timer);
break; break;
case "M72": case "M72":
Cpuexec.cpu[1].partial_frame_timer = etimer; Cpuexec.cpu[1].partial_frame_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Cpuexec.cpu[1].partial_frame_timer); lt.Add(Cpuexec.cpu[1].partial_frame_timer);
break; break;
case "Capcom": case "Capcom":
@ -823,186 +816,186 @@ namespace MAME.Core
case "makaimurc": case "makaimurc":
case "makaimurg": case "makaimurg":
case "diamond": case "diamond":
Cpuexec.cpu[1].partial_frame_timer = etimer; Cpuexec.cpu[1].partial_frame_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Cpuexec.cpu[1].partial_frame_timer); lt.Add(Cpuexec.cpu[1].partial_frame_timer);
break; break;
} }
break; break;
} }
} }
else if (etimer.action == TIME_ACT.Cpuexec_null_callback) else if (lt[i].action == TIME_ACT.Cpuexec_null_callback)
{ {
Cpuexec.interleave_boost_timer = etimer; Cpuexec.interleave_boost_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Cpuexec.interleave_boost_timer); lt.Add(Cpuexec.interleave_boost_timer);
} }
else if (etimer.action == TIME_ACT.Cpuexec_end_interleave_boost) else if (lt[i].action == TIME_ACT.Cpuexec_end_interleave_boost)
{ {
Cpuexec.interleave_boost_timer_end = etimer; Cpuexec.interleave_boost_timer_end = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Cpuexec.interleave_boost_timer_end); lt.Add(Cpuexec.interleave_boost_timer_end);
} }
else if (etimer.action == TIME_ACT.Video_scanline0_callback) else if (lt[i].action == TIME_ACT.Video_scanline0_callback)
{ {
Video.scanline0_timer = etimer; Video.scanline0_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Video.scanline0_timer); lt.Add(Video.scanline0_timer);
} }
else if (etimer.action == TIME_ACT.Neogeo_display_position_interrupt_callback) else if (lt[i].action == TIME_ACT.Neogeo_display_position_interrupt_callback)
{ {
Neogeo.display_position_interrupt_timer = etimer; Neogeo.display_position_interrupt_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Neogeo.display_position_interrupt_timer); lt.Add(Neogeo.display_position_interrupt_timer);
} }
else if (etimer.action == TIME_ACT.Neogeo_display_position_vblank_callback) else if (lt[i].action == TIME_ACT.Neogeo_display_position_vblank_callback)
{ {
Neogeo.display_position_vblank_timer = etimer; Neogeo.display_position_vblank_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Neogeo.display_position_vblank_timer); lt.Add(Neogeo.display_position_vblank_timer);
} }
else if (etimer.action == TIME_ACT.Neogeo_vblank_interrupt_callback) else if (lt[i].action == TIME_ACT.Neogeo_vblank_interrupt_callback)
{ {
Neogeo.vblank_interrupt_timer = etimer; Neogeo.vblank_interrupt_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Neogeo.vblank_interrupt_timer); lt.Add(Neogeo.vblank_interrupt_timer);
} }
else if (etimer.action == TIME_ACT.Neogeo_auto_animation_timer_callback) else if (lt[i].action == TIME_ACT.Neogeo_auto_animation_timer_callback)
{ {
Neogeo.auto_animation_timer = etimer; Neogeo.auto_animation_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Neogeo.auto_animation_timer); lt.Add(Neogeo.auto_animation_timer);
} }
else if (etimer.action == TIME_ACT.Neogeo_sprite_line_timer_callback) else if (lt[i].action == TIME_ACT.Neogeo_sprite_line_timer_callback)
{ {
Neogeo.sprite_line_timer = etimer; Neogeo.sprite_line_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Neogeo.sprite_line_timer); lt.Add(Neogeo.sprite_line_timer);
} }
else if (etimer.action == TIME_ACT.YM2610_F2610_timer_callback_0) else if (lt[i].action == TIME_ACT.YM2610_F2610_timer_callback_0)
{ {
YM2610.timer[0] = etimer; YM2610.timer[0] = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(YM2610.timer[0]); lt.Add(YM2610.timer[0]);
} }
else if (etimer.action == TIME_ACT.YM2610_F2610_timer_callback_1) else if (lt[i].action == TIME_ACT.YM2610_F2610_timer_callback_1)
{ {
YM2610.timer[1] = etimer; YM2610.timer[1] = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(YM2610.timer[1]); lt.Add(YM2610.timer[1]);
} }
else if (etimer.action == TIME_ACT.M6800_action_rx) else if (lt[i].action == TIME_ACT.M6800_action_rx)
{ {
M6800.m1.m6800_rx_timer = etimer; M6800.m1.m6800_rx_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(M6800.m1.m6800_rx_timer); lt.Add(M6800.m1.m6800_rx_timer);
} }
else if (etimer.action == TIME_ACT.M6800_action_tx) else if (lt[i].action == TIME_ACT.M6800_action_tx)
{ {
M6800.m1.m6800_tx_timer = etimer; M6800.m1.m6800_tx_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(M6800.m1.m6800_tx_timer); lt.Add(M6800.m1.m6800_tx_timer);
} }
else if (etimer.action == TIME_ACT.YM3812_timer_callback_3812_0) else if (lt[i].action == TIME_ACT.YM3812_timer_callback_3812_0)
{ {
YM3812.timer[0] = etimer; YM3812.timer[0] = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(YM3812.timer[0]); lt.Add(YM3812.timer[0]);
} }
else if (etimer.action == TIME_ACT.YM3812_timer_callback_3812_1) else if (lt[i].action == TIME_ACT.YM3812_timer_callback_3812_1)
{ {
YM3812.timer[1] = etimer; YM3812.timer[1] = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(YM3812.timer[1]); lt.Add(YM3812.timer[1]);
} }
else if (etimer.action == TIME_ACT.ICS2115_timer_cb_0) else if (lt[i].action == TIME_ACT.ICS2115_timer_cb_0)
{ {
ICS2115.timer[0].timer = etimer; ICS2115.timer[0].timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(ICS2115.timer[0].timer); lt.Add(ICS2115.timer[0].timer);
} }
else if (etimer.action == TIME_ACT.ICS2115_timer_cb_1) else if (lt[i].action == TIME_ACT.ICS2115_timer_cb_1)
{ {
ICS2115.timer[1].timer = etimer; ICS2115.timer[1].timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(ICS2115.timer[1].timer); lt.Add(ICS2115.timer[1].timer);
} }
else if (etimer.action == TIME_ACT.M72_m72_scanline_interrupt) else if (lt[i].action == TIME_ACT.M72_m72_scanline_interrupt)
{ {
M72.scanline_timer = etimer; M72.scanline_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(M72.scanline_timer); lt.Add(M72.scanline_timer);
} }
else if (etimer.action == TIME_ACT.M92_m92_scanline_interrupt) else if (lt[i].action == TIME_ACT.M92_m92_scanline_interrupt)
{ {
M92.scanline_timer = etimer; M92.scanline_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(M92.scanline_timer); lt.Add(M92.scanline_timer);
} }
else if (etimer.action == TIME_ACT.Cpuexec_cpu_timeslicecallback) else if (lt[i].action == TIME_ACT.Cpuexec_cpu_timeslicecallback)
{ {
Cpuexec.timeslice_timer = etimer; Cpuexec.timeslice_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Cpuexec.timeslice_timer); lt.Add(Cpuexec.timeslice_timer);
} }
else if (etimer.action == TIME_ACT.Upd7759_upd7759_slave_update) else if (lt[i].action == TIME_ACT.Upd7759_upd7759_slave_update)
{ {
Upd7759.chip.timer = etimer; Upd7759.chip.timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Upd7759.chip.timer); lt.Add(Upd7759.chip.timer);
} }
else if (etimer.action == TIME_ACT.Generic_irq_2_0_line_hold) else if (lt[i].action == TIME_ACT.Generic_irq_2_0_line_hold)
{ {
Cpuexec.timedint_timer = etimer; Cpuexec.timedint_timer = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(Cpuexec.timedint_timer); lt.Add(Cpuexec.timedint_timer);
} }
else if (etimer.action == TIME_ACT.MSM5205_MSM5205_vclk_callback0) else if (lt[i].action == TIME_ACT.MSM5205_MSM5205_vclk_callback0)
{ {
MSM5205.timer[0] = etimer; MSM5205.timer[0] = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(MSM5205.timer[0]); lt.Add(MSM5205.timer[0]);
} }
else if (etimer.action == TIME_ACT.MSM5205_MSM5205_vclk_callback1) else if (lt[i].action == TIME_ACT.MSM5205_MSM5205_vclk_callback1)
{ {
MSM5205.timer[1] = etimer; MSM5205.timer[1] = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(MSM5205.timer[1]); lt.Add(MSM5205.timer[1]);
} }
else if (etimer.action == TIME_ACT.YM2203_timer_callback_2203_0_0) else if (lt[i].action == TIME_ACT.YM2203_timer_callback_2203_0_0)
{ {
YM2203.FF2203[0].timer[0] = etimer; YM2203.FF2203[0].timer[0] = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(YM2203.FF2203[0].timer[0]); lt.Add(YM2203.FF2203[0].timer[0]);
} }
else if (etimer.action == TIME_ACT.YM2203_timer_callback_2203_0_1) else if (lt[i].action == TIME_ACT.YM2203_timer_callback_2203_0_1)
{ {
YM2203.FF2203[0].timer[1] = etimer; YM2203.FF2203[0].timer[1] = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(YM2203.FF2203[0].timer[1]); lt.Add(YM2203.FF2203[0].timer[1]);
} }
else if (etimer.action == TIME_ACT.YM2203_timer_callback_2203_1_0) else if (lt[i].action == TIME_ACT.YM2203_timer_callback_2203_1_0)
{ {
YM2203.FF2203[1].timer[0] = etimer; YM2203.FF2203[1].timer[0] = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(YM2203.FF2203[1].timer[0]); lt.Add(YM2203.FF2203[1].timer[0]);
} }
else if (etimer.action == TIME_ACT.YM2203_timer_callback_2203_1_1) else if (lt[i].action == TIME_ACT.YM2203_timer_callback_2203_1_1)
{ {
YM2203.FF2203[1].timer[1] = etimer; YM2203.FF2203[1].timer[1] = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(YM2203.FF2203[1].timer[1]); lt.Add(YM2203.FF2203[1].timer[1]);
} }
else if (etimer.action == TIME_ACT.YM3812_timer_callback_3526_0) else if (lt[i].action == TIME_ACT.YM3812_timer_callback_3526_0)
{ {
YM3812.timer[0] = etimer; YM3812.timer[0] = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(YM3812.timer[0]); lt.Add(YM3812.timer[0]);
} }
else if (etimer.action == TIME_ACT.YM3812_timer_callback_3526_1) else if (lt[i].action == TIME_ACT.YM3812_timer_callback_3526_1)
{ {
YM3812.timer[1] = etimer; YM3812.timer[1] = lt[i];
lt.Remove(etimer); lt.Remove(lt[i]);
lt.Add(YM3812.timer[1]); lt.Add(YM3812.timer[1]);
} }
} }

2
AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/Game_Neogeo_Template.prefab
View File

@ -629,7 +629,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Content: {fileID: 8865437771338118001} m_Content: {fileID: 8865437771338118001}
m_Horizontal: 0 m_Horizontal: 0
m_Vertical: 0 m_Vertical: 1
m_MovementType: 0 m_MovementType: 0
m_Elasticity: 0.1 m_Elasticity: 0.1
m_Inertia: 1 m_Inertia: 1