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

internal infrastructure for video presentation changes (aspect ratio, apparent size, etc)

This commit is contained in:
goyuken 2014-04-30 23:48:37 +00:00
parent 72595b73bb
commit b0970451aa
26 changed files with 91 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BizHawk.Client.EmuHawk/AVOut/AviWriter.cs
View File

@ -90,17 +90,19 @@ namespace BizHawk.Client.EmuHawk
class VideoCopy : IVideoProvider
{
int[] vb;
int bw, bh, bc;
public int VirtualWidth { get { return bw; } }
public int BufferWidth { get { return bw; } }
public int BufferHeight { get { return bh; } }
public int BackgroundColor { get { return bc; } }
public int VirtualWidth { get; private set; }
public int VirtualHeight { get; private set; }
public int BufferWidth { get; private set; }
public int BufferHeight { get; private set; }
public int BackgroundColor { get; private set; }
public VideoCopy(IVideoProvider c)
{
vb = (int[])c.GetVideoBuffer().Clone();
bw = c.BufferWidth;
bh = c.BufferHeight;
bc = c.BackgroundColor;
BufferWidth = c.BufferWidth;
BufferHeight= c.BufferHeight;
BackgroundColor = c.BackgroundColor;
VirtualWidth = c.VirtualWidth;
VirtualHeight = c.VirtualHeight;
}
public int[] GetVideoBuffer()
{

6
BizHawk.Client.EmuHawk/AVOut/BmpVideoProvder.cs
View File

@ -47,6 +47,12 @@ namespace BizHawk.Client.EmuHawk
get { return bmp.Width; }
}
public int VirtualHeight
{
// todo: Bitmap actually has size metric data; use it
get { return bmp.Height; }
}
public int BufferWidth
{
get { return bmp.Width; }

1
BizHawk.Emulation.Common/Interfaces/Base Implementations/NullEmulator.cs
View File

@ -75,6 +75,7 @@ namespace BizHawk.Emulation.Common
public bool BinarySaveStatesPreferred { get { return false; } }
public int[] GetVideoBuffer() { return frameBuffer; }
public int VirtualWidth { get { return 256; } }
public int VirtualHeight { get { return 192; } }
public int BufferWidth { get { return 256; } }
public int BufferHeight { get { return 192; } }
public int BackgroundColor { get { return 0; } }

7
BizHawk.Emulation.Common/Interfaces/IVideoProvider.cs
View File

@ -4,7 +4,12 @@
{
int[] GetVideoBuffer();
int VirtualWidth { get; } // Used for controlling aspect ratio. Just return BufferWidth if you dont know what to do with this.
// put together, these describe a metric on the screen
// they should define the smallest size that the buffer can be placed inside such that:
// 1. no actual pixel data is lost
// 2. aspect ratio is accurate
int VirtualWidth { get; }
int VirtualHeight { get; }
int BufferWidth { get; }
int BufferHeight { get; }

1
BizHawk.Emulation.Cores/Calculator/TI83.cs
View File

@ -414,6 +414,7 @@ namespace BizHawk.Emulation.Cores.Calculators
return pixels;
}
public int VirtualWidth { get { return 96; } }
public int VirtualHeight { get { return 64; } }
public int BufferWidth { get { return 96; } }
public int BufferHeight { get { return 64; } }
public int BackgroundColor { get { return 0; } }

5
BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.VideoProvider.cs
View File

@ -47,6 +47,11 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Experimental
get { return screenWidth; }
}
public int VirtualHeight
{
get { return screenHeight; }
}
public int BufferWidth
{
get { return screenWidth; }

5
BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.VideoProvider.cs
View File

@ -61,5 +61,10 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
{
get { return bufWidth; }
}
public int VirtualHeight
{
get { return bufHeight; }
}
}
}

5
BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs
View File

