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 --- .../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 - 5 files changed, 2286 insertions(+), 755 deletions(-) (limited to 'macosx/plugins/DFXVideo') 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 -- cgit v1.2.3