From 5ba1bf425a2a1965b1640581aec252e2cc789140 Mon Sep 17 00:00:00 2001 From: pjgat09 Date: Tue, 22 Jul 2014 00:22:08 +0000 Subject: [PATCH] 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 --- .../Consoles/Nintendo/N64/N64SyncSettings.Jabo.cs | 11 ++++++----- libmupen64plus/mupen64plus-video-jabo/main.cpp | 8 ++++---- libmupen64plus/mupen64plus-video-jabo/main.h | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.Jabo.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.Jabo.cs index 6ecc95e1c2..70933c4c99 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.Jabo.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.Jabo.cs @@ -20,7 +20,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 adjust_aspect_ratio = false; legacy_pixel_pipeline = false; alpha_blending = false; - wireframe = false; + //wireframe = false; direct3d_transformation_pipeline = false; z_compare = false; copy_framebuffer = false; @@ -79,10 +79,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 [Description("Force alpha blending")] public bool alpha_blending { get; set; } - [DefaultValue(false)] - [DisplayName("Wireframe rendering")] - [Description("Wireframe rendering")] - public bool wireframe { get; set; } + // As far as I can tell there is no way to apply this setting without opening the dll config window + //[DefaultValue(false)] + //[DisplayName("Wireframe rendering")] + //[Description("Wireframe rendering")] + //public bool wireframe { get; set; } [DefaultValue(false)] [DisplayName("Use Direct3D trans pipeline")] diff --git a/libmupen64plus/mupen64plus-video-jabo/main.cpp b/libmupen64plus/mupen64plus-video-jabo/main.cpp index b4a4835e22..bb0bd5bbea 100644 --- a/libmupen64plus/mupen64plus-video-jabo/main.cpp +++ b/libmupen64plus/mupen64plus-video-jabo/main.cpp @@ -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.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.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.z_compare = (BOOL)Config_ReadInt("z_compare","Force Z Compare",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; OldAPI::InitiateGFX(blah); - //OldAPI::DllConfig(hWnd_jabo); return(TRUE); } @@ -477,8 +479,6 @@ EXPORT void CALL ReadScreen2(void *dest, int *width, int *height, int bFront) { D3D8_ReadScreen(dest, width, height); } - //*width = 800; - //*height = 600; } // TODO diff --git a/libmupen64plus/mupen64plus-video-jabo/main.h b/libmupen64plus/mupen64plus-video-jabo/main.h index c6a78cc994..525bb4112d 100644 --- a/libmupen64plus/mupen64plus-video-jabo/main.h +++ b/libmupen64plus/mupen64plus-video-jabo/main.h @@ -17,7 +17,7 @@ typedef struct { BOOL adjust_aspect_ratio; BOOL legacy_pixel_pipeline; BOOL alpha_blending; - BOOL wireframe; +// BOOL wireframe; BOOL direct3d_transformation_pipeline; BOOL z_compare; BOOL copy_framebuffer;