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

N64: Commented out the wireframe setting for jabo since it looks like there is no way to set it without opening the dll config window

This commit is contained in:
pjgat09 2014-07-22 00:22:08 +00:00
parent b5486c00a5
commit 5ba1bf425a
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.Jabo.cs
View File

@ -20,7 +20,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
adjust_aspect_ratio = false; adjust_aspect_ratio = false;
legacy_pixel_pipeline = false; legacy_pixel_pipeline = false;
alpha_blending = false; alpha_blending = false;
wireframe = false; //wireframe = false;
direct3d_transformation_pipeline = false; direct3d_transformation_pipeline = false;
z_compare = false; z_compare = false;
copy_framebuffer = false; copy_framebuffer = false;
@ -79,10 +79,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
[Description("Force alpha blending")] [Description("Force alpha blending")]
public bool alpha_blending { get; set; } public bool alpha_blending { get; set; }
[DefaultValue(false)] // As far as I can tell there is no way to apply this setting without opening the dll config window
[DisplayName("Wireframe rendering")] //[DefaultValue(false)]
[Description("Wireframe rendering")] //[DisplayName("Wireframe rendering")]
public bool wireframe { get; set; } //[Description("Wireframe rendering")]
//public bool wireframe { get; set; }
[DefaultValue(false)] [DefaultValue(false)]
[DisplayName("Use Direct3D trans pipeline")] [DisplayName("Use Direct3D trans pipeline")]

8
libmupen64plus/mupen64plus-video-jabo/main.cpp
View File

@ -340,7 +340,10 @@ EXPORT int CALL InitiateGFX(GFX_INFO Gfx_Info)
settings.adjust_aspect_ratio = (BOOL)Config_ReadInt("adjust_aspect_ratio","Adjust game aspect ratio to match yours",FALSE); settings.adjust_aspect_ratio = (BOOL)Config_ReadInt("adjust_aspect_ratio","Adjust game aspect ratio to match yours",FALSE);
settings.legacy_pixel_pipeline = (BOOL)Config_ReadInt("legacy_pixel_pipeline","Use legacy pixel pipeline",FALSE); settings.legacy_pixel_pipeline = (BOOL)Config_ReadInt("legacy_pixel_pipeline","Use legacy pixel pipeline",FALSE);
settings.alpha_blending = (BOOL)Config_ReadInt("alpha_blending","Force alpha blending",FALSE); settings.alpha_blending = (BOOL)Config_ReadInt("alpha_blending","Force alpha blending",FALSE);
settings.wireframe = (BOOL)Config_ReadInt("wireframe","Wireframe rendering",FALSE);
// As far as I can tell there is no way to apply this setting without opening the dll config window
//settings.wireframe = (BOOL)Config_ReadInt("wireframe","Wireframe rendering",FALSE);
settings.direct3d_transformation_pipeline = (BOOL)Config_ReadInt("direct3d_transformation_pipeline","Use Direct3D transformation pipeline",FALSE); settings.direct3d_transformation_pipeline = (BOOL)Config_ReadInt("direct3d_transformation_pipeline","Use Direct3D transformation pipeline",FALSE);
settings.z_compare = (BOOL)Config_ReadInt("z_compare","Force Z Compare",FALSE); settings.z_compare = (BOOL)Config_ReadInt("z_compare","Force Z Compare",FALSE);
settings.copy_framebuffer = (BOOL)Config_ReadInt("copy_framebuffer","Copy framebuffer to RDRAM",FALSE); settings.copy_framebuffer = (BOOL)Config_ReadInt("copy_framebuffer","Copy framebuffer to RDRAM",FALSE);
@ -422,7 +425,6 @@ EXPORT int CALL InitiateGFX(GFX_INFO Gfx_Info)
blah.CheckInterrupts = Gfx_Info.CheckInterrupts; blah.CheckInterrupts = Gfx_Info.CheckInterrupts;
OldAPI::InitiateGFX(blah); OldAPI::InitiateGFX(blah);
//OldAPI::DllConfig(hWnd_jabo);
return(TRUE); return(TRUE);
} }
@ -477,8 +479,6 @@ EXPORT void CALL ReadScreen2(void *dest, int *width, int *height, int bFront)
{ {
D3D8_ReadScreen(dest, width, height); D3D8_ReadScreen(dest, width, height);
} }
//*width = 800;
//*height = 600;
} }
// TODO // TODO

2
libmupen64plus/mupen64plus-video-jabo/main.h
View File

@ -17,7 +17,7 @@ typedef struct {
BOOL adjust_aspect_ratio; BOOL adjust_aspect_ratio;
BOOL legacy_pixel_pipeline; BOOL legacy_pixel_pipeline;
BOOL alpha_blending; BOOL alpha_blending;
BOOL wireframe; // BOOL wireframe;
BOOL direct3d_transformation_pipeline; BOOL direct3d_transformation_pipeline;
BOOL z_compare; BOOL z_compare;
BOOL copy_framebuffer; BOOL copy_framebuffer;