From 531ad373b2c22e00a341a6635023cf8949571bd5 Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Thu, 22 Aug 2013 23:53:37 +0000 Subject: Moving most of the OS X preferences to auto layout, and all to 10.7. Changing some lists of independent checkbox buttons to matrices. Fix a discrepancy between SDL versions 1.2 and 2.0 APIs in OS X's input preferences. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86849 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- .../DFCdrom/English.lproj/DFCdromPluginConfig.xib | 1023 ++- .../DFCdrom/macsrc/PluginConfigController.m | 33 +- .../English.lproj/NetPcsxrHIDInputPluginMain.xib | 1077 ++- macosx/plugins/DFInput/macsrc/ControllerList.m | 4 +- macosx/plugins/DFInput/macsrc/PadController.m | 51 +- macosx/plugins/DFInput/macsrc/PadView.m | 9 +- macosx/plugins/DFInput/macsrc/cfg.c | 5 +- macosx/plugins/DFNet/English.lproj/DFNet.xib | 707 +- macosx/plugins/DFNet/English.lproj/SockDialog.xib | 272 +- .../plugins/DFNet/macsrc/PluginConfigController.m | 33 +- macosx/plugins/DFNet/macsrc/SockDialog.h | 5 +- .../English.lproj/NetSfPeopsSpuPluginMain.xib | 1786 ++++- macosx/plugins/DFSound/macsrc/PluginController.m | 40 +- .../plugins/DFSound/macsrc/SPUPluginController.h | 8 +- .../plugins/DFSound/macsrc/SPUPluginController.m | 18 +- .../English.lproj/NetSfPeopsSoftGPUConfig.xib | 2833 ++++++-- .../DFXVideo/NetSfPeopsSoftGPUInterface.xib | 133 +- .../DFXVideo/macsrc/PluginConfigController.h | 6 +- .../DFXVideo/macsrc/PluginConfigController.m | 64 +- macosx/plugins/DFXVideo/macsrc/SGPUPreferences.h | 5 - .../English.lproj/NetSfPeopsOpenGLConfig.xib | 6920 ++++++++++++-------- .../PeopsXgl/NetSfPeopsOpenGLGPUInterface.xib | 43 +- .../NetSfPeopsOpenGLPluginConfigController.h | 26 +- .../NetSfPeopsOpenGLPluginConfigController.m | 31 +- 24 files changed, 10835 insertions(+), 4297 deletions(-) (limited to 'macosx/plugins') diff --git a/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.xib b/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.xib index 43710512..ca6a67f7 100644 --- a/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.xib +++ b/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.xib @@ -1,30 +1,31 @@ - 1060 - 11C74 - 1938 - 1138.23 - 567.00 + 1070 + 12E55 + 3084 + 1187.39 + 626.00 com.apple.InterfaceBuilder.CocoaPlugin - 1938 + 3084 - NSPopUpButton + IBNSLayoutConstraint + NSBox NSButton - NSMenu - NSTextFieldCell NSButtonCell + NSCustomObject + NSMenu NSMenuItem - NSBox + NSPopUpButton + NSPopUpButtonCell NSSlider NSSliderCell - NSCustomObject + NSTextField + NSTextFieldCell NSView NSWindowTemplate - NSTextField - NSPopUpButtonCell com.apple.InterfaceBuilder.CocoaPlugin @@ -54,59 +55,11 @@ View - {283.34100000000001, 107} + {377, 238} 256 - - - 256 - {{119, 9}, {122, 32}} - - - YES - - 67239424 - 134217728 - Cancel - - LucidaGrande - 13 - 1044 - - - -2038284033 - 1 - - - Gw - 200 - 25 - - - - - 256 - {{241, 9}, {122, 32}} - - - YES - - 67239424 - 134217728 - OK - - - -2038284033 - 1 - - - DQ - 200 - 25 - - 256 @@ -115,53 +68,25 @@ 274 - - - 256 - {{13, 43}, {114, 17}} - - - YES - - 67239424 - 272629760 - Q0QtUk9NIFNwZWVkOgo - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - 256 - {{26, 13}, {151, 18}} + {{15, 21}, {151, 18}} + YES - 67239424 + 67108864 0 Use Cached Reading - + + LucidaGrande + 13 + 1044 + - 1211912703 + 1211912448 2 NSImage @@ -175,20 +100,22 @@ 200 25 + NO 256 - {{129, 38}, {197, 26}} + {{128, 40}, {197, 26}} + YES - -2076049856 + -2076180416 2048 - 109199615 + 109199360 1 LucidaGrande @@ -306,19 +233,59 @@ YES 1 + NO + + + + 268 + {{14, 46}, {106, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + CD-ROM Speed: + + _NS:1535 + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2NjY3AA + + + + 6 + System + controlTextColor + + 3 + MAA + + + + NO {{2, 2}, {339, 73}} + {{17, 128}, {343, 90}} + {0, 0} - 67239424 + 67108864 0 General Settings @@ -357,12 +324,14 @@ 256 - {{13, 19}, {114, 17}} + {{14, 21}, {114, 17}} + + {250, 750} YES - 67239424 + 67108864 272629760 Q2FjaGUgU2l6ZToKA @@ -370,16 +339,18 @@ + NO 256 - {{130, 15}, {195, 25}} + {{129, 15}, {195, 25}} + YES - 67239424 + 67108864 0 @@ -399,19 +370,22 @@ YES NO + NO {{2, 2}, {339, 51}} + - {{17, 49}, {343, 68}} + {{17, 56}, {343, 68}} + {0, 0} - 67239424 + 67108864 0 Misc @@ -427,35 +401,70 @@ 2 NO + + + 268 + {{304, 13}, {59, 32}} + + + + _NS:9 + YES + + 67108864 + 134217728 + OK + + _NS:9 + + -2038284288 + 129 + + DQ + 200 + 25 + + NO + + + + 268 + {{222, 13}, {82, 32}} + + + + _NS:9 + YES + + 67108864 + 134217728 + Cancel + + _NS:9 + + -2038284288 + 129 + + Gw + 200 + 25 + + NO + {377, 238} + - {{0, 0}, {1024, 746}} - {283.34100000000001, 129} + {{0, 0}, {1920, 1058}} + {377, 260} {10000000000000, 10000000000000} YES - - - ok: - - - - 133 - - - - cancel: - - - - 134 - window @@ -488,6 +497,22 @@ 184 + + + ok: + + + + 246 + + + + cancel: + + + + 254 + delegate @@ -496,14 +521,6 @@ 158 - - - nextKeyView - - - - 9 - @@ -538,36 +555,308 @@ 6 - - - + + + 5 + 0 + + 6 + 1 + + 12 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 60 + + 1000 + + 3 + 9 + 3 + + + + 3 + 0 + + 3 + 1 + + 114 + + 1000 + + 3 + 9 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + - - 7 - - - - - - - - 8 - - - - - - 162 - + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 6 + 0 + + 6 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 24 + + 1000 + + 3 + 9 + 3 + + + + 4 + 0 + + 4 + 1 + + 21 + + 1000 + + 3 + 9 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + @@ -575,40 +864,81 @@ 164 + + + 6 + 0 + + 6 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 3 + 1 + + 28 + + 1000 + + 3 + 9 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + - - 186 - - - - - 187 - - - -3 Application - - 168 - - - - - - - - 188 - - - 169 @@ -627,6 +957,22 @@ + + + 7 + 0 + + 0 + 1 + + 192 + + 1000 + + 3 + 9 + 1 + @@ -692,6 +1038,38 @@ + + + 8 + 0 + + 0 + 1 + + 17 + + 1000 + + 3 + 9 + 1 + + + + 7 + 0 + + 0 + 1 + + 108 + + 1000 + + 3 + 9 + 1 + @@ -705,6 +1083,22 @@ + + + 7 + 0 + + 0 + 1 + + 191 + + 1000 + + 3 + 9 + 1 + @@ -713,18 +1107,216 @@ + + 212 + + + + + 213 + + + + + 215 + + + + + 216 + + + + + 217 + + + + + 220 + + + + + 221 + + + + + 222 + + + + + 224 + + + + + 236 + + + + + 238 + + + + + 239 + + + + + 240 + + + + + 241 + + + + + 242 + + + + + + + + 243 + + + + + 245 + + + + + 247 + + + + + 249 + + + + + 250 + + + + + + + + 251 + + + + + 252 + + + + + 253 + + + + + 232 + + + + + 234 + + + + + 225 + + + + + 266 + + + + + + + + 267 + + + + + 270 + + + + + 271 + + + + + 272 + + + + + 273 + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -734,32 +1326,76 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - 192 + 273 - DFCdromPluginConfigController - NSWindowController + NSLayoutConstraint + NSObject IBProjectSource - ./Classes/DFCdromPluginConfigController.h + ./Classes/NSLayoutConstraint.h @@ -768,18 +1404,15 @@ IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - + YES 3 - {9, 8} - {7, 2} + {11, 11} + {10, 3} {15, 15} + YES diff --git a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m index ed80b490..c519a666 100755 --- a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m +++ b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m @@ -26,6 +26,15 @@ #define APP_ID @"net.pcsxr.DFCdrom" #define PrefsKey APP_ID @" Settings" +static inline void RunOnMainThreadSync(dispatch_block_t block) +{ + if ([NSThread isMainThread]) { + block(); + } else { + dispatch_sync(dispatch_get_main_queue(), block); + } +} + static PluginConfigController *windowController = nil; void AboutDlgProc() @@ -68,17 +77,19 @@ void AboutDlgProc() void ConfDlgProc() { - NSWindow *window; - - if (windowController == nil) { - windowController = [[PluginConfigController alloc] initWithWindowNibName:@"DFCdromPluginConfig"]; - } - window = [windowController window]; - - [windowController loadValues]; - - [window center]; - [window makeKeyAndOrderFront:nil]; + RunOnMainThreadSync(^{ + NSWindow *window; + + if (windowController == nil) { + windowController = [[PluginConfigController alloc] initWithWindowNibName:@"DFCdromPluginConfig"]; + } + window = [windowController window]; + + [windowController loadValues]; + + [window center]; + [window makeKeyAndOrderFront:nil]; + }); } void ReadConfig() diff --git a/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.xib b/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.xib index ccf49bd8..896c8978 100644 --- a/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.xib +++ b/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.xib @@ -1,16 +1,17 @@ - 1060 - 11G63 - 2844 - 1138.51 - 569.00 + 1070 + 12E55 + 3084 + 1187.39 + 626.00 com.apple.InterfaceBuilder.CocoaPlugin - 2844 + 3084 + IBNSLayoutConstraint NSButton NSButtonCell NSCustomObject @@ -69,6 +70,7 @@ 274 {{13, 40}, {437, 378}} + pad1 @@ -81,12 +83,14 @@ 274 {417, 332} + NSView NSResponder {{10, 33}, {417, 332}} + Controller 1 @@ -135,55 +139,60 @@ - + - 289 - {{328, 12}, {121, 32}} + 268 + {{390, 13}, {59, 32}} + + _NS:9 YES - - 67239424 + + 67108864 134217728 OK - - -2038284033 - 1 - + _NS:9 + + -2038284288 + 129 DQ 200 25 + NO - + - 289 - {{207, 12}, {121, 32}} + 268 + {{308, 13}, {82, 32}} + + _NS:9 YES - - 67239424 + + 67108864 134217728 Cancel - - -2038284033 - 1 - + _NS:9 + + -2038284288 + 129 - - - + Gw 200 25 + NO {463, 424} + - {{0, 0}, {1440, 878}} + {{0, 0}, {1920, 1058}} {310, 182} {10000000000000, 10000000000000} YES @@ -203,25 +212,27 @@ 256 - {366, 233} + {381, 244} + 1 YES + NO + YES 256 - {366, 17} + {381, 17} + - - + + 256 {{367, 0}, {16, 17}} - - @@ -230,7 +241,7 @@ 100 1000 - 75628096 + 75497536 2048 Key @@ -253,7 +264,7 @@ - 338820672 + 338690112 1024 @@ -272,11 +283,11 @@ button - 239.96499633789062 + 254.96499633789062 46.965000152587891 1000 - 75628096 + 75497536 134219776 Button @@ -284,7 +295,7 @@ - 69336577 + 69206017 134348800 Double-Click to Set @@ -328,7 +339,7 @@ 1 - {{1, 17}, {366, 233}} + {{1, 17}, {381, 244}} @@ -344,9 +355,11 @@ 256 - {{367, 17}, {15, 233}} + {{366, 17}, {16, 244}} + + NO _doScroller: 0.95625001192092896 @@ -357,6 +370,8 @@ {{-100, -100}, {375, 15}} + + NO 1 _doScroller: @@ -368,7 +383,7 @@ - {{1, 0}, {366, 17}} + {{1, 0}, {381, 17}} @@ -376,19 +391,20 @@ 4 - - {{20, 42}, {383, 251}} + {{20, 30}, {383, 262}} - + 133138 - QSAAAEEgAABBgAAAQYAAAA + 0.25 + 4 + 1 @@ -396,14 +412,15 @@ {{301, 297}, {105, 22}} + 2 YES - -2076049856 + -2076180416 132096 - 109199615 + 109199360 1 LucidaGrande @@ -459,6 +476,7 @@ YES 1 + NO @@ -466,9 +484,11 @@ {{265, 302}, {34, 14}} + + {250, 750} YES - 67239424 + 67108864 4325376 Type: @@ -476,16 +496,19 @@ + NO 303 - {{23, 20}, {383, 14}} + {{59, 8}, {304, 14}} + + {250, 750} YES - 67239424 + 67108864 4194304 To reset an entry: Select it and press the delete '←' key @@ -496,6 +519,7 @@ MC4yNQA + NO @@ -503,14 +527,15 @@ {{68, 297}, {195, 22}} + 1 YES - -2076049856 + -2076180416 132096 - 109199615 + 109199360 1 @@ -545,28 +570,33 @@ YES 1 + NO 303 - {{20, 299}, {48, 19}} + {{17, 302}, {49, 14}} + + {250, 750} YES - 67239424 + 67108864 4325376 - RGV2aWNlOgo + Device: + NO {423, 336} + NetPcsxrHIDInputPluginPadView NSView @@ -609,17 +639,17 @@ ok: - + - 74 + 260 cancel: - + - 187 + 265 @@ -717,9 +747,137 @@ 6 + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 6 + 1 + + 12 + + 1000 + + 6 + 24 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 50 + + 1000 + + 3 + 9 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 12 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + - - + + @@ -745,6 +903,70 @@ + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 3 + 9 + 3 + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + + 3 + 9 + 3 + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 3 + 9 + 3 + + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 5 + 22 + 2 + @@ -766,6 +988,70 @@ + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 3 + 9 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 3 + 9 + 3 + + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 5 + 22 + 2 + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + + 3 + 9 + 3 + @@ -774,42 +1060,256 @@ - - 27 - - - - - - - - 202 - - - - - 186 - - - - - - - - 203 - - - 16 - - + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 4 + 0 + + 4 + 1 + + 8 + + 1000 + + 3 + 9 + 3 + + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + Controller View @@ -880,6 +1380,22 @@ + + + 7 + 0 + + 0 + 1 + + 99 + + 1000 + + 3 + 9 + 1 + @@ -915,6 +1431,22 @@ + + + 7 + 0 + + 0 + 1 + + 28 + + 1000 + + 3 + 9 + 1 + @@ -928,6 +1460,22 @@ + + + 7 + 0 + + 0 + 1 + + 298 + + 1000 + + 3 + 9 + 1 + @@ -970,6 +1518,22 @@ + + + 7 + 0 + + 0 + 1 + + 43 + + 1000 + + 3 + 9 + 1 + @@ -978,36 +1542,278 @@ + + 216 + + + + + 217 + + + + + 218 + + + + + 219 + + + + + 220 + + + + + 223 + + + + + 225 + + + + + 228 + + + + + 229 + + + + + 230 + + + + + 231 + + + + + 236 + + + + + 238 + + + + + 240 + + + + + 243 + + + + + 244 + + + + + 246 + + + + + 247 + + + + + 248 + + + + + 250 + + + + + 252 + + + + + 256 + + + + + + + + 257 + + + + + 259 + + + + + 261 + + + + + + + + 262 + + + + + 263 + + + + + 264 + + + + + 267 + + + + + 273 + + + + + 274 + + + + + 275 + + + + + 276 + + + + + 277 + + + + + 279 + + + + + 282 + + + + + 284 + + + + + 290 + + + + + 291 + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin NetPcsxrHIDInputPluginMappingCell com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1017,9 +1823,65 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1028,32 +1890,16 @@ - 213 + 291 - NetPcsxrHIDInputPluginMappingCell - NSTextFieldCell - - IBProjectSource - ./Classes/NetPcsxrHIDInputPluginMappingCell.h - - - - NetPcsxrHIDInputPluginPadController - NSWindowController - - IBProjectSource - ./Classes/NetPcsxrHIDInputPluginPadController.h - - - - NetPcsxrHIDInputPluginPadView - NSView + NSLayoutConstraint + NSObject IBProjectSource - ./Classes/NetPcsxrHIDInputPluginPadView.h + ./Classes/NSLayoutConstraint.h @@ -1062,7 +1908,7 @@ IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx - + YES 3 @@ -1070,5 +1916,6 @@ {11, 11} {10, 3} + YES diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.m b/macosx/plugins/DFInput/macsrc/ControllerList.m index a1d4deed..41b38e2f 100755 --- a/macosx/plugins/DFInput/macsrc/ControllerList.m +++ b/macosx/plugins/DFInput/macsrc/ControllerList.m @@ -29,7 +29,9 @@ static int currentController; - (id)initWithConfig { - if (!(self = [super init])) return nil; + if (self = [super init]) { + + } return self; } diff --git a/macosx/plugins/DFInput/macsrc/PadController.m b/macosx/plugins/DFInput/macsrc/PadController.m index e3942158..1a4997c6 100755 --- a/macosx/plugins/DFInput/macsrc/PadController.m +++ b/macosx/plugins/DFInput/macsrc/PadController.m @@ -24,12 +24,22 @@ #include "pad.h" #import "ARCBridge.h" +static inline void RunOnMainThreadSync(dispatch_block_t block) +{ + if ([NSThread isMainThread]) { + block(); + } else { + dispatch_sync(dispatch_get_main_queue(), block); + } +} + static NSWindow *padWindow = nil; static PadController *padController = nil; #define APP_ID @"net.pcsxr.DFInputPlugin" -void DoAbout() { +void DoAbout() +{ // Get parent application instance NSApplication *app = [NSApplication sharedApplication]; NSBundle *bundle = [NSBundle bundleWithIdentifier:APP_ID]; @@ -65,19 +75,26 @@ void DoAbout() { RELEASEOBJ(infoPaneDict); } -long DoConfiguration() { - SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_NOPARACHUTE); - LoadPADConfig(); - - if (padWindow == nil) { - if (padController == nil) { - padController = [[PadController alloc] initWithWindowNibName:@"NetPcsxrHIDInputPluginMain"]; +long DoConfiguration() +{ + RunOnMainThreadSync(^{ +#if SDL_VERSION_ATLEAST(2, 0, 0) + SDL_InitSubSystem(SDL_INIT_JOYSTICK); +#else + SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_NOPARACHUTE); +#endif + LoadPADConfig(); + + if (padWindow == nil) { + if (padController == nil) { + padController = [[PadController alloc] initWithWindowNibName:@"NetPcsxrHIDInputPluginMain"]; + } + padWindow = [padController window]; } - padWindow = [padController window]; - } - - [padWindow center]; - [padWindow makeKeyAndOrderFront:nil]; + + [padWindow center]; + [padWindow makeKeyAndOrderFront:nil]; + }); return 0; } @@ -86,14 +103,22 @@ long DoConfiguration() { - (IBAction)cancel:(id)sender { +#if SDL_VERSION_ATLEAST(2, 0, 0) + SDL_QuitSubSystem(SDL_INIT_JOYSTICK); +#else SDL_Quit(); +#endif [self close]; } - (IBAction)ok:(id)sender { SavePADConfig(); +#if SDL_VERSION_ATLEAST(2, 0, 0) + SDL_QuitSubSystem(SDL_INIT_JOYSTICK); +#else SDL_Quit(); +#endif [self close]; } diff --git a/macosx/plugins/DFInput/macsrc/PadView.m b/macosx/plugins/DFInput/macsrc/PadView.m index e883a84f..f0fb801e 100755 --- a/macosx/plugins/DFInput/macsrc/PadView.m +++ b/macosx/plugins/DFInput/macsrc/PadView.m @@ -70,7 +70,14 @@ [deviceMenu addItemWithTitle:@"(Keyboard only)"]; for (i = 0; i < SDL_NumJoysticks(); i++) { - NSMenuItem * joystickItem = [[NSMenuItem alloc] initWithTitle:@(SDL_JoystickName(i)) action:NULL keyEquivalent:@""]; + NSMenuItem *joystickItem = nil; +#if SDL_VERSION_ATLEAST(2, 0, 0) + SDL_Joystick *tmpJoy = SDL_JoystickOpen(i); + joystickItem = [[NSMenuItem alloc] initWithTitle:@(SDL_JoystickName(tmpJoy)) action:NULL keyEquivalent:@""]; + SDL_JoystickClose(tmpJoy); +#else + joystickItem = [[NSMenuItem alloc] initWithTitle:@(SDL_JoystickName(i)) action:NULL keyEquivalent:@""]; +#endif [joystickItem setTag:i + 1]; [[deviceMenu menu] addItem:joystickItem]; RELEASEOBJ(joystickItem); diff --git a/macosx/plugins/DFInput/macsrc/cfg.c b/macosx/plugins/DFInput/macsrc/cfg.c index 33013c44..b9d1e7c6 100755 --- a/macosx/plugins/DFInput/macsrc/cfg.c +++ b/macosx/plugins/DFInput/macsrc/cfg.c @@ -17,6 +17,7 @@ */ #include "pad.h" +#include GLOBALDATA g; @@ -114,7 +115,7 @@ static void SetDefaultConfig() { void LoadPADConfig() { FILE *fp; - char buf[256]; + char buf[PATH_MAX]; int current, a, b, c; SetDefaultConfig(); @@ -276,7 +277,7 @@ void LoadPADConfig() { void SavePADConfig() { FILE *fp; int i; - char buf[256]; + char buf[PATH_MAX]; sprintf(buf, "%s/Library/Preferences/net.pcsxr.DFInput.plist", getenv("HOME")); diff --git a/macosx/plugins/DFNet/English.lproj/DFNet.xib b/macosx/plugins/DFNet/English.lproj/DFNet.xib index bb2868f0..d39e4d92 100644 --- a/macosx/plugins/DFNet/English.lproj/DFNet.xib +++ b/macosx/plugins/DFNet/English.lproj/DFNet.xib @@ -1,7 +1,7 @@ - 1060 + 1070 12E55 3084 1187.39 @@ -11,6 +11,7 @@ 3084 + IBNSLayoutConstraint NSButton NSButtonCell NSCustomObject @@ -40,7 +41,7 @@ 15 2 - {{196, 240}, {340, 151}} + {{196, 240}, {340, 160}} 544735232 Settings NSWindow @@ -51,36 +52,10 @@ 256 - - - 268 - {{230, 13}, {96, 32}} - - - YES - - 67108864 - 134217728 - Okay - - LucidaGrande - 13 - 1044 - - - -2038284288 - 129 - - - 200 - 25 - - NO - 268 - {{126, 109}, {194, 22}} + {{126, 118}, {194, 22}} @@ -89,7 +64,11 @@ -1804599231 272630784 127.0.0.1 - + + LucidaGrande + 13 + 1044 + YES @@ -113,33 +92,10 @@ NO - - - 268 - {{134, 13}, {96, 32}} - - - - YES - - 67108864 - 134217728 - Cancel - - - -2038284288 - 129 - - Gw - 200 - 25 - - NO - 268 - {{126, 79}, {194, 22}} + {{126, 86}, {194, 22}} @@ -198,7 +154,7 @@ 268 - {{17, 111}, {75, 17}} + {{17, 120}, {75, 17}} @@ -230,7 +186,7 @@ 268 - {{17, 81}, {38, 17}} + {{17, 88}, {38, 17}} @@ -249,7 +205,7 @@ 268 - {{17, 51}, {101, 17}} + {{17, 56}, {101, 17}} @@ -268,10 +224,10 @@ 268 - {{126, 49}, {194, 22}} + {{126, 54}, {194, 22}} - + YES -1804599231 @@ -322,8 +278,58 @@ NO + + + 268 + {{267, 13}, {59, 32}} + + + + _NS:9 + YES + + 67108864 + 134217728 + OK + + _NS:9 + + -2038284288 + 129 + + DQ + 200 + 25 + + NO + + + + 268 + {{185, 13}, {82, 32}} + + + + _NS:9 + YES + + 67108864 + 134217728 + Cancel + + _NS:9 + + -2038284288 + 129 + + Gw + 200 + 25 + + NO + - {340, 151} + {340, 160} @@ -344,22 +350,6 @@ 3 - - - ok: - - - - 8 - - - - cancel: - - - - 15 - ipAddress @@ -423,35 +413,326 @@ 2 - - - + + + 5 + 0 + + 6 + 1 + + 12 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 10 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 10 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + + - - + - - 6 - - - - - - - - 7 - - - 9 + + + 7 + 0 + + 0 + 1 + + 194 + + 1000 + + 3 + 9 + 1 + @@ -460,19 +741,6 @@ - - 13 - - - - - - - - 14 - - - 17 @@ -507,6 +775,22 @@ + + + 7 + 0 + + 0 + 1 + + 32 + + 1000 + + 3 + 9 + 1 + @@ -554,6 +838,132 @@ + + 32 + + + + + 35 + + + + + 46 + + + + + 47 + + + + + 48 + + + + + 49 + + + + + 52 + + + + + 54 + + + + + + + + 55 + + + + + 57 + + + + + 58 + + + + + 59 + + + + + + + + 60 + + + + + 61 + + + + + 63 + + + + + 45 + + + + + 31 + + + + + 72 + + + + + 74 + + + + + 78 + + + + + 79 + + + + + 82 + + + + + 83 + + + + + 84 + + + @@ -564,24 +974,44 @@ {{577, 640}, {372, 270}} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - 126 - 0 - + + + + + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -590,15 +1020,43 @@ com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin - 30 + 84 @@ -610,15 +1068,24 @@ ./Classes/DFNetPlayPluginConfigController.h + + NSLayoutConstraint + NSObject + + IBProjectSource + ./Classes/NSLayoutConstraint.h + + 0 IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx - + YES 3 + YES diff --git a/macosx/plugins/DFNet/English.lproj/SockDialog.xib b/macosx/plugins/DFNet/English.lproj/SockDialog.xib index 6c2808d2..8225e87f 100644 --- a/macosx/plugins/DFNet/English.lproj/SockDialog.xib +++ b/macosx/plugins/DFNet/English.lproj/SockDialog.xib @@ -1,7 +1,7 @@ - 1060 + 1070 12E55 3084 1187.39 @@ -11,6 +11,7 @@ 3084 + IBNSLayoutConstraint NSButton NSButtonCell NSCustomObject @@ -40,7 +41,7 @@ 15 2 - {{196, 371}, {380, 140}} + {{196, 371}, {380, 124}} 544735232 Window NSWindow @@ -55,7 +56,7 @@ 268 - {{78, 103}, {225, 17}} + {{78, 87}, {225, 17}} @@ -97,24 +98,26 @@ {{103, 60}, {174, 20}} - + 24586 100 - + 268 - {{142, 13}, {96, 32}} + {{149, 13}, {82, 32}} + _NS:9 YES - + 67108864 134217728 Cancel - + _NS:9 + -2038284288 129 @@ -125,7 +128,7 @@ NO - {380, 140} + {380, 124} @@ -150,9 +153,17 @@ cancel: - + - 10 + 31 + + + + spinningBar + + + + 32 @@ -193,9 +204,105 @@ 2 - - + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 5 + 22 + 2 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + @@ -204,6 +311,22 @@ + + + 7 + 0 + + 0 + 1 + + 219 + + 1000 + + 3 + 9 + 1 + @@ -215,20 +338,78 @@ 6 + + + + 7 + 0 + + 0 + 1 + + 174 + + 1000 + + 3 + 9 + 1 + + - 7 - + 11 + + + + + 14 + + + + + 17 + + + + + 19 + + + + + 21 + + + + + 26 + - + - 8 - - + 27 + + + + + 28 + + + + + 29 + + + + + 30 + + @@ -239,21 +420,54 @@ com.apple.InterfaceBuilder.CocoaPlugin {{322, 765}, {382, 139}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - 10 + 32 + + NSLayoutConstraint + NSObject + + IBProjectSource + ./Classes/NSLayoutConstraint.h + + SockDialog NSWindowController @@ -268,6 +482,17 @@ id + + spinningBar + NSProgressIndicator + + + spinningBar + + spinningBar + NSProgressIndicator + + IBProjectSource ./Classes/SockDialog.h @@ -279,9 +504,10 @@ IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx - + YES 3 + YES diff --git a/macosx/plugins/DFNet/macsrc/PluginConfigController.m b/macosx/plugins/DFNet/macsrc/PluginConfigController.m index c25bd8bf..bb3b1061 100755 --- a/macosx/plugins/DFNet/macsrc/PluginConfigController.m +++ b/macosx/plugins/DFNet/macsrc/PluginConfigController.m @@ -32,6 +32,15 @@ static PluginConfigController *windowController = nil; +static inline void RunOnMainThreadSync(dispatch_block_t block) +{ + if ([NSThread isMainThread]) { + block(); + } else { + dispatch_sync(dispatch_get_main_queue(), block); + } +} + void AboutDlgProc() { // Get parent application instance @@ -70,17 +79,19 @@ void AboutDlgProc() void ConfDlgProc() { - NSWindow *window; - - if (windowController == nil) { - windowController = [[PluginConfigController alloc] initWithWindowNibName:@"DFNet"]; - } - window = [windowController window]; - - [windowController loadValues]; - - [window center]; - [window makeKeyAndOrderFront:nil]; + RunOnMainThreadSync(^{ + NSWindow *window; + + if (windowController == nil) { + windowController = [[PluginConfigController alloc] initWithWindowNibName:@"DFNet"]; + } + window = [windowController window]; + + [windowController loadValues]; + + [window center]; + [window makeKeyAndOrderFront:nil]; + }); } void ReadConfig() diff --git a/macosx/plugins/DFNet/macsrc/SockDialog.h b/macosx/plugins/DFNet/macsrc/SockDialog.h index 2898ceec..18f10bfd 100755 --- a/macosx/plugins/DFNet/macsrc/SockDialog.h +++ b/macosx/plugins/DFNet/macsrc/SockDialog.h @@ -9,8 +9,9 @@ #import -@interface SockDialog : NSWindowController { - +@interface SockDialog : NSWindowController +{ + IBOutlet NSProgressIndicator *spinningBar; } - (IBAction)cancel:(id)sender; @end diff --git a/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib index 86afd475..6deb8a23 100644 --- a/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib +++ b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib @@ -1,7 +1,7 @@ - 1060 + 1070 12E55 3084 1187.39 @@ -11,10 +11,12 @@ 3084 + IBNSLayoutConstraint NSBox NSButton NSButtonCell NSCustomObject + NSMatrix NSSlider NSSliderCell NSTextField @@ -70,6 +72,7 @@ + {250, 750} YES 67108864 @@ -140,6 +143,7 @@ + {250, 750} YES 67108864 @@ -182,10 +186,11 @@ 256 - {{274, 83}, {133, 17}} + {{274, 86}, {133, 17}} + {250, 750} YES 67108864 @@ -205,10 +210,11 @@ 256 - {{274, 51}, {133, 17}} + {{274, 54}, {133, 17}} + {250, 750} YES 67108864 @@ -224,10 +230,11 @@ 256 - {{13, 21}, {96, 17}} + {{14, 26}, {96, 17}} + {250, 750} YES 67108864 @@ -243,7 +250,7 @@ 256 - {{127, 19}, {144, 26}} + {{127, 20}, {144, 26}} @@ -270,10 +277,11 @@ 256 - {{274, 18}, {133, 17}} + {{274, 26}, {133, 17}} + {250, 750} YES 67108864 @@ -334,10 +342,10 @@ 256 - {{21, 60}, {153, 18}} + {{15, 57}, {153, 18}} - + YES 67108864 @@ -358,13 +366,13 @@ NO - {{2, 2}, {189, 96}} + {{2, 2}, {199, 83}} - {{256, 56}, {193, 113}} + {{246, 69}, {203, 100}} @@ -394,91 +402,94 @@ 274 - + 256 - {{18, 58}, {199, 18}} + {{17, 13}, {199, 60}} - YES - - 67108864 - 0 - High Compatibility Mode - - - 1211912448 - 2 - - NSImage - NSSwitch - - - - - 200 - 25 - - NO - - - - 256 - {{18, 38}, {199, 18}} - - - - YES - - 67108864 - 0 - SPU IRQ Wait - - - 1211912448 - 2 - - - - - 200 - 25 - NO - - - - 256 - {{18, 16}, {199, 18}} - - - - YES - + 3 + 1 + + + 67108864 + 0 + High Compatibility Mode + + + 1211912448 + 2 + + NSImage + NSSwitch + + + + + 200 + 25 + + + 67108864 + 0 + SPU IRQ Wait + + + 1211912448 + 2 + + + + + 200 + 25 + + + 67108864 + 0 + Mono Sound + + + 1211912448 + 2 + + + + 200 + 25 + + + {199, 18} + {0, 3} + -2080366592 + + 67108864 0 - Mono Sound + High Compatibility Mode - 1211912448 2 - 200 25 - NO + -1 + -1 + + - {{2, 2}, {224, 96}} + {{2, 2}, {223, 83}} - + - {{17, 56}, {228, 113}} + {{17, 69}, {227, 100}} @@ -500,23 +511,24 @@ 2 NO - + - 256 - {{330, 12}, {122, 32}} + 268 + {{393, 13}, {59, 32}} + _NS:9 YES - + 67108864 134217728 OK - + _NS:9 + -2038284288 - 1 - + 129 DQ 200 @@ -524,23 +536,24 @@ NO - + - 256 - {{208, 12}, {122, 32}} + 268 + {{311, 13}, {82, 32}} - + + _NS:9 YES - + 67108864 134217728 Cancel - + _NS:9 + -2038284288 - 1 - + 129 Gw 200 @@ -548,23 +561,24 @@ NO - + - 256 - {{14, 12}, {122, 32}} + 268 + {{14, 13}, {75, 32}} - + + _NS:9 YES - + 67108864 134217728 Reset - + _NS:9 + -2038284288 - 1 - + 129 200 @@ -594,30 +608,6 @@ 39 - - - ok: - - - - 60 - - - - cancel: - - - - 61 - - - - reset: - - - - 63 - reverbValue @@ -650,29 +640,53 @@ 66 + + + reset: + + + + 175 + + + + ok: + + + + 176 + + + + cancel: + + + + 177 + hiCompBox - + - 54 + 203 irqWaitBox - + - 56 + 204 monoSoundBox - + - 57 + 205 @@ -698,14 +712,6 @@ 44 - - - nextKeyView - - - - 45 - takeStringValueFrom: @@ -722,38 +728,6 @@ 42 - - - nextKeyView - - - - 50 - - - - nextKeyView - - - - 47 - - - - nextKeyView - - - - 51 - - - - nextKeyView - - - - 52 - nextKeyView @@ -804,12 +778,268 @@ 5 - + + + 5 + 0 + + 6 + 1 + + 12 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 249 + + 1000 + + 3 + 9 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + + - - - @@ -821,10 +1051,426 @@ + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 3 + 9 + 3 + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 3 + 1 + + 32 + + 1000 + + 9 + 40 + 3 + + + + 5 + 0 + + 5 + 1 + + 128 + + 1000 + + 3 + 9 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 15 + + 1000 + + 3 + 9 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + - @@ -833,6 +1479,38 @@ 19 + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 25 + + 1000 + + 8 + 29 + 3 + @@ -841,51 +1519,58 @@ 24 - - - - - - - - 37 - - - - - - - - 38 - - - - - - - - 62 - - - + + + 4 + 0 + + 4 + 1 + + 11 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 25 + + 1000 + + 8 + 29 + 3 + + - - 93 - - - - - 94 - - - - - 95 - - - -3 @@ -897,6 +1582,38 @@ + + + 8 + 0 + + 0 + 1 + + 17 + + 1000 + + 3 + 9 + 1 + + + + 7 + 0 + + 0 + 1 + + 90 + + 1000 + + 3 + 9 + 1 + @@ -910,6 +1627,22 @@ + + + 7 + 0 + + 0 + 1 + + 140 + + 1000 + + 3 + 9 + 1 + @@ -923,6 +1656,22 @@ + + + 8 + 0 + + 0 + 1 + + 17 + + 1000 + + 3 + 9 + 1 + @@ -949,6 +1698,22 @@ + + + 7 + 0 + + 0 + 1 + + 127 + + 1000 + + 3 + 9 + 1 + @@ -975,6 +1740,22 @@ + + + 7 + 0 + + 0 + 1 + + 90 + + 1000 + + 3 + 9 + 1 + @@ -1001,6 +1782,22 @@ + + + 8 + 0 + + 0 + 1 + + 17 + + 1000 + + 3 + 9 + 1 + @@ -1014,6 +1811,22 @@ + + + 7 + 0 + + 0 + 1 + + 149 + + 1000 + + 3 + 9 + 1 + @@ -1023,43 +1836,349 @@ - 25 - + 107 + + + + + 108 + + + + + 109 + + + + + 111 + + + + + 112 + + + + + 122 + + + + + 127 + + + + + 129 + + + + + 131 + + + + + 133 + + + + + 134 + + + + + 136 + + + + + 137 + + + + + 140 + + + + + 141 + + + + + 145 + + + + + 147 + + + + + 148 + + + + + 149 + + + + + 150 + + + + + 151 + + + + + 152 + + + + + 153 + + + + + 154 + + + + + 157 + + + + + 162 + - + - + - 90 - - + 163 + + + + + 164 + + - 26 - + 165 + + + + + 166 + - + - + - 91 - - + 167 + + + + + 169 + + + + + 170 + + + + + 171 + + + + + - 33 - + 172 + + + + + 173 + + + + + 174 + + + + + 180 + + + + + 181 + + + + + 182 + + + + + 183 + + + + + 186 + + + + + 188 + + + + + 189 + + + + + 191 + + + + + 193 + + + + + 194 + + + + + 195 + + + + + 196 + + + + + + 197 + + + 92 - + + + + 91 + + + + + 90 + + + + + 206 + + + + + 207 + + + + + 209 + + + + + 210 + + + + + 213 + + + + + 214 + + + + + 222 + + + + + 224 + + + + + 225 + + + + + 226 + + + + + 227 + + + + + 228 + + + + + 229 + + @@ -1067,44 +2186,150 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin NamedSlider + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin NamedSlider + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Should always be enabled. Only disable this option if the emulator doesn't support the SPUupdate/async plugin interface. - - - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - When enabled the plugin will waits for CPU action which a few games requires (Metal Gears Solid + others) - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin NamedSlider + com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1116,22 +2341,56 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - 95 + 232 + + NSLayoutConstraint + NSObject + + IBProjectSource + ./Classes/NSLayoutConstraint.h + + NamedSlider NSSlider @@ -1163,10 +2422,10 @@ - NSControl + NSCell NamedSlider - NSControl - NSControl + NSCell + NSCell NamedSlider NamedSlider NSControl @@ -1175,7 +2434,7 @@ hiCompBox - NSControl + NSCell interpolValue @@ -1183,11 +2442,11 @@ irqWaitBox - NSControl + NSCell monoSoundBox - NSControl + NSCell reverbValue @@ -1217,7 +2476,7 @@ IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx - + YES 3 @@ -1225,5 +2484,6 @@ NSSwitch {15, 15} + YES diff --git a/macosx/plugins/DFSound/macsrc/PluginController.m b/macosx/plugins/DFSound/macsrc/PluginController.m index 88d23d03..c323967d 100755 --- a/macosx/plugins/DFSound/macsrc/PluginController.m +++ b/macosx/plugins/DFSound/macsrc/PluginController.m @@ -44,6 +44,15 @@ extern char* PLUGLOC(char* toloc); static SPUPluginController *pluginController = nil; +static inline void RunOnMainThreadSync(dispatch_block_t block) +{ + if ([NSThread isMainThread]) { + block(); + } else { + dispatch_sync(dispatch_get_main_queue(), block); + } +} + void DoAbout() { // Get parent application instance @@ -81,18 +90,20 @@ void DoAbout() long DoConfiguration() { - NSWindow *window; - - if (pluginController == nil) { - pluginController = [[PluginController alloc] initWithWindowNibName:@"NetSfPeopsSpuPluginMain"]; - } - window = [pluginController window]; - - /* load values */ - [pluginController loadValues]; - - [window center]; - [window makeKeyAndOrderFront:nil]; + RunOnMainThreadSync(^{ + NSWindow *window; + + if (pluginController == nil) { + pluginController = [[PluginController alloc] initWithWindowNibName:@"NetSfPeopsSpuPluginMain"]; + } + window = [pluginController window]; + + /* load values */ + [pluginController loadValues]; + + [window center]; + [window makeKeyAndOrderFront:nil]; + }); return 0; } @@ -137,7 +148,7 @@ void ReadConfig(void) { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:keyValues]; + NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:self.keyValues]; [writeDic setObject:@((BOOL)[hiCompBox intValue]) forKey:@"High Compatibility Mode"]; [writeDic setObject:@((BOOL)[irqWaitBox intValue]) forKey:@"SPU IRQ Wait"]; [writeDic setObject:@((BOOL)[monoSoundBox intValue]) forKey:@"Mono Sound Output"]; @@ -172,8 +183,7 @@ void ReadConfig(void) ReadConfig(); /* load from preferences */ - RELEASEOBJ(keyValues); - keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy]; + self.keyValues = [NSMutableDictionary dictionaryWithDictionary:[defaults dictionaryForKey:PrefsKey]]; [hiCompBox setIntValue:[[keyValues objectForKey:@"High Compatibility Mode"] boolValue]]; [irqWaitBox setIntValue:[[keyValues objectForKey:@"SPU IRQ Wait"] boolValue]]; diff --git a/macosx/plugins/DFSound/macsrc/SPUPluginController.h b/macosx/plugins/DFSound/macsrc/SPUPluginController.h index e6a61308..53b64aec 100644 --- a/macosx/plugins/DFSound/macsrc/SPUPluginController.h +++ b/macosx/plugins/DFSound/macsrc/SPUPluginController.h @@ -8,13 +8,14 @@ #import #import "NamedSlider.h" +#import "ARCBridge.h" @interface SPUPluginController : NSWindowController { - IBOutlet NSControl *hiCompBox; + IBOutlet NSCell *hiCompBox; IBOutlet NamedSlider *interpolValue; - IBOutlet NSControl *irqWaitBox; - IBOutlet NSControl *monoSoundBox; + IBOutlet NSCell *irqWaitBox; + IBOutlet NSCell *monoSoundBox; IBOutlet NamedSlider *reverbValue; IBOutlet NSControl *xaEnableBox; IBOutlet NSControl *xaSpeedBox; @@ -22,6 +23,7 @@ NSMutableDictionary *keyValues; } +@property (readwrite, arcretain) NSMutableDictionary *keyValues; - (IBAction)cancel:(id)sender; - (IBAction)ok:(id)sender; - (IBAction)reset:(id)sender; diff --git a/macosx/plugins/DFSound/macsrc/SPUPluginController.m b/macosx/plugins/DFSound/macsrc/SPUPluginController.m index bb225b51..83598618 100644 --- a/macosx/plugins/DFSound/macsrc/SPUPluginController.m +++ b/macosx/plugins/DFSound/macsrc/SPUPluginController.m @@ -8,9 +8,7 @@ #import "SPUPluginController.h" -@implementation SPUPluginController - -static Class GetSPUBaseClass() +static inline Class GetSPUBaseClass() { static Class spuBaseClass; if (!spuBaseClass) { @@ -19,7 +17,7 @@ static Class GetSPUBaseClass() return spuBaseClass; } -static inline void FuncNotAvailable(id sel, id sender, SEL theCmd) +static void FuncNotAvailable(id sel, id sender, SEL theCmd) { #ifdef DEBUG NSString *selString = NSStringFromSelector(theCmd); @@ -39,6 +37,9 @@ static inline void FuncNotAvailable(id sel, id sender, SEL theCmd) #define NotAvailableWarn(sender) FuncNotAvailable(self, sender, _cmd) +@implementation SPUPluginController +@synthesize keyValues; + - (IBAction)cancel:(id)sender { NotAvailableWarn(sender); @@ -59,4 +60,13 @@ static inline void FuncNotAvailable(id sel, id sender, SEL theCmd) NotAvailableWarn(nil); } +#if !__has_feature(objc_arc) +- (void)dealloc +{ + self.keyValues = nil; + + [super dealloc]; +} +#endif + @end diff --git a/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib b/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib index 77c86ba9..f21ac836 100644 --- a/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib +++ b/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib @@ -1,20 +1,22 @@ - 1060 - 12D78 + 1070 + 12E55 3084 - 1187.37 + 1187.39 626.00 com.apple.InterfaceBuilder.CocoaPlugin 3084 + IBNSLayoutConstraint NSBox NSButton NSButtonCell NSCustomObject + NSMatrix NSMenu NSMenuItem NSPopUpButton @@ -44,7 +46,7 @@ 1 2 - {{411, 163}, {466, 516}} + {{411, 163}, {466, 564}} 1886912512 GPU Configuration NSWindow @@ -57,81 +59,6 @@ 256 - - - 256 - {{208, 13}, {122, 32}} - - - - YES - - 67108864 - 134217728 - Cancel - - LucidaGrande - 13 - 1044 - - - -2038284288 - 1 - - - Gw - 200 - 25 - - NO - - - - 256 - {{330, 13}, {122, 32}} - - - YES - - 67108864 - 134217728 - OK - - - -2038284288 - 1 - - - DQ - 200 - 25 - - NO - - - - 256 - {{14, 13}, {122, 32}} - - - - YES - - 67108864 - 134217728 - Reset - - - -2038284288 - 1 - - - - 200 - 25 - - NO - 256 @@ -140,175 +67,14 @@ 274 - - - 256 - {{17, 23}, {144, 18}} - - - - 6 - YES - - 67108864 - 131072 - Use PC FPS calculation - - LucidaGrande - 11 - 3100 - - - 6 - 1211912448 - 2 - - NSSwitch - - - - 200 - 25 - - NO - - - - 256 - {{17, 83}, {135, 18}} - - - - 2 - YES - - 67108864 - 131072 - Expand screen width - - - 2 - 1211912448 - 2 - - - - 200 - 25 - - NO - - - - 256 - {{219, 83}, {159, 18}} - - - - 8 - YES - - 67108864 - 131072 - Use old frame skipping - - - 8 - 1211912448 - 2 - - - - 200 - 25 - - NO - - - - 256 - {{219, 103}, {132, 18}} - - - - 7 - YES - - 67108864 - 131072 - Lazy screen updates - - - 7 - 1211912448 - 2 - - - - 200 - 25 - - NO - - - - 256 - {{17, 43}, {135, 18}} - - - - 4 - YES - - 67108864 - 131072 - Disable coord check - - - 4 - 1211912448 - 2 - - - - 200 - 25 - - NO - - - - 256 - {{17, 63}, {180, 18}} - - - - 3 - YES - - 67108864 - 131072 - Ignore black brightness color - - - 3 - 1211912448 - 2 - - - - 200 - 25 - - NO - 256 - {{17, 127}, {362, 28}} + {{33, 137}, {362, 28}} - + + {250, 750} YES 67108864 @@ -316,7 +82,11 @@ T25seSBlbmFibGUgYSBoYWNrIHRvIGZpeCBhIHNwZWNpZmljIHByb2JsZW0gaW4gYSBnYW1lLgpIb2xk IHRoZSBtb3VzZSBvdmVyIGEgY2hlY2tib3ggdG8gZ2V0IG1vcmUgaW5mb3JtYXRpb24gYWJvdXQgaXQu A - + + LucidaGrande + 11 + 3100 + 6 @@ -339,109 +109,192 @@ A NO - + 256 - {{17, 103}, {130, 18}} + {{20, 31}, {388, 98}} - - 1 + YES - + NO + 5 + 2 + + + 67108864 + 131072 + Odd/even bit hack + + + 1 + 1211912448 + 2 + + NSSwitch + + + + 200 + 25 + + + 67108864 + 131072 + Lazy screen updates + + + 7 + 1211912448 + 2 + + + + 200 + 25 + + + 67108864 + 131072 + Expand screen width + + + 2 + 1211912448 + 2 + + + + 200 + 25 + + + 67108864 + 131072 + Use old frame skipping + + + 8 + 1211912448 + 2 + + + + 200 + 25 + + + 67108864 + 131072 + Ignore black brightness color + + + 3 + 1211912448 + 2 + + + + 200 + 25 + + + 67108864 + 131072 + Repeated flat tex triangles + + + 9 + 1211912448 + 2 + + + + 200 + 25 + + + 67108864 + 131072 + Disable coord check + + + 4 + 1211912448 + 2 + + + + 200 + 25 + + + 67108864 + 131072 + Draw tex-quads as triangles + + + 10 + 1211912448 + 2 + + + + 200 + 25 + + + 67108864 + 131072 + Use PC FPS calculation + + + 6 + 1211912448 + 2 + + + + 200 + 25 + + + 67108864 + 131072 + Fake 'gpu busy' states + + + 11 + 1211912448 + 2 + + + + 200 + 25 + + + {192, 18} + {4, 2} + -2080366592 + + 67108864 131072 Odd/even bit hack - 1 1211912448 2 - - 200 - 25 - - NO - - - - 256 - {{219, 43}, {189, 18}} - - - - 10 - YES - - 67108864 - 131072 - Draw tex-quads as triangles - - - 10 - 1211912448 - 2 - - - - 200 - 25 - - NO - - - - 256 - {{219, 63}, {195, 18}} - - - - 9 - YES - - 67108864 - 131072 - Repeated flat tex triangles - - - 9 - 1211912448 - 2 - - - - 200 - 25 - - NO - - - - 256 - {{219, 23}, {189, 18}} - - - - 11 - YES - - 67108864 - 131072 - Fake 'gpu busy' states - - - 11 - 1211912448 - 2 - - - 200 25 - NO + -1 + -1 + + {{2, 2}, {428, 175}} @@ -450,7 +303,7 @@ A - {{17, 179}, {432, 192}} + {{17, 213}, {432, 192}} @@ -491,7 +344,7 @@ A -2147483392 - {{18, 16}, {189, 18}} + {{18, 32}, {189, 18}} @@ -500,7 +353,11 @@ A 67108864 0 Sync to Monitor Refresh - + + LucidaGrande + 13 + 1044 + 1211912448 2 @@ -515,7 +372,7 @@ A 256 - {{18, 60}, {147, 18}} + {{18, 72}, {147, 18}} @@ -539,7 +396,7 @@ A 256 - {{18, 82}, {148, 18}} + {{18, 92}, {148, 18}} @@ -563,7 +420,7 @@ A -2147483392 - {{18, 38}, {125, 18}} + {{18, 52}, {125, 18}} @@ -585,13 +442,13 @@ A NO - {{2, 2}, {207, 118}} + {{2, 2}, {216, 118}} - {{17, 375}, {211, 135}} + {{17, 409}, {220, 135}} @@ -624,10 +481,11 @@ A 256 - {{15, 95}, {144, 17}} + {{14, 95}, {144, 17}} + {250, 750} YES 67108864 @@ -728,7 +586,7 @@ A 256 - {{16, 36}, {131, 18}} + {{15, 44}, {118, 18}} @@ -752,7 +610,7 @@ A 268 - {{16, 16}, {118, 18}} + {{15, 24}, {118, 18}} @@ -780,13 +638,13 @@ A NO - {{2, 2}, {206, 118}} + {{2, 2}, {203, 118}} - {{239, 375}, {210, 135}} + {{242, 409}, {207, 135}} @@ -819,7 +677,7 @@ A 268 - {{333, 64}, {89, 32}} + {{333, 88}, {89, 32}} @@ -845,10 +703,10 @@ A 268 - {{333, 31}, {89, 32}} + {{333, 55}, {89, 32}} - + _NS:9 2 YES @@ -871,7 +729,7 @@ A 268 - {{85, 73}, {249, 17}} + {{85, 98}, {249, 17}} @@ -892,7 +750,7 @@ A 268 - {{85, 43}, {249, 17}} + {{85, 65}, {249, 17}} @@ -913,7 +771,7 @@ A 268 - {{15, 73}, {50, 17}} + {{15, 98}, {50, 17}} @@ -934,7 +792,7 @@ A 268 - {{15, 43}, {68, 17}} + {{15, 65}, {68, 17}} @@ -955,10 +813,10 @@ A 268 - {{85, 11}, {100, 26}} + {{86, 26}, {100, 26}} - + _NS:9 YES @@ -1036,10 +894,10 @@ A 268 - {{15, 17}, {53, 17}} + {{15, 32}, {53, 17}} - + _NS:1535 YES @@ -1055,14 +913,14 @@ A NO - {{1, 1}, {430, 102}} + {{1, 1}, {430, 126}} _NS:11 - {{17, 57}, {432, 118}} + {{17, 67}, {432, 142}} @@ -1085,13 +943,87 @@ A 2 NO - - {466, 516} - - - - - {{0, 0}, {1920, 1058}} + + + 268 + {{393, 13}, {59, 32}} + + + _NS:9 + YES + + 67108864 + 134217728 + OK + + _NS:9 + + -2038284288 + 129 + + DQ + 200 + 25 + + NO + + + + 268 + {{311, 13}, {82, 32}} + + + + _NS:9 + YES + + 67108864 + 134217728 + Cancel + + _NS:9 + + -2038284288 + 129 + + Gw + 200 + 25 + + NO + + + + 268 + {{14, 13}, {75, 32}} + + + + _NS:9 + YES + + 67108864 + 134217728 + Reset + + _NS:9 + + -2038284288 + 129 + + + 200 + 25 + + NO + + + {466, 564} + + + + + {{0, 0}, {1920, 1058}} {283.34100000000001, 129} {10000000000000, 10000000000000} YES @@ -1099,30 +1031,6 @@ A - - - ok: - - - - 133 - - - - cancel: - - - - 134 - - - - reset: - - - - 135 - hacksView @@ -1275,6 +1183,38 @@ A 234 + + + reset: + + + + 391 + + + + cancel: + + + + 392 + + + + ok: + + + + 393 + + + + hacksMatrix + + + + 606 + delegate @@ -1291,14 +1231,6 @@ A 145 - - - nextKeyView - - - - 9 - @@ -1333,55 +1265,438 @@ A 6 - + + + 5 + 0 + + 6 + 1 + + 12 + + 1000 + + 6 + 24 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 71 + + 1000 + + 3 + 9 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 3 + 0 + + 3 + 1 + + 355 + + 1000 + + 3 + 9 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 245 + + 1000 + + 3 + 9 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + + 9 + 40 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 159 + + 1000 + + 9 + 40 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 9 + 40 + 3 + + + + 6 + 0 + + 6 + 1 + + 232 + + 1000 + + 3 + 9 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 9 + 40 + 2 + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + - + - - - + - - 7 - - - - - - - - 8 - - - - - - - - 10 - - - - - - 76 - - - - - - + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 5 + 22 + 2 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 3 + 0 + + 3 + 1 + + 25 + + 1000 + + 8 + 29 + 3 + + - - - - @@ -1389,9 +1704,137 @@ A 89 + + + 3 + 0 + + 4 + 1 + + 6 + + 1000 + + 6 + 24 + 3 + + + + 3 + 0 + + 4 + 1 + + 6 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 6 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 3 + 1 + + 25 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 19 + + 1000 + + 3 + 9 + 3 + + - @@ -1400,28 +1843,173 @@ A 107 + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 6 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 73 + + 1000 + + 9 + 40 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 21 + + 1000 + + 3 + 9 + 3 + + + - - - - 158 - - - - - 159 - - - - - 160 - - - -3 @@ -1433,6 +2021,22 @@ A + + + 7 + 0 + + 0 + 1 + + 356 + + 1000 + + 3 + 9 + 1 + @@ -1446,6 +2050,22 @@ A + + + 7 + 0 + + 0 + 1 + + 185 + + 1000 + + 3 + 9 + 1 + @@ -1498,6 +2118,22 @@ A + + + 7 + 0 + + 0 + 1 + + 138 + + 1000 + + 3 + 9 + 1 + @@ -1564,35 +2200,307 @@ A 179 - - - - - - - - - - - - - 182 - - - - - - - - 183 - - - - - 184 - - - + + + 3 + 0 + + 4 + 1 + + 12 + + 1000 + + 9 + 40 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 3 + 0 + + 3 + 1 + + 25 + + 1000 + + 8 + 29 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 9 + 40 + 2 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 9 + 40 + 2 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 16 + + 1000 + + 9 + 40 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 9 + 40 + 2 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 9 + 40 + 2 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + + + + + + + + + + + 182 + + + + + + + + 183 + + + + + 184 + + + @@ -1606,6 +2514,22 @@ A + + + 7 + 0 + + 0 + 1 + + 243 + + 1000 + + 3 + 9 + 1 + @@ -1654,207 +2578,535 @@ A - 180 - - - - - + 180 + + + + + + + + 181 + + + + + 219 + + + + + + 7 + 0 + + 0 + 1 + + 95 + + 1000 + + 3 + 9 + 1 + + + + + + 220 + + + + + + + + 221 + + + + + + + + + + + 222 + + + + + 223 + + + + + 224 + + + + + 225 + + + + + + + + 226 + + + + + 227 + + + + + 237 + + + + + 240 + + + + + 241 + + + + + 242 + + + + + 244 + + + + + 247 + + + + + 248 + + + + + 250 + + + + + 251 + + + + + 254 + + + + + 255 + + + + + 258 + + + + + 261 + + + + + 268 + + + + + 279 + + + + + 308 + + + + + 311 + + + + + 318 + + + + + 319 + + + + + 320 + + + + + 321 + + + + + 324 + + + + + 333 + + + + + 336 + + + + + 337 + + + + + 339 + + + + + 347 + + + + + 358 + + + + + 310 + + + + + 309 + + + + + 371 + + + + + + + + 372 + + + + + 375 + + + + + + + + 376 + + + + + 381 + + + + + + + + 382 + + + + + 383 + + + + + 386 + + + + + 387 + + + + + 388 + + + + + 389 + + + + + 390 + + + + + 396 + + + + + 517 + + + + + 530 + + + + + + + + + + + + + + + + + + 531 + + + + + 163 + + + + + 171 + + + + + 164 + + + + + 169 + + + + + 161 + + + + + 170 + + + + + 166 + + - 181 - - + 165 + + - 82 - - - - - + 168 + + 167 - + - 147 - - - - + 545 + - 168 - - + 548 + + - 79 - - - - + 549 + - 165 - - + 560 + + - 80 - - - - - + 561 + + - 166 - - + 563 + + - 149 - - - - - + 565 + + - 170 - - + 566 + + - 73 - - - - - + 574 + + - 161 - - + 575 + + - 148 - - - - - + 576 + + - 169 - - + 577 + + - 78 - - - - - + 578 + + - 164 - - + 579 + + - 150 - - - - - + 580 + + - 171 - - + 581 + + - 75 - - - - - + 582 + + - 163 - - + 583 + + - 219 - - - - - + 590 + + - 220 - - - - - + 591 + + - 221 - - - - - - - - + 592 + + - 222 - - + 593 + + - 223 - - + 594 + + - 224 - - + 595 + + - 225 - - - - + 600 + + + + + 602 + - 226 - - + 604 + + - 227 - - + 605 + + @@ -1862,7 +3114,19 @@ A com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1873,6 +3137,10 @@ A Specify when to use dithering to render colors + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1885,6 +3153,7 @@ A Specify when to use dithering to render colors + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -1894,56 +3163,98 @@ A Enable use of the hacks specified below + com.apple.InterfaceBuilder.CocoaPlugin - + ToolTip ToolTip - - Chrono Cross + + Fixes black screens in Lunar - com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + ToolTip ToolTip - - Slightly distorted textures can happen + + Better fps limitation with some games - com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin + ToolTip ToolTip - - Needed by Dark Forces + + Old compatibility mode - com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin + ToolTip ToolTip - - Toggles busy flags after drawing + + Better fps limitation with some games - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Shows the full area in Capcom 2D fighters + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Maybe faster, needed for Pandemonium 2 + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Chrono Cross + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Slightly distorted textures can happen + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Needed by Dark Forces + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Toggles busy flags after drawing + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1952,90 +3263,193 @@ A com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Fixes black screens in Lunar - - - com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Better fps limitation with some games - - - com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Old compatibility mode - - - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Better fps limitation with some games - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Shows the full area in Capcom 2D fighters - - - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Maybe faster, needed for Pandemonium 2 - - - com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -2045,6 +3459,10 @@ A Removes tearing artifacts by waiting for the monitor to sync. Will cause a slight performance loss. This setting has no effect on LCD monitors. + + + + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -2054,6 +3472,7 @@ A Skip rendering frames to improve overall speed when needed. This setting might cause compatibility problems + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -2063,6 +3482,7 @@ A When Enabled a small counter will show the current performance of the rendering measured in Frames Per Second (FPS) + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -2072,16 +3492,25 @@ A Automatically enter full screen mode + com.apple.InterfaceBuilder.CocoaPlugin - 234 + 606 + + NSLayoutConstraint + NSObject + + IBProjectSource + ./Classes/NSLayoutConstraint.h + + NetSfPeopsSoftGPUPluginConfigController NSWindowController @@ -2127,6 +3556,7 @@ A NSTextField NSControl NSControl + NSMatrix NSView NSPopUpButton NSControl @@ -2164,6 +3594,10 @@ A hackEnable NSControl + + hacksMatrix + NSMatrix + hacksView NSView @@ -2204,7 +3638,7 @@ A IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx - + YES 3 @@ -2213,5 +3647,6 @@ A {10, 3} {15, 15} + YES diff --git a/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.xib b/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.xib index 5e7d9597..d5d1ba50 100644 --- a/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.xib +++ b/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.xib @@ -1,20 +1,21 @@ - 1060 - 11C74 - 1938 - 1138.23 - 567.00 + 1070 + 12E55 + 3084 + 1187.39 + 626.00 com.apple.InterfaceBuilder.CocoaPlugin - 1938 + 3084 - NSWindowTemplate - NSView - NSOpenGLView + IBNSLayoutConstraint NSCustomObject + NSOpenGLView + NSView + NSWindowTemplate com.apple.InterfaceBuilder.CocoaPlugin @@ -66,7 +67,7 @@ - {{0, 0}, {1024, 746}} + {{0, 0}, {1920, 1058}} {213, 129} {10000000000000, 10000000000000} YES @@ -133,6 +134,70 @@ + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 4 + + 1000 + + 3 + 9 + 3 + + + + 4 + 0 + + 4 + 1 + + 4 + + 1000 + + 3 + 9 + 3 + + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 5 + 22 + 2 + @@ -147,6 +212,26 @@ Application + + 18 + + + + + 19 + + + + + 20 + + + + + 21 + + + @@ -154,18 +239,37 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin NetSfPeopsSoftGPUPluginGLView + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + + + com.apple.InterfaceBuilder.CocoaPlugin - 17 + 21 + + NSLayoutConstraint + NSObject + + IBProjectSource + ./Classes/NSLayoutConstraint.h + + NetSfPeopsSoftGPUPluginWindow NSWindow @@ -188,13 +292,10 @@ IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - + YES 3 + YES diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h index d4bac705..3a8ac98a 100755 --- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h +++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h @@ -3,6 +3,7 @@ #define PluginConfigController NetSfPeopsSoftGPUPluginConfigController #import +#import "ARCBridge.h" @interface NetSfPeopsSoftGPUPluginConfigController : NSWindowController { @@ -12,6 +13,7 @@ IBOutlet NSControl *frameSkipping; IBOutlet NSControl *hackEnable; IBOutlet NSView *hacksView; + IBOutlet NSMatrix *hacksMatrix; IBOutlet NSControl *vSync; IBOutlet NSControl *shaders; IBOutlet NSTextField *vertexShaderViewablePath; @@ -27,8 +29,8 @@ NSMutableDictionary *keyValues; } -@property (retain) NSURL *vertexPath; -@property (retain) NSURL *fragmentPath; +@property (arcretain) NSURL *vertexPath; +@property (arcretain) NSURL *fragmentPath; - (IBAction)cancel:(id)sender; - (IBAction)ok:(id)sender; diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m index cbdbda74..d20849fb 100755 --- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m +++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m @@ -5,6 +5,7 @@ #include "externals.h" #import "SGPUPreferences.h" #import "ARCBridge.h" +#import "PluginGLView.h" #ifdef ENABLE_NLS #include @@ -81,18 +82,20 @@ void AboutDlgProc() void SoftDlgProc() { - NSWindow *window; - - if (windowController == nil) { - windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsSoftGPUConfig"]; - } - window = [windowController window]; - - /* load values */ - [windowController loadValues]; - - [window center]; - [window makeKeyAndOrderFront:nil]; + RunOnMainThreadSync(^{ + NSWindow *window; + + if (windowController == nil) { + windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsSoftGPUConfig"]; + } + window = [windowController window]; + + /* load values */ + [windowController loadValues]; + + [window center]; + [window makeKeyAndOrderFront:nil]; + }); } BOOL isShaderEnabled() @@ -211,11 +214,8 @@ void ReadConfig(void) [writeDic setObject:@([ditherMode indexOfSelectedItem]) forKey:@"Dither Mode"]; unsigned int hackValues = 0; - NSArray *views = [hacksView subviews]; - for (NSView *control in views) { - if ([control isKindOfClass:[NSButton class]]) { - hackValues |= [(NSControl *)control intValue] << ([control tag] - 1); - } + for (NSCell *control in [hacksMatrix cells]) { + hackValues |= [control intValue] << ([control tag] - 1); } [writeDic setObject:@(hackValues) forKey:@"Hacks"]; @@ -243,10 +243,13 @@ void ReadConfig(void) - (IBAction)hackToggle:(id)sender { BOOL enable = [sender intValue] ? YES : NO; - NSArray *views = [hacksView subviews]; + NSArray *views = [[[hacksView subviews] objectAtIndex:0] subviews]; for (NSView *control in views) { - if ([control isKindOfClass:[NSButton class]]) { + if ([control isKindOfClass:[NSControl class]]) { + if ([control isKindOfClass:[NSTextField class]]) { + [(NSTextField*)control setTextColor:enable ? [NSColor controlTextColor] : [NSColor disabledControlTextColor] ]; + } [(NSControl *)control setEnabled:enable]; } } @@ -254,10 +257,15 @@ void ReadConfig(void) - (IBAction)toggleShader:(id)sender { BOOL enable = [sender intValue] ? YES : NO; - NSArray *views = [shadersView subviews]; + NSArray *views = [[[shadersView subviews] objectAtIndex:0] subviews]; for (NSView *control in views) { - [(NSControl *)control setEnabled:enable]; + if ([control isKindOfClass:[NSControl class]]) { + if ([control isKindOfClass:[NSTextField class]]) { + [(NSTextField*)control setTextColor:enable ? [NSColor controlTextColor] : [NSColor disabledControlTextColor] ]; + } + [(NSControl *)control setEnabled:enable]; + } } } @@ -334,24 +342,14 @@ void ReadConfig(void) unsigned int hackValues = [[keyValues objectForKey:@"Hacks"] unsignedIntValue]; - NSArray *views = [hacksView subviews]; - for (NSView *control in views) { - if ([control isKindOfClass:[NSButton class]]) { - [(NSControl *)control setIntValue:(hackValues >> ([control tag] - 1)) & 1]; - } + for (NSCell *control in [hacksMatrix cells]) { + [control setIntValue:(hackValues >> ([control tag] - 1)) & 1]; } [self hackToggle:hackEnable]; [self toggleShader:shaders]; } -- (void)awakeFromNib -{ - //I don't know why we need to do this... - hacksView = [[hacksView subviews] objectAtIndex:0]; - shadersView = [[shadersView subviews] objectAtIndex:0]; -} - #if !__has_feature(objc_arc) - (void)dealloc { diff --git a/macosx/plugins/DFXVideo/macsrc/SGPUPreferences.h b/macosx/plugins/DFXVideo/macsrc/SGPUPreferences.h index 27449a69..f66f5f8a 100755 --- a/macosx/plugins/DFXVideo/macsrc/SGPUPreferences.h +++ b/macosx/plugins/DFXVideo/macsrc/SGPUPreferences.h @@ -6,14 +6,9 @@ // // -#ifndef PeopsSoftGPU_SGPUPreferences_h -#define PeopsSoftGPU_SGPUPreferences_h - #import BOOL isShaderEnabled(); NSURL *PSXFragmentShader(); NSURL *PSXVertexShader(); float PSXShaderQuality(); - -#endif diff --git a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.xib b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.xib index 9d08f139..1051d51e 100644 --- a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.xib +++ b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.xib @@ -1,7 +1,7 @@ - + - 1060 + 1070 12E55 3084 1187.39 @@ -10,8 +10,8 @@ com.apple.InterfaceBuilder.CocoaPlugin 3084 - - YES + + IBNSLayoutConstraint NSBox NSButton NSButtonCell @@ -31,17 +31,15 @@ NSTextFieldCell NSView NSWindowTemplate - - - YES + + com.apple.InterfaceBuilder.CocoaPlugin - + PluginDependencyRecalculationVersion - - YES + NetSfPeopsOpenGLPluginConfigController @@ -54,7 +52,7 @@ 1 2 - {{2, 373}, {549, 483}} + {{2, 373}, {611, 554}} 1886912512 GPU Configuration NSWindow @@ -66,180 +64,150 @@ 256 - - YES - - - 256 - {{291, 13}, {122, 32}} - - - - YES - - 67108864 - 134217728 - Cancel - - LucidaGrande - 13 - 1044 - - - -2038284288 - 1 - - - Gw - 200 - 25 - - NO - - - - 256 - {{413, 13}, {122, 32}} - - - YES - - 67108864 - 134217728 - OK - - - -2038284288 - 1 - - - DQ - 200 - 25 - - NO - + 256 - - YES + 274 - - YES - + + 256 - {{307, 18}, {189, 18}} + {{367, 26}, {189, 98}} YES - - 67108864 - 0 - Sync to Monitor Refresh - - - 1211912448 - 2 - - NSSwitch - - - - 200 - 25 - - NO - - - - 256 - {{307, 60}, {147, 18}} - - - - YES - - 67108864 - 0 - Use Frame Skipping - - - 1211912448 - 2 - - - - 200 - 25 - NO - - - - 256 - {{307, 80}, {148, 18}} - - - - YES - + 5 + 1 + + + 67108864 + 0 + Limit Frame Rate + + LucidaGrande + 13 + 1044 + + + 1211912448 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + + 67108864 + 0 + Display FPS Counter + + + 1211912448 + 2 + + + + 200 + 25 + + + 67108864 + 0 + Use Frame Skipping + + + 1211912448 + 2 + + + + 200 + 25 + + + 67108864 + 0 + Auto Full Screen + + + 1211912448 + 2 + + + + 200 + 25 + + + 67108864 + 0 + Sync to Monitor Refresh + + + 1211912448 + 2 + + + + 200 + 25 + + + {189, 18} + {0, 2} + -2080366592 + + 67108864 0 - Display FPS Counter + Limit Frame Rate - 1211912448 2 - 200 25 - NO - - - - 256 - {{307, 40}, {125, 18}} - - - - YES - - 67108864 - 0 - Auto Full Screen - - - 1211912448 - 2 - - - - 200 - 25 + -1 + -1 + + 6 + System + controlColor + + 3 + MC42NjY2NjY2NjY3AA + - NO + - + 256 - {{149, 92}, {135, 26}} + {{148, 100}, {135, 26}} - + YES - + -2076180416 2048 - + 109199360 1 @@ -253,99 +221,98 @@ 400 75 - - + + Current 1048576 2147483647 1 - + NSImage NSMenuCheckmark - + NSImage NSMenuMixedState _popUpItemAction: - + YES - + OtherViews - - YES - - - + + + + 640 x 480 1048576 2147483647 - - + + _popUpItemAction: - + - - + + 800 x 600 1048576 2147483647 - - + + _popUpItemAction: - + - - + + 1024 x 768 1048576 2147483647 - - + + _popUpItemAction: - + - - + + 1152 x 864 1048576 2147483647 - - + + _popUpItemAction: - + - - + + 1280 x1024 1048576 2147483647 - - + + _popUpItemAction: - + - - + + 1600 x 1200 1048576 2147483647 - - + + _popUpItemAction: - + - + 3 YES @@ -354,29 +321,22 @@ NO - + 256 - {{17, 97}, {136, 18}} + {{14, 106}, {136, 18}} - + + {250, 750} YES - + 67108864 272629760 Fullscreen size - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - + + 6 System @@ -389,48 +349,20 @@ NO - - - 256 - {{307, 100}, {129, 18}} - - - - YES - - 67108864 - 0 - Limit Frame Rate - - - 1211912448 - 2 - - NSImage - NSSwitch - - - - - 200 - 25 - - NO - - + 256 - {{18, 73}, {155, 18}} + {{15, 82}, {155, 18}} - + YES - + 67108864 0 Resize Proportionally - + 1211912448 2 @@ -442,22 +374,22 @@ NO - + 268 - {{145, 22}, {91, 32}} + {{195, 17}, {91, 32}} - + _NS:9 YES - + 67108864 134217728 Hacks… _NS:9 - + -2038284288 129 @@ -467,51 +399,36 @@ NO - + 268 - {{17, 13}, {126, 52}} + {{17, 24}, {126, 52}} - + _NS:9 YES NO 2 1 - - YES - + + 342884417 -1941961728 - - - YES - - YES - allowsFloats - formatterBehavior - locale - minimum - negativeInfinitySymbol - nilSymbol - positiveInfinitySymbol - - - YES - - - - - - - -∞ - - +∞ + + + + + + - + + -∞ + + +∞ + # # @@ -522,16 +439,10 @@ NaN - - YES - - YES - - - + - + 0 0 YES @@ -551,47 +462,32 @@ NO YES - + 49.703125 67108864 67108864 Width: - + - + 342884417 -1941961728 - - - YES - - YES - allowsFloats - formatterBehavior - locale - minimum - negativeInfinitySymbol - nilSymbol - numberStyle - positiveInfinitySymbol - - - YES - - - - - -∞ - - - +∞ - - + + + + + + + -∞ + + + +∞ + # # @@ -602,10 +498,10 @@ NaN - + - + 3 YES @@ -618,7 +514,7 @@ NO YES - + 1 49.703125 @@ -626,15 +522,15 @@ 67108864 Height: - + - + {126, 22} {1, 8} 76021760 NSActionCell - + 342884416 205521920 @@ -656,14 +552,14 @@ - - {{2, 2}, {510, 127}} + + {{2, 2}, {573, 134}} - + - - {{17, 333}, {514, 144}} + + {{17, 383}, {577, 151}} @@ -697,20 +593,19 @@ 256 - - YES + 274 - - YES + 256 - {{15, 219}, {144, 17}} + {{14, 260}, {121, 17}} + {250, 750} YES 67108864 @@ -726,7 +621,7 @@ 256 - {{139, 213}, {174, 26}} + {{138, 254}, {174, 26}} @@ -754,8 +649,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: @@ -764,16 +659,15 @@ OtherViews - - YES + Never 1048576 2147483647 - - + + _popUpItemAction: @@ -784,12 +678,12 @@ 1048576 2147483647 - - + + _popUpItemAction: - + 1 3 @@ -799,215 +693,22 @@ NO - - - 256 - {{349, 82}, {141, 18}} - - - - YES - - 67108864 - 131072 - Draw Wireframes Only - - - 1211912448 - 2 - - - - 200 - 25 - - NO - - - - 256 - {{349, 138}, {147, 18}} - - - - YES - - 67108864 - 131072 - Use Advanced Blending - - - 1211912448 - 2 - - - - 200 - 25 - - NO - - + 256 - {{349, 119}, {147, 18}} + {{138, 227}, {174, 22}} - + YES - - 67108864 - 131072 - Perform Opaque Pass - - - 1211912448 - 2 - - - - 200 - 25 - - NO - - - - 256 - {{349, 100}, {167, 18}} - - - - YES - - 67108864 - 131072 - Use Clipping Z-Masks - - - 1211912448 - 2 - - - - 200 - 25 - - NO - - - - 256 - {{349, 43}, {147, 18}} - - - - YES - - 67108864 - 131072 - Motion JPEG decoder - - - 1211912448 - 2 - - - - 200 - 25 - - NO - - - - 256 - {{349, 24}, {147, 18}} - - - - YES - - 67108864 - 131072 - 15bit Motion JPEGs - - - 1211912448 - 2 - - - - 200 - 25 - - NO - - - - 256 - {{349, 155}, {110, 25}} - - - - 1 - YES - - 67108864 - 131072 - Draw scan lines - - - 1211912448 - 2 - - - - 200 - 25 - - NO - - - - 256 - {{349, 62}, {147, 18}} - - - - YES - - 67108864 - 131072 - Add Blur - - - 1211912448 - 2 - - - - 200 - 25 - - NO - - - - 256 - {{139, 187}, {174, 22}} - - - - YES - - -2076180416 - 2048 - - - 109199360 - 1 - + + -2076180416 + 2048 + + + 109199360 + 1 + @@ -1021,8 +722,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: @@ -1031,16 +732,15 @@ OtherViews - - YES + None 1048576 2147483647 - - + + _popUpItemAction: @@ -1050,8 +750,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -1062,8 +762,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -1073,12 +773,12 @@ 1048576 2147483647 - - + + _popUpItemAction: - + 2 3 @@ -1091,10 +791,11 @@ 256 - {{15, 185}, {153, 21}} + {{14, 231}, {121, 21}} + {250, 750} YES 67108864 @@ -1110,17 +811,15 @@ 256 - - YES + 274 - - YES + 256 - {{105, 91}, {191, 26}} + {{145, 77}, {188, 26}} @@ -1146,8 +845,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: @@ -1156,8 +855,7 @@ OtherViews - - YES + @@ -1165,8 +863,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -1176,8 +874,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -1187,8 +885,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -1198,12 +896,12 @@ 1048576 2147483647 - - + + _popUpItemAction: - + -1 3 @@ -1216,10 +914,11 @@ 256 - {{13, 65}, {114, 17}} + {{13, 51}, {114, 17}} + {250, 750} YES 67108864 @@ -1235,10 +934,11 @@ 256 - {{13, 27}, {114, 17}} + {{14, 23}, {114, 17}} + {250, 750} YES 67108864 @@ -1254,10 +954,11 @@ 256 - {{13, 97}, {114, 17}} + {{14, 83}, {114, 17}} + {250, 750} YES 67108864 @@ -1273,10 +974,10 @@ 256 - {{106, 18}, {189, 26}} + {{145, 17}, {187, 26}} - + YES 67108864 @@ -1304,7 +1005,7 @@ 256 - {{106, 61}, {189, 26}} + {{145, 49}, {187, 26}} @@ -1328,14 +1029,14 @@ NO - - {{2, 2}, {307, 139}} + + {{2, 2}, {347, 111}} - - {{15, 13}, {311, 156}} + + {{14, 95}, {351, 128}} @@ -1364,7 +1065,7 @@ 256 - {{345, 187}, {130, 26}} + {{414, 225}, {130, 26}} @@ -1390,8 +1091,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: @@ -1400,8 +1101,7 @@ OtherViews - - YES + @@ -1409,8 +1109,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -1420,12 +1120,12 @@ 1048576 2147483647 - - + + _popUpItemAction: - + 3 YES @@ -1437,14 +1137,15 @@ 256 - {{339, 219}, {141, 17}} + {{398, 260}, {161, 17}} + {250, 750} YES 67108864 - 272629760 + 138412032 Frame Buffer Effects @@ -1456,19 +1157,15 @@ 256 - - YES - - YES - - NSColor pasteboard type - + + + NSColor pasteboard type - - {{460, 156}, {23, 22}} + + {{370, 186}, {23, 22}} - + YES NO YES @@ -1477,302 +1174,367 @@ MCAwIDAgMC4yMzk5OTk5OTQ2AA - + 256 - {{349, 5}, {147, 18}} + {{401, 18}, {155, 190}} - - YES - - 67108864 - 131072 - GTE Accuracy - - - 1211912448 - 2 - - - - 200 - 25 - - NO - - - {{2, 2}, {511, 256}} - - - - - - {{17, 56}, {515, 273}} - - - - {0, 0} - - 67108864 - 0 - Rendering - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - - 3 - 0 - 2 - NO - - - - 256 - {{160, 13}, {122, 32}} - - - - YES - - 67108864 - 134217728 - Reset - - - -2038284288 - 1 - - - - 200 - 25 - - NO - - - {549, 483} - - - - - {{0, 0}, {1920, 1058}} - {283.34100000000001, 129} - {10000000000000, 10000000000000} - YES - - - 15 - 2 - {{196, 207}, {497, 367}} - 1685586944 - Hacks - NSWindow - - - - - 256 - - YES - - - 269 - - YES - - - 274 - - YES - - - 256 - {{17, 13}, {420, 178}} - - + YES NO 9 - 2 - - YES - + 1 + + 67108864 131072 - Adjust framebuffer access + Draw scan lines - - 1 + 1211912448 2 - 200 25 - + 67108864 131072 - G4 polygon cache + Use Advanced Blending - - 10 + 1211912448 2 + 200 25 - + 67108864 131072 - Direct framebuffer updates + Perform Opaque Pass - - 2 + 1211912448 2 - 200 25 - + 67108864 131072 - Fake subtractive blending + Use Clipping Z-Masks - - 11 + 1211912448 2 + 200 25 - + 67108864 131072 - Ignore black brightness color + Draw Wireframes Only - - 3 + 1211912448 2 - 200 25 - + 67108864 131072 - Lazy upload detection + Add Blur - - 12 + 1211912448 2 + 200 25 - + 67108864 131072 - Swap front/back detection + Motion JPEG decoder - - 4 + 1211912448 2 - 200 25 - + 67108864 131072 - Odd/even bit hack + 15bit Motion JPEGs - - 13 + 1211912448 2 + 200 25 - + 67108864 131072 - Disable coord check + GTE Accuracy - - 5 + 1211912448 2 - 200 25 - - 67108864 - 131072 - Expand screen width - - - 14 - 1211912448 - 2 - + + {155, 14} + {0, 3} + -2080366592 + + + 67108864 + 131072 + Draw scan lines + + 1211912448 + 2 + + + 200 + 25 + + -1 + -1 + + + + + {{2, 2}, {573, 288}} + + + + + + {{17, 74}, {577, 305}} + + + + {0, 0} + + 67108864 + 0 + Rendering + + + + 3 + MCAwLjgwMDAwMDAxMTkAA + + + + 3 + 0 + 2 + NO + + + + 268 + {{14, 13}, {75, 32}} + + + + _NS:9 + YES + + 67108864 + 134217728 + Reset + + _NS:9 + + -2038284288 + 129 + + + 200 + 25 + + NO + + + + 268 + {{538, 13}, {59, 32}} + + + + _NS:9 + YES + + 67108864 + 134217728 + OK + + _NS:9 + + -2038284288 + 129 + + DQ + 200 + 25 + + NO + + + + 268 + {{456, 13}, {82, 32}} + + + + _NS:9 + YES + + 67108864 + 134217728 + Cancel + + _NS:9 + + -2038284288 + 129 + + Gw + 200 + 25 + + NO + + + {611, 554} + + + + + {{0, 0}, {1920, 1058}} + {283.34100000000001, 129} + {10000000000000, 10000000000000} + YES + + + 15 + 2 + {{196, 207}, {497, 367}} + 1685586944 + Hacks + NSWindow + + + + + 256 + + + + 269 + + + + 274 + + + + 256 + {{17, 13}, {420, 178}} + + + + YES + NO + 9 + 2 + + + 67108864 + 131072 + Adjust framebuffer access + + + 1 + 1211912448 + 2 + + + 200 25 - + 67108864 131072 - Remove blue glitches + G4 polygon cache - 6 + 10 + 1211912448 + 2 + + + 200 + 25 + + + 67108864 + 131072 + Direct framebuffer updates + + + 2 1211912448 2 + 200 25 - + 67108864 131072 - Use old texture filtering + Fake subtractive blending - 15 + 11 1211912448 2 @@ -1780,28 +1542,29 @@ 200 25 - + 67108864 131072 - Mixed software FB access + Ignore black brightness color - 7 + 3 1211912448 2 + 200 25 - + 67108864 131072 - Special upload detection + Lazy upload detection - 16 + 12 1211912448 2 @@ -1809,28 +1572,29 @@ 200 25 - + 67108864 131072 - Use PC FPS calculation + Swap front/back detection - 8 + 4 1211912448 2 + 200 25 - + 67108864 131072 - Use low-res FPS timer + Odd/even bit hack - 17 + 13 1211912448 2 @@ -1838,28 +1602,29 @@ 200 25 - + 67108864 131072 - Use old frame skipping + Disable coord check - 9 + 5 1211912448 2 + 200 25 - + 67108864 131072 - Fake "GPU busy" states + Expand screen width - 18 + 14 1211912448 2 @@ -1867,47 +1632,165 @@ 200 25 - - {210, 18} - {0, 2} - -2080366592 - - - 67108864 - 131072 - Odd/even bit hack - - 1 - 1211912448 - 2 - - - 200 - 25 - - -1 - -1 - - - - - {{2, 2}, {459, 202}} - - - - - {{17, 57}, {463, 206}} - - - {0, 0} - - 67108864 - 0 - - - - - 3 + + 67108864 + 131072 + Remove blue glitches + + + 6 + 1211912448 + 2 + + + + 200 + 25 + + + 67108864 + 131072 + Use old texture filtering + + + 15 + 1211912448 + 2 + + + 200 + 25 + + + 67108864 + 131072 + Mixed software FB access + + + 7 + 1211912448 + 2 + + + + 200 + 25 + + + 67108864 + 131072 + Special upload detection + + + 16 + 1211912448 + 2 + + + 200 + 25 + + + 67108864 + 131072 + Use PC FPS calculation + + + 8 + 1211912448 + 2 + + + + 200 + 25 + + + 67108864 + 131072 + Use low-res FPS timer + + + 17 + 1211912448 + 2 + + + 200 + 25 + + + 67108864 + 131072 + Use old frame skipping + + + 9 + 1211912448 + 2 + + + + 200 + 25 + + + 67108864 + 131072 + Fake "GPU busy" states + + + 18 + 1211912448 + 2 + + + 200 + 25 + + + {210, 18} + {0, 2} + -2080366592 + + + 67108864 + 131072 + Odd/even bit hack + + 1 + 1211912448 + 2 + + + 200 + 25 + + -1 + -1 + + + + + {{2, 2}, {459, 202}} + + + + + + {{17, 57}, {463, 206}} + + + + {0, 0} + + 67108864 + 0 + + + + + 3 MCAwLjgwMDAwMDAxMTkAA @@ -1922,7 +1805,9 @@ 269 {{143, 269}, {211, 56}} + + {250, 750} YES 67108864 @@ -1943,6 +1828,7 @@ A 269 {{195, 331}, {106, 18}} + YES @@ -1966,6 +1852,8 @@ A 269 {{424, 13}, {59, 32}} + + _NS:9 1 YES @@ -1990,6 +1878,7 @@ A 269 {{342, 13}, {82, 32}} + _NS:9 YES @@ -2009,8 +1898,10 @@ A NO - + {497, 367} + + _NS:20 @@ -2018,433 +1909,415 @@ A {10000000000000, 10000000000000} YES - + - - YES + - - ok: + + window - + - 133 + 141 - - cancel: + + ditherMode - + - 134 + 143 - - reset: + + offscreenDrawing - + - 135 + 232 - fpsCounter + frameBufferEffects - + - 136 + 233 - autoFullScreen + texColorDepth - + - 137 + 242 - frameSkipping + texEnhancment - + - 138 + 276 - vSync + texFiltering - + - 140 + 277 - - window + + hackToggle: - + - 141 + 500 - ditherMode + hacksWindow - + - 143 + 505 - fullscreenSize + hackEnable - + - 231 + 506 - offscreenDrawing + hacksMatrix - + - 232 + 509 - frameBufferEffects + scanlineColorWell - + - 233 + 516 - - drawScanlines + + closeHacks: - + - 234 + 526 - - advancedBlending + + closeHacks: - + - 235 + 527 - - opaquePass + + reset: - + - 236 + 669 - - wireframeOnly + + ok: - + - 237 + 678 - - blurEffect + + cancel: - + - 238 + 679 - - mjpegDecoder + + toggleCheck: - + - 239 + 713 - - mjpegDecoder15bit - - - - 240 - - - - proportionalResize - - - - 241 - - - - texColorDepth + + toggleCheck: - + - 242 + 714 - - zMaskClipping + + toggleCheck: - + - 245 + 715 - - texEnhancment + + toggleCheck: - + - 276 + 716 - - texFiltering + + toggleCheck: - + - 277 + 717 - hackToggle: + toggleCheck: - + - 500 + 718 - - hacksWindow + + toggleCheck: - + - 505 + 719 - - hackEnable + + toggleCheck: - + - 506 + 720 - showHacks: + toggleCheck: - + - 507 + 721 - - hacksMatrix + + toggleCheck: - + - 509 + 792 - - gteAccuracy + + toggleCheck: - + - 510 + 793 toggleCheck: - + - 511 + 794 toggleCheck: - + - 512 + 795 toggleCheck: - + - 513 + 796 - toggleCheck: + showHacks: - + - 514 + 933 - - toggleCheck: + + gteAccuracy - + - 515 + 956 - scanlineColorWell + mjpegDecoder15bit - + - 516 + 957 - - toggleCheck: + + mjpegDecoder - + - 517 + 958 - - toggleCheck: + + blurEffect - + - 518 + 959 - - toggleCheck: + + wireframeOnly - + - 519 + 960 - - toggleCheck: + + zMaskClipping - + - 520 + 961 - - toggleCheck: + + opaquePass - + - 521 + 962 - - toggleCheck: + + advancedBlending - + - 522 + 963 - - toggleCheck: + + drawScanlines - + - 523 + 964 - - toggleCheck: + + autoFullScreen - + - 524 + 967 - - toggleCheck: + + fpsCounter - + - 525 + 968 - - closeHacks: + + proportionalResize - + - 526 + 969 - - closeHacks: + + fullscreenSize - + - 527 + 970 windowWidth - + - 532 + 971 windowHeighth - + - 533 + 972 - delegate - - + vSync + + - 142 + 973 - initialFirstResponder - - + frameSkipping + + - 145 + 974 - nextKeyView - - + delegate + + - 9 + 142 - + - - YES + 0 - + @@ -2463,111 +2336,837 @@ A 5 - - YES + - + Window 6 - - YES + + + + 5 + 0 + + 6 + 1 + + 12 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 78 + + 1000 + + 3 + 9 + 3 + + + + 3 + 0 + + 3 + 1 + + 175 + + 1000 + + 3 + 9 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + - - - - + - - 7 - - - YES - - - - - - 8 - - - YES - - - - - - 10 - - - YES - - - - 89 - - YES - - - - - - - - - - - + + + + 3 + 0 + + 3 + 1 + + 25 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 149 + + 1000 + + 3 + 9 + 3 + + + + 3 + 0 + + 3 + 1 + + 25 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + + + + + 107 - - YES + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 20 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 6 + 0 + + 6 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 3 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 3 + 0 + + 4 + 1 + + 10 + + 1000 + + 6 + 24 + 3 + + + + 3 + 0 + + 3 + 1 + + 25 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 6 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 4 + 0 + + 4 + 1 + + 97 + + 1000 + + 3 + 9 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + - - - - - - - - - + + - - + - - 361 - - - - - 362 - - - - - 363 - - - -3 @@ -2575,1629 +3174,2607 @@ A Application - 93 - - - YES - - - + 112 + + + + + + 7 + 0 + + 0 + 1 + + 115 + + 1000 + + 3 + 9 + 1 + + + + + + 383 + + + + + 116 + + + + + + 7 + 0 + + 0 + 1 + + 169 + + 1000 + + 3 + 9 + 1 + + + + + + 384 + + + + + + + + 113 + + + + + + + + + + 111 + + + + + 114 + + + + + 115 + + + + + 202 + + + + + + 8 + 0 + + 0 + 1 + + 17 + + 1000 + + 3 + 9 + 1 + + + + + + 393 + + + + + + + + 203 + + + + + + + + + + + + 204 + + + + + 205 + + + + + 206 + + + + + 254 + + + + + 255 + + + + + 207 + + + + + + + + 394 + + + + + 212 + + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 6 + 0 + + 6 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 3 + 1 + + 25 + + 1000 + + 8 + 29 + 3 + + + + 6 + 0 + + 6 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 10 + 0 + + 10 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 6 + 0 + + 6 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 11 + 0 + + 11 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 5 + 0 + + 5 + 1 + + 15 + + 1000 + + 3 + 9 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + + + + + + + + + 215 + + + + + + 7 + 0 + + 0 + 1 + + 125 + + 1000 + + 3 + 9 + 1 + + + + + + 401 + + + + + + + + 216 + + + + + + + + + + 217 + + + + + 218 + + + + + 219 + + + + + 220 + + + + + + + + 402 + + + + + 341 + + + + + 8 + 0 + + 0 + 1 + + 22 + + 1000 + + 3 + 9 + 1 + + + + 7 + 0 + + 0 + 1 + + 23 + + 1000 + + 3 + 9 + 1 + + + + + + 169 + + + + + + 7 + 0 + + 0 + 1 + + 183 + + 1000 + + 3 + 9 + 1 + + + + + + 395 + + + + + + + + 170 + + + + + + + + + + + + 251 + + + + + 250 + + + + + 173 + + + + + 172 + + + + + 171 + + + + + 201 + + + + + + 7 + 0 + + 0 + 1 + + 108 + + 1000 + + 3 + 9 + 1 + + + + + + 398 + + + + + 193 + + + + + + + + 397 + + + + + 174 + + + + + + 7 + 0 + + 0 + 1 + + 108 + + 1000 + + 3 + 9 + 1 + + + + + + 396 + + + + + 252 + + + + + + + + 399 + + + + + 253 + + + + + + + + 400 + + + + + 472 + + + + + + + + 473 + + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 6 + 1 + + 12 + + 1000 + + 6 + 24 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 4 + 0 + + 4 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 6 + 0 + + 6 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 4 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + + + + 5 + 0 + + 5 + 1 + + 20 + + 1000 + + 8 + 29 + 3 + + + + 9 + 0 + + 9 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + + + + + + + + + + + 474 + + + + + + 4 + 0 + + 4 + 1 + + 11 + + 1000 + + 8 + 29 + 3 + + + + 5 + 0 + + 5 + 1 + + 16 + + 1000 + + 8 + 29 + 3 + + + + 3 + 0 + + 3 + 1 + + 11 + + 1000 + + 8 + 29 + 3 + + + + + + 475 + + + + + + 7 + 0 + + 0 + 1 + + 205 + + 1000 + + 3 + 9 + 1 + + + + + + 476 + + + + + + + + 477 + + + + + 478 + + + + + 479 + + + + + + + + + + + + + + + + + + + + + + + + + + 480 + + + + + 481 + + + + + 482 + + + + + 483 + + + + + 484 + + + + + 485 + + + + + 486 + + + + + 487 + + + + + 488 + + + + + 489 + + + + + 490 + + + + + 491 + + + + + 492 + + + + + 493 + + + + + 494 + + + + + 495 + + + + + 496 + + + + + 497 + + + + + 498 + + + + + 501 + + + + + + + + 502 + + - 374 - - + 503 + + + + + - 96 - - - YES - - - + 504 + + - 375 - - + 563 + + - 97 - - - YES - - - + 564 + + - 376 - - + 566 + + - 99 - - - YES - - - + 567 + + - 377 - - + 600 + + - 162 - - - YES - - - + 607 + + - 378 - - - YES - - - - - - 163 - - - YES - - - - - - - - - + 623 + + - 164 - - + 624 + + - 165 - - + 650 + + - 166 - - + 651 + + - 246 - - + 652 + + - 247 - - + 653 + + - 248 - - + 654 + + - 249 - - + 655 + + - 168 - - - YES - - - + 656 + + - 379 - - + 657 + + - 177 - - - YES - - - + 658 + + - 380 - - + 659 + + - 214 - - - YES - - - + 660 + + - 382 - - + 661 + + - 112 - - - YES - - - + 662 + + - 383 - - + 663 + + - 116 - - - YES - - - + 664 + + - 384 - - - YES - - - + 665 + + + + + - 113 - - - YES - - - - - + 666 + + - 111 - - + 667 + + - 114 - - + 668 + + - 115 - - + 670 + + + + + - 175 - - - YES - - - + 671 + + - 385 - - + 672 + + - 178 - - - YES - - - + 673 + + - 386 - - + 674 + + + + + - 179 - - - YES - - - + 675 + + - 387 - - + 676 + + - 180 - - - YES - - - + 677 + + - 388 - - + 680 + + - 181 - - - YES - - + 682 + + + + + 692 + - 389 - - + 701 + + - 182 - - - YES + 702 + + + + - + + + + + + + + - 390 - - + 703 + + - 183 - - - YES - - - + 406 + + - 391 - - + 390 + + - 185 - - - YES - - - + 389 + + 392 - + - 202 - - - YES - - - + 385 + + - 393 - - - YES - - - + 388 + + - 203 - - - YES - - - - - - - + 387 + + - 204 - - + 386 + + - 205 - - + 391 + + - 206 - - + 694 + + - 254 - - + 734 + + - 255 - - + 735 + + - 207 - - - YES - - - + 736 + + - 394 - - + 741 + + - 212 - - - YES - - - - - - - - + 748 + + - 215 - - - YES - - - + 749 + + - 401 - - - YES - - - + 754 + + - 216 - - - YES - - - - - + 755 + + - 217 - - + 758 + + - 218 - - + 767 + + + + + 785 + + + + + + + + + + - 219 - - + 786 + + - 220 - - - YES - - - + 374 + + - 402 - - + 377 + + - 341 - - + 375 + + - 169 - - - YES - - - + 376 + + - 395 - - - YES - - - + 380 + + - 170 - - - YES - - - - - - - + 799 + + - 251 - - + 814 + + - 250 - - + 907 + + - 173 - - + 908 + + + + + 7 + 0 + + 0 + 1 + + 130 + + 1000 + + 3 + 9 + 1 + + + + - 172 - - + 909 + + + + + 8 + 0 + + 0 + 1 + + 18 + + 1000 + + 3 + 9 + 1 + + + + 7 + 0 + + 0 + 1 + + 130 + + 1000 + + 3 + 9 + 1 + + + + - 171 - - + 910 + + + + + - 201 - - - YES - - - + 911 + + + + + - 398 - - + 912 + + + + + + + - 193 - - - YES - - - + 913 + + + + + - 397 - - + 914 + + + + + - 174 - - - YES - - - + 915 + + - 396 - - + 916 + + - 252 - - - YES - - - + 917 + + - 399 - - + 918 + + - 253 - - - YES - - - + 919 + + - 400 - - + 920 + + - 405 - - - YES - - - + 921 + + - 406 - - + 922 + + - 470 - - - YES - - - + 923 + + - 471 - - + 924 + + + + + - 472 - - - YES - - - + 925 + + + + + + + + + + + - 473 - - - YES - - - - - - - + 926 + + - 474 - - - YES - - - + 927 + + - 475 - - - YES - - - + 928 + + - 476 - - - YES - - - + 929 + + - 477 - - + 930 + + - 478 - - + 931 + + - 479 - - - YES - - - - - - - - - - - - - - - - - - - - - + 932 + + - 480 - - + 936 + + - 481 - - + 939 + + - 482 - - + 940 + + - 483 - - + 943 + + - 484 - - + 944 + + - 485 - - + 945 + + - 486 - - + 946 + + - 487 - - + 948 + + - 488 - - + 965 + + - 489 - - + 977 + + - 490 - - + 978 + + - 491 - - + 980 + + - 492 - - + 981 + + - 493 - - + 983 + + - 494 - - + 985 + + - 495 - - + 986 + + - 496 - - + 987 + + - 497 - - + 989 + + - - 498 - - + + 991 + + - 501 - - - YES - - - + 993 + + - 502 - - + 995 + + - 503 - - - YES - - - + 997 + + - 504 - - + 1000 + + - 528 - - - YES - - - - - + 1001 + + - 529 - - + 739 + + - 530 - - - YES - - - + 745 + + - 531 - - - YES - - - + 1013 + + - 534 - - + 1016 + + - 535 - - + 1017 + + - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 10.IBPluginDependency - 107.IBAttributePlaceholdersKey - 107.IBPluginDependency - 111.IBPluginDependency - 112.IBAttributePlaceholdersKey - 112.IBPluginDependency - 113.IBPluginDependency - 114.IBPluginDependency - 115.IBPluginDependency - 116.IBAttributePlaceholdersKey - 116.IBPluginDependency - 162.IBAttributePlaceholdersKey - 162.IBPluginDependency - 163.IBPluginDependency - 164.IBPluginDependency - 165.IBPluginDependency - 166.IBPluginDependency - 168.IBAttributePlaceholdersKey - 168.IBPluginDependency - 169.IBAttributePlaceholdersKey - 169.IBPluginDependency - 170.IBPluginDependency - 171.IBPluginDependency - 172.IBPluginDependency - 173.IBPluginDependency - 174.IBAttributePlaceholdersKey - 174.IBPluginDependency - 175.IBAttributePlaceholdersKey - 175.IBPluginDependency - 177.IBAttributePlaceholdersKey - 177.IBPluginDependency - 178.IBPluginDependency - 179.IBPluginDependency - 180.IBAttributePlaceholdersKey - 180.IBPluginDependency - 181.IBAttributePlaceholdersKey - 181.IBPluginDependency - 182.IBAttributePlaceholdersKey - 182.IBPluginDependency - 183.IBAttributePlaceholdersKey - 183.IBPluginDependency - 185.IBAttributePlaceholdersKey - 185.IBPluginDependency - 193.IBAttributePlaceholdersKey - 193.IBPluginDependency - 201.IBAttributePlaceholdersKey - 201.IBPluginDependency - 202.IBAttributePlaceholdersKey - 202.IBPluginDependency - 203.IBPluginDependency - 204.IBPluginDependency - 205.IBPluginDependency - 206.IBPluginDependency - 207.IBAttributePlaceholdersKey - 207.IBPluginDependency - 212.IBPluginDependency - 214.IBAttributePlaceholdersKey - 214.IBPluginDependency - 215.IBPluginDependency - 216.IBPluginDependency - 217.IBPluginDependency - 218.IBPluginDependency - 219.IBPluginDependency - 220.IBAttributePlaceholdersKey - 220.IBPluginDependency - 246.IBPluginDependency - 247.IBPluginDependency - 248.IBPluginDependency - 249.IBPluginDependency - 250.IBPluginDependency - 251.IBPluginDependency - 252.IBAttributePlaceholdersKey - 252.IBPluginDependency - 253.IBAttributePlaceholdersKey - 253.IBPluginDependency - 254.IBPluginDependency - 255.IBPluginDependency - 341.IBAttributePlaceholdersKey - 341.IBPluginDependency - 361.IBPluginDependency - 362.IBPluginDependency - 363.IBPluginDependency - 374.IBPluginDependency - 375.IBPluginDependency - 376.IBPluginDependency - 377.IBPluginDependency - 378.IBPluginDependency - 379.IBPluginDependency - 380.IBPluginDependency - 382.IBPluginDependency - 383.IBPluginDependency - 384.IBPluginDependency - 385.IBPluginDependency - 386.IBPluginDependency - 387.IBPluginDependency - 388.IBPluginDependency - 389.IBPluginDependency - 390.IBPluginDependency - 391.IBPluginDependency - 392.IBPluginDependency - 393.IBPluginDependency - 394.IBPluginDependency - 395.IBPluginDependency - 396.IBPluginDependency - 397.IBPluginDependency - 398.IBPluginDependency - 399.IBPluginDependency - 400.IBPluginDependency - 401.IBPluginDependency - 402.IBPluginDependency - 405.IBAttributePlaceholdersKey - 405.IBPluginDependency - 406.IBPluginDependency - 470.IBPluginDependency - 471.IBPluginDependency - 472.IBPluginDependency - 472.NSWindowTemplate.visibleAtLaunch - 473.IBPluginDependency - 474.IBPluginDependency - 475.IBPluginDependency - 476.IBPluginDependency - 477.IBPluginDependency - 478.IBPluginDependency - 479.IBPluginDependency - 480.IBAttributePlaceholdersKey - 480.IBPluginDependency - 481.IBAttributePlaceholdersKey - 481.IBPluginDependency - 482.IBAttributePlaceholdersKey - 482.IBPluginDependency - 483.IBAttributePlaceholdersKey - 483.IBPluginDependency - 484.IBAttributePlaceholdersKey - 484.IBPluginDependency - 485.IBAttributePlaceholdersKey - 485.IBPluginDependency - 486.IBAttributePlaceholdersKey - 486.IBPluginDependency - 487.IBAttributePlaceholdersKey - 487.IBPluginDependency - 488.IBAttributePlaceholdersKey - 488.IBPluginDependency - 489.IBAttributePlaceholdersKey - 489.IBPluginDependency - 490.IBAttributePlaceholdersKey - 490.IBPluginDependency - 491.IBAttributePlaceholdersKey - 491.IBPluginDependency - 492.IBAttributePlaceholdersKey - 492.IBPluginDependency - 493.IBAttributePlaceholdersKey - 493.IBPluginDependency - 494.IBAttributePlaceholdersKey - 494.IBPluginDependency - 495.IBAttributePlaceholdersKey - 495.IBPluginDependency - 496.IBAttributePlaceholdersKey - 496.IBPluginDependency - 497.IBAttributePlaceholdersKey - 497.IBPluginDependency - 498.IBPluginDependency - 5.IBPluginDependency - 5.IBWindowTemplateEditedContentRect - 501.IBPluginDependency - 502.IBPluginDependency - 503.IBPluginDependency - 504.IBPluginDependency - 528.IBPluginDependency - 529.IBPluginDependency - 530.IBPluginDependency - 531.IBPluginDependency - 534.IBNumberFormatterBehaviorMetadataKey - 534.IBNumberFormatterLocalizesFormatMetadataKey - 534.IBPluginDependency - 535.IBNumberFormatterBehaviorMetadataKey - 535.IBNumberFormatterLocalizesFormatMetadataKey - 535.IBPluginDependency - 6.IBPluginDependency - 7.IBPluginDependency - 8.IBPluginDependency - 89.IBPluginDependency - 93.IBAttributePlaceholdersKey - 93.IBPluginDependency - 96.IBAttributePlaceholdersKey - 96.IBPluginDependency - 97.IBAttributePlaceholdersKey - 97.IBPluginDependency - 99.IBAttributePlaceholdersKey - 99.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - If your card supports it, will mix textures more accurately - + + 1025 + + - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Specify when to use dithering to render colors - + + 1028 + + - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Specify when to use dithering to render colors - + + 1029 + + - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Change resolution to this when going full screen - + + 1030 + + - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Change resolution to this when going full screen - + + 1031 + + - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - The color depth of stored textures. - + + 1032 + + - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - The color depth of stored textures. - + + 1033 + + - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Transforms your playstation into a wireframe game - + + 947 + + - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Cap the frames per second so emulation doesn't get outta hand - + + 938 + + - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Enables the primitive z-buffer which masks polygons from bleeding - + + 975 + + - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Check this to emulate the special movie decoder - + + 1006 + + - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Enabling this will use a faster motion jpeg codec with some quality loss - + + 1009 + + - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Draws TV-like scan lines over the display - + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + If your card supports it, will mix textures more accurately - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - When enabled, renders an almost unnoticeable "motion blur" - + + + + + + + + + + + + + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Specify when to use dithering to render colors - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Filter textures when scaled. Higher values filter more kinds of textures, i.e. sprites. - + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Specify when to use dithering to render colors - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Select a quality level of texture scaling - + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + The color depth of stored textures. - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Use offscreen drawing to remove some graphics glitches - + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + The color depth of stored textures. - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Use offscreen drawing to remove some graphics glitches - + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Filter textures when scaled. Higher values filter more kinds of textures, i.e. sprites. - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - When checked, will keep the PSX display at natural aspect ratio - + + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Select a quality level of texture scaling - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Select the method the PSX uses to read the contents of the screen - + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Use offscreen drawing to remove some graphics glitches - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Filter textures when scaled. Higher values filter more kinds of textures, i.e. sprites. - + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Use offscreen drawing to remove some graphics glitches - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Select a quality level of texture scaling - + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Select the method the PSX uses to read the contents of the screen - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Select a color and transparency for the scanlines - + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Filter textures when scaled. Higher values filter more kinds of textures, i.e. sprites. - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Enabling this will use a faster motion jpeg codec with some quality loss - + + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Select a quality level of texture scaling - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - For buggy motherboard chipsets - + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Select a color and transparency for the scanlines - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Needed with epsxe 1.5.2 and older, Chrono Cross - + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + For buggy motherboard chipsets - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Needed by some (buggy) OpenGL ICDs - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Needed with epsxe 1.5.2 and older, Chrono Cross - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - DW7 fix (not 100% perfect...) - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Needed by some (buggy) OpenGL ICDs - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Fixes black areas with some cards - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + DW7 fix (not 100% perfect...) - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Toggles busy flags after drawing - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Fixes black areas with some cards - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Shows the full area in Capcom 2D fighters - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Toggles busy flags after drawing - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - ONLY for FF9 battle mode... yellow rect - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Shows the full area in Capcom 2D fighters - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - May show some additional splash screens - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + ONLY for FF9 battle mode... yellow rect - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - ONLY for FF7 battle cursor/battle swirl - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + May show some additional splash screens - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Speed up in nasty frame upload situations - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + ONLY for FF7 battle cursor/battle swirl - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Fixes black screens in Lunar - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Speed up in nasty frame upload situations - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Speed freaks, Killer Loop - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Fixes black screens in Lunar - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Old coord compatibility mode - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Speed freaks, Killer Loop - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Leg. o. Dragoon, Alpha Multipass needed - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Old coord compatibility mode - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Faster FB access on some systems/ATI - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Leg. o. Dragoon, Alpha Multipass needed - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Better fps limitation with some games - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Faster FB access on some systems/ATI - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Skips only every second frame - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Better fps limitation with some games - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{329, 362}, {781, 483}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Removes tearing artifacts by waiting for the monitor to sync. Will cause a slight performance loss. This setting has no effect on LCD monitors. - + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Skips only every second frame - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Skip rendering frames to improve overall speed when needed. This setting might cause compatibility problems - + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{329, 362}, {781, 483}} + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Change resolution to this when going full screen - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - When Enabled a small counter will show the current performance of the rendering measured in Frames Per Second (FPS) - + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Change resolution to this when going full screen - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Automatically enter full screen mode - + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + When checked, will keep the PSX display at natural aspect ratio - com.apple.InterfaceBuilder.CocoaPlugin - - - YES - - - + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + - - YES - - - + - 535 + 1041 - - YES + FirstResponder @@ -4216,316 +5793,215 @@ A + + NSLayoutConstraint + NSObject + + IBProjectSource + ./Classes/NSLayoutConstraint.h + + NetSfPeopsOpenGLPluginConfigController NSWindowController - - YES - - YES - cancel: - closeHacks: - hackToggle: - ok: - reset: - showHacks: - toggleCheck: + + id + id + id + id + id + id + id + + + + cancel: + id - - YES - id - id - id - id - id - id - id + + closeHacks: + id - - - YES - - YES - cancel: - closeHacks: - hackToggle: - ok: - reset: - showHacks: - toggleCheck: + + hackToggle: + id - - YES - - cancel: - id - - - closeHacks: - id - - - hackToggle: - id - - - ok: - id - - - reset: - id - - - showHacks: - id - - - toggleCheck: - id - + + ok: + id - - - YES - - YES - advancedBlending - autoFullScreen - blurEffect - ditherMode - drawScanlines - fpsCounter - frameBufferEffects - frameSkipping - fullscreenSize - gteAccuracy - hackEnable - hacksMatrix - hacksWindow - mjpegDecoder - mjpegDecoder15bit - offscreenDrawing - opaquePass - proportionalResize - scanlineColorWell - texColorDepth - texEnhancment - texFiltering - vSync - windowHeighth - windowWidth - wireframeOnly - zMaskClipping + + reset: + id - - YES - NSControl - NSControl - NSControl - NSPopUpButton - NSControl - NSControl - NSPopUpButton - NSControl - NSPopUpButton - NSControl - NSControl - NSMatrix - NSWindow - NSControl - NSControl - NSPopUpButton - NSControl - NSControl - NSColorWell - NSPopUpButton - NSSlider - NSSlider - NSControl - NSFormCell - NSFormCell - NSControl - NSControl + + showHacks: + id - - - YES - - YES - advancedBlending - autoFullScreen - blurEffect - ditherMode - drawScanlines - fpsCounter - frameBufferEffects - frameSkipping - fullscreenSize - gteAccuracy - hackEnable - hacksMatrix - hacksWindow - mjpegDecoder - mjpegDecoder15bit - offscreenDrawing - opaquePass - proportionalResize - scanlineColorWell - texColorDepth - texEnhancment - texFiltering - vSync - windowHeighth - windowWidth - wireframeOnly - zMaskClipping + + toggleCheck: + id - - YES - - advancedBlending - NSControl - - - autoFullScreen - NSControl - - - blurEffect - NSControl - - - ditherMode - NSPopUpButton - - - drawScanlines - NSControl - - - fpsCounter - NSControl - - - frameBufferEffects - NSPopUpButton - - - frameSkipping - NSControl - - - fullscreenSize - NSPopUpButton - - - gteAccuracy - NSControl - - - hackEnable - NSControl - - - hacksMatrix - NSMatrix - - - hacksWindow - NSWindow - - - mjpegDecoder - NSControl - - - mjpegDecoder15bit - NSControl - - - offscreenDrawing - NSPopUpButton - - - opaquePass - NSControl - - - proportionalResize - NSControl - - - scanlineColorWell - NSColorWell - - - texColorDepth - NSPopUpButton - - - texEnhancment - NSSlider - - - texFiltering - NSSlider - - - vSync - NSControl - - - windowHeighth - NSFormCell - - - windowWidth - NSFormCell - - - wireframeOnly - NSControl - - - zMaskClipping - NSControl - + + + NSCell + NSCell + NSCell + NSPopUpButton + NSCell + NSCell + NSPopUpButton + NSCell + NSPopUpButton + NSCell + NSControl + NSMatrix + NSWindow + NSCell + NSCell + NSPopUpButton + NSCell + NSControl + NSColorWell + NSPopUpButton + NSSlider + NSSlider + NSCell + NSFormCell + NSFormCell + NSCell + NSCell + + + + advancedBlending + NSCell - + + autoFullScreen + NSCell + + + blurEffect + NSCell + + + ditherMode + NSPopUpButton + + + drawScanlines + NSCell + + + fpsCounter + NSCell + + + frameBufferEffects + NSPopUpButton + + + frameSkipping + NSCell + + + fullscreenSize + NSPopUpButton + + + gteAccuracy + NSCell + + + hackEnable + NSControl + + + hacksMatrix + NSMatrix + + + hacksWindow + NSWindow + + + mjpegDecoder + NSCell + + + mjpegDecoder15bit + NSCell + + + offscreenDrawing + NSPopUpButton + + + opaquePass + NSCell + + + proportionalResize + NSControl + + + scanlineColorWell + NSColorWell + + + texColorDepth + NSPopUpButton + + + texEnhancment + NSSlider + + + texFiltering + NSSlider + + + vSync + NSCell + + + windowHeighth + NSFormCell + + + windowWidth + NSFormCell + + + wireframeOnly + NSCell + + + zMaskClipping + NSCell + + IBProjectSource ./Classes/NetSfPeopsOpenGLPluginConfigController.h - + 0 IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - + YES 3 - - YES - - YES - NSMenuCheckmark - NSMenuMixedState - NSSwitch - - - YES - {11, 11} - {10, 3} - {15, 15} - - + + {11, 11} + {10, 3} + {15, 15} + + YES diff --git a/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.xib b/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.xib index 64336f2f..095c38af 100644 --- a/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.xib +++ b/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.xib @@ -1,20 +1,20 @@ - 1060 - 11C74 - 1938 - 1138.23 - 567.00 + 1070 + 12E55 + 3084 + 1187.39 + 626.00 com.apple.InterfaceBuilder.CocoaPlugin - 1938 + 3084 - NSWindowTemplate - NSView - NSOpenGLView NSCustomObject + NSOpenGLView + NSView + NSWindowTemplate com.apple.InterfaceBuilder.CocoaPlugin @@ -166,6 +166,14 @@ + + NetSfPeopsOpenGLGPUPluginGLView + NSOpenGLView + + IBProjectSource + ./Classes/NetSfPeopsOpenGLGPUPluginGLView.h + + NetSfPeopsOpenGLGPUPluginWindow NSWindow @@ -177,6 +185,17 @@ NetSfPeopsSoftGPUPluginWindowController NSWindowController + + glView + NSOpenGLView + + + glView + + glView + NSOpenGLView + + IBProjectSource ./Classes/NetSfPeopsSoftGPUPluginWindowController.h @@ -188,11 +207,7 @@ IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - + YES 3 diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h index 2bc40052..0e09130e 100755 --- a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h +++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h @@ -14,11 +14,11 @@ // uses bindings to magically set user defaults. // But you can look at their grandness if you like: - IBOutlet NSControl *autoFullScreen; + IBOutlet NSCell *autoFullScreen; IBOutlet NSPopUpButton *ditherMode; - IBOutlet NSControl *fpsCounter; - IBOutlet NSControl *frameSkipping; - IBOutlet NSControl *vSync; + IBOutlet NSCell *fpsCounter; + IBOutlet NSCell *frameSkipping; + IBOutlet NSCell *vSync; IBOutlet NSControl *proportionalResize; IBOutlet NSPopUpButton *fullscreenSize; @@ -32,15 +32,15 @@ IBOutlet NSPopUpButton *frameBufferEffects; - IBOutlet NSControl *drawScanlines; - IBOutlet NSControl *advancedBlending; - IBOutlet NSControl *opaquePass; - IBOutlet NSControl *zMaskClipping; - IBOutlet NSControl *wireframeOnly; - IBOutlet NSControl *blurEffect; - IBOutlet NSControl *mjpegDecoder; - IBOutlet NSControl *mjpegDecoder15bit; - IBOutlet NSControl *gteAccuracy; + IBOutlet NSCell *drawScanlines; + IBOutlet NSCell *advancedBlending; + IBOutlet NSCell *opaquePass; + IBOutlet NSCell *zMaskClipping; + IBOutlet NSCell *wireframeOnly; + IBOutlet NSCell *blurEffect; + IBOutlet NSCell *mjpegDecoder; + IBOutlet NSCell *mjpegDecoder15bit; + IBOutlet NSCell *gteAccuracy; IBOutlet NSColorWell *scanlineColorWell; IBOutlet NSMatrix *hacksMatrix; diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m index d84ad6bc..9097ffe8 100755 --- a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m +++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m @@ -12,6 +12,7 @@ #include // bah, "externals.h" thinks include files are for wimps; OpenGL header, in fact, is needed #include "externals.h" #import "ARCBridge.h" +#import "PluginGLView.h" #ifdef ENABLE_NLS #include @@ -85,20 +86,22 @@ void AboutDlgProc() void DlgProc() { - NSWindow *window; - - PrepFactoryDefaultPreferences(); // Must do here to avoid a "when does such-and-such bind" issue - - if (windowController == nil) { - windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsOpenGLConfig"]; - } - window = [windowController window]; - - /* load values */ - [windowController loadValues]; - - [window center]; - [window makeKeyAndOrderFront:nil]; + RunOnMainThreadSync(^{ + NSWindow *window; + + PrepFactoryDefaultPreferences(); // Must do here to avoid a "when does such-and-such bind" issue + + if (windowController == nil) { + windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsOpenGLConfig"]; + } + window = [windowController window]; + + /* load values */ + [windowController loadValues]; + + [window center]; + [window makeKeyAndOrderFront:nil]; + }); } #define kFPSCounter @"FPS Counter" -- cgit v1.2.3