@ -118,6 +118,11 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
get { return 320; }
}
public int VirtualHeight
{
get { return 262; }
}
public int BufferWidth
{
get { return 320; }

3
BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs
View File

@ -406,7 +406,8 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800
return vidbuffer;
}
public int VirtualWidth { get { return BufferWidth; } }
public int VirtualWidth { get { return 275; } }
public int VirtualHeight { get { return BufferHeight; } }
public int BufferWidth { get; private set; }
public int BufferHeight { get; private set; }
public int BackgroundColor { get { return unchecked((int)0xff000000); } }

3
BizHawk.Emulation.Cores/Consoles/Coleco/TMS9918A.cs
View File

@ -445,7 +445,8 @@ namespace BizHawk.Emulation.Cores.ColecoVision
public int[] FrameBuffer = new int[256 * 192];
public int[] GetVideoBuffer() { return FrameBuffer; }
public int VirtualWidth { get { return 256; } }
public int VirtualWidth { get { return 293; } }
public int VirtualHeight { get { return 192; } }
public int BufferWidth { get { return 256; } }
public int BufferHeight { get { return 192; } }
public int BackgroundColor { get { return 0; } }

1
BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs
View File

@ -535,6 +535,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
public int[] GetVideoBuffer() { return videobuffer; }
public int VirtualWidth { get { return 240; } }
public int VirtualHeight { get { return 160; } }
public int BufferWidth { get { return 240; } }
public int BufferHeight { get { return 160; } }
public int BackgroundColor { get { return unchecked((int)0xff000000); } }

5
BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
View File

@ -807,6 +807,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
get { return 160; }
}
public int VirtualHeight
{
get { return 144; }
}
public int BufferWidth
{
get { return 160; }

1
BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs
View File

@ -361,6 +361,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
int[] VideoBuffer = new int[160 * 2 * 144];
public int[] GetVideoBuffer() { return VideoBuffer; }
public int VirtualWidth { get { return 320; } }
public int VirtualHeight { get { return 144; } }
public int BufferWidth { get { return 320; } }
public int BufferHeight { get { return 144; } }
public int BackgroundColor { get { return unchecked((int)0xff000000); } }

1
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64VideoProvider.cs
View File

@ -30,6 +30,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
}
public int VirtualWidth { get { return BufferWidth; } }
public int VirtualHeight { get { return BufferHeight; } }
public int BufferWidth { get; private set; }
public int BufferHeight { get; private set; }
public int BackgroundColor { get { return 0; } }

3
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
View File

@ -212,7 +212,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
}
}
public int VirtualWidth { get { return BufferWidth; } }
public int VirtualWidth { get { return (int)(BufferWidth * 1.146); } }
public int VirtualHeight { get { return BufferHeight; } }
public int BufferWidth { get { return right - left + 1; } }
public int BackgroundColor { get { return 0; } }
public int BufferHeight

3
BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
View File

@ -536,7 +536,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
public IVideoProvider VideoProvider { get { return this; } }
public int[] GetVideoBuffer() { return VideoOutput; }
public int VirtualWidth { get { return (int)(BufferWidth * 1.14); } }
public int VirtualWidth { get { return (int)(BufferWidth * 1.146); } }
public int VirtualHeight { get { return BufferHeight; } }
public int BufferWidth { get; private set; }
public int BufferHeight { get; private set; }
public int BackgroundColor { get { return unchecked((int)0xff000000); } }

1
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
View File

@ -622,6 +622,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
int IVideoProvider.BackgroundColor { get { return 0; } }
int[] IVideoProvider.GetVideoBuffer() { return vidBuffer; }
int IVideoProvider.VirtualWidth { get { return vidWidth; } }
public int VirtualHeight { get { return vidHeight; } }
int IVideoProvider.BufferWidth { get { return vidWidth; } }
int IVideoProvider.BufferHeight { get { return vidHeight; } }

1
BizHawk.Emulation.Cores/Consoles/PC Engine/VDC.Render.cs
View File

@ -427,6 +427,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
public int[] GetVideoBuffer() { return FrameBuffer; }
public int VirtualWidth { get { return FramePitch; } }
public int VirtualHeight { get { return FrameHeight; } }
public int BufferWidth { get { return FramePitch; } }
public int BufferHeight { get { return FrameHeight; } }
public int BackgroundColor { get { return vce.Palette[256]; } }

1
BizHawk.Emulation.Cores/Consoles/PC Engine/VPC.cs
View File

@ -520,6 +520,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
public int[] GetVideoBuffer() { return FrameBuffer; }
public int VirtualWidth { get { return FrameWidth; } }
public int VirtualHeight { get { return FrameHeight; } }
public int BufferWidth { get { return FrameWidth; } }
public int BufferHeight { get { return FrameHeight; } }
public int BackgroundColor { get { return VCE.Palette[0]; } }

1
BizHawk.Emulation.Cores/Consoles/Sega/Genesis/GenVDP.cs
View File

@ -465,6 +465,7 @@ namespace BizHawk.Emulation.Cores.Sega.Genesis
}
public int VirtualWidth { get { return 320; } }
public int VirtualHeight { get { return FrameHeight; } }
public int BufferWidth
{

14
BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs
View File

@ -434,7 +434,19 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
return GameGearFrameBuffer;
}
public int VirtualWidth { get { return BufferWidth; } }
public int VirtualWidth
{
get
{
if (mode == MasterSystem.VdpMode.SMS)
return 293;
else if (Sms.Settings.ShowClippedRegions)
return 256;
else
return 160;
}
}
public int VirtualHeight { get { return BufferHeight; } }
public int BufferWidth
{
get

3
BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs
View File

@ -505,7 +505,8 @@ namespace BizHawk.Emulation.Cores.Sega.Saturn
public IVideoProvider VideoProvider { get { return this; } }
int[] VideoBuffer = new int[704 * 512];
public int[] GetVideoBuffer() { return VideoBuffer; }
public int VirtualWidth { get; private set; }
public int VirtualWidth { get { return BufferWidth; } }
public int VirtualHeight { get { return BufferHeight; } }
public int BufferWidth { get; private set; }
public int BufferHeight { get; private set; }
public int BackgroundColor { get { return unchecked((int)0xff000000); } }

1
BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs
View File

@ -642,6 +642,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
int vheight;
public int[] GetVideoBuffer() { return vidbuff; }
public int VirtualWidth { get { return BufferWidth; } } // TODO
public int VirtualHeight { get { return BufferHeight; } } // TODO
public int BufferWidth { get { return vwidth; } }
public int BufferHeight { get { return vheight; } }
public int BackgroundColor { get { return unchecked((int)0xff000000); } }

1
BizHawk.Emulation.Cores/Consoles/Sony/PSP/PSP.cs
View File

@ -203,6 +203,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSP
readonly int[] screenbuffer = new int[screenwidth * screenheight];
public int[] GetVideoBuffer() { return screenbuffer; }
public int VirtualWidth { get { return screenwidth; } }
public int VirtualHeight { get { return screenheight; } }
public int BufferWidth { get { return screenwidth; } }
public int BufferHeight { get { return screenheight; } }
public int BackgroundColor { get { return unchecked((int)0xff000000); } }

1
BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
View File

@ -279,6 +279,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
public bool BinarySaveStatesPreferred { get { return false; } }
public int[] GetVideoBuffer() { return frameBuffer; }
public int VirtualWidth { get; private set; }
public int VirtualHeight { get { return BufferHeight; } }
public int BufferWidth { get; private set; }
public int BufferHeight { get; private set; }
public int BackgroundColor { get { return 0; } }

17
BizHawk.Emulation.Cores/LibRetroEmulator.cs
View File

@ -545,12 +545,23 @@ namespace BizHawk.Emulation.Cores
{
get
{
if (dar < 0.1f || dar > 3.0f)
return BufferWidth;
else
if (dar > 1.0f)
return (int)(BufferWidth * dar);
else
return BufferWidth;
}
}
public int VirtualHeight
{
get
{
if (dar < 1.0f)
return (int)(BufferHeight / dar);
else
return BufferHeight;
}
}
public int BufferWidth { get; private set; }
public int BufferHeight { get; private set; }
public int BackgroundColor { get { return unchecked((int)0xff000000); } }