From e893c4eab5d51f20d506e894ea5443f8ddfe323b Mon Sep 17 00:00:00 2001 From: rogerman Date: Tue, 10 Mar 2015 19:41:04 +0000 Subject: [PATCH] =?UTF-8?q?Cocoa=20Port:=20-=20Include=20SoftRasterizer?= =?UTF-8?q?=E2=80=99s=20Fragment=20Sampling=20Hack=20setting=20in=20the=20?= =?UTF-8?q?troubleshooting=20report.=20-=20Misc.=20UI=20changes/fixes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../English.lproj/DisplayWindow.xib | 9 ++- .../English.lproj/MainMenu.strings | Bin 340288 -> 340330 bytes .../translations/English.lproj/MainMenu.xib | 53 +++++++++--------- .../troubleshootingWindowDelegate.mm | 9 +-- 4 files changed, 36 insertions(+), 35 deletions(-) diff --git a/desmume/src/cocoa/translations/English.lproj/DisplayWindow.xib b/desmume/src/cocoa/translations/English.lproj/DisplayWindow.xib index 127b1455a..7df112043 100644 --- a/desmume/src/cocoa/translations/English.lproj/DisplayWindow.xib +++ b/desmume/src/cocoa/translations/English.lproj/DisplayWindow.xib @@ -2,13 +2,13 @@ 1050 - 14C109 - 6254 + 14C1510 + 6751 1344.72 757.30 com.apple.InterfaceBuilder.CocoaPlugin - 6254 + 6751 NSButton @@ -419,7 +419,7 @@ 289 - {{152, -1}, {40, 26}} + {{151, -1}, {42, 26}} _NS:791 @@ -471,7 +471,6 @@ - -1 YES 1 YES diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.strings b/desmume/src/cocoa/translations/English.lproj/MainMenu.strings index 4fa3b1f5c2a060828727290a98b080cb145ba9e6..ed9e3ead14cd59f887ea474607bea1fed0481c37 100644 GIT binary patch delta 241 zcmX@`NaWQckqudD)BE@sRVMeSEdnz(2dMjSOb<|F(wKgMgHdm~LktVc=70JHq0{@G zGOJB*2w`TK)Fw7P;S;0O=3}i(c0z?Wvan2ZV3eBvVLPMD^bgLAEZfi6GYVOPjoenr zI4>E@YCmv?ar=QgOfJ6>rft``!FWcxZ<)-;ysD_EHMrpJ6@l$(A)o|SF7g%YbDL~Kn9Q`q)9 IN~|e-0KcSJBLDyZ delta 358 zcmaF$NaVmHkqudD>;Vjk40#Nx(-l86$xfc2wg4_*sLLon{oHXDj?D?`4jiIE4EYSX z44y!>X+RcCSD+1}?DPv9j5^cvqFLBB|IyD2g&W}bfLVD`o5*y7UPh@&t!$f5wa(iK zmrS%|l-=HE&lq3{7n(Sa(R8~^C1Xo6OlWeTt?c9jvI5gDFfj>DH}GUqnEv1{BTGBa zUB>M^cbWeDf+?I1vTM7^4dz>BaG{6%EXvat@UsYP_u^-<$bpL&wzKF@*Q;R>+J2^* z 1050 - 14C109 - 6254 + 14C1510 + 6751 1344.72 757.30 com.apple.InterfaceBuilder.CocoaPlugin - 6254 + 6751 NSArrayController @@ -17454,10 +17454,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 -2080374784 134217728 Save Settings as Default - + YES 12 - 4883 + 787 -2038153216 @@ -17935,7 +17935,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 -2080374784 134217728 Apply - + -2038153216 164 @@ -19501,7 +19501,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 -2080374784 134217728 Save Settings as Default - + -2038153216 164 @@ -19584,7 +19584,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 -2080374784 134217728 Save Settings as Default - + -2038153216 164 @@ -20968,7 +20968,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 -2080374784 134217728 Save Settings as Default - + -2038153216 164 @@ -21455,7 +21455,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 67108864 134217728 Input Preferences - + _NS:610 -2038284288 @@ -21635,7 +21635,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{57, 23}, {205, 27}} + {{65, 23}, {205, 27}} _NS:9 @@ -21660,7 +21660,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{59, 14}, {26, 11}} + {{67, 14}, {26, 11}} _NS:526 @@ -21682,7 +21682,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{104, 14}, {33, 11}} + {{112, 14}, {33, 11}} _NS:526 @@ -21704,7 +21704,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{148, 14}, {33, 11}} + {{156, 14}, {33, 11}} _NS:526 @@ -21726,7 +21726,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{196, 14}, {33, 11}} + {{204, 14}, {33, 11}} _NS:526 @@ -21748,7 +21748,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{240, 14}, {41, 11}} + {{248, 14}, {41, 11}} _NS:526 @@ -21770,7 +21770,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{16, 33}, {37, 17}} + {{24, 33}, {37, 17}} _NS:526 @@ -21798,7 +21798,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 YES 605028416 - 4199424 + 71308288 @@ -21868,7 +21868,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 67108864 0 - Host Device Info + Host Device Information @@ -21955,6 +21955,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 _NS:21 {{0, 0}, {1920, 1177}} + {10000000000000, 10000000000000} MicrophoneSettingsPanel YES @@ -22999,7 +23000,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 -2080374784 134217728 Save Settings as Default - + -2038153216 164 @@ -24937,7 +24938,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 -2080374784 134217728 Set to 0ยบ - + -2038153216 164 @@ -24958,7 +24959,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 -2080374784 134217728 Save Settings as Default - + -2038153216 164 @@ -25190,7 +25191,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 -2080374784 134217728 Set to 0% - + -2038153216 164 @@ -25212,7 +25213,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 -2080374784 134217728 Set to 100% - + -2038153216 164 @@ -25233,7 +25234,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 -2080374784 134217728 Save Settings as Default - + -2038153216 164 @@ -25858,7 +25859,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 -2080374784 134217728 Start - + _NS:2460 -2038153216 diff --git a/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm b/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm index cb0def1e1..c18347c4b 100644 --- a/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm +++ b/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm @@ -124,12 +124,15 @@ break; case CORE3DLIST_SWRASTERIZE: - render3DEngineDetails = [NSString stringWithFormat:@"%@ (HighResColor=%@, EdgeMark=%@, Fog=%@, DepthCompare=%ld)", + render3DEngineDetails = [NSString stringWithFormat:@"%@ (HighResColor=%@, EdgeMark=%@, Fog=%@, LineHack=%@, FragmentSamplingHack=%@, DepthCompare=%ld, ThreadCount=%@)", [[cdsCore cdsGPU] render3DRenderingEngineString], ([[cdsCore cdsGPU] render3DHighPrecisionColorInterpolation] ? @"YES" : @"NO"), ([[cdsCore cdsGPU] render3DEdgeMarking] ? @"YES" : @"NO"), ([[cdsCore cdsGPU] render3DFog] ? @"YES" : @"NO"), - (unsigned long)[[cdsCore cdsGPU] render3DDepthComparisonThreshold]]; + ([[cdsCore cdsGPU] render3DLineHack] ? @"YES" : @"NO"), + ([[cdsCore cdsGPU] render3DFragmentSamplingHack] ? @"YES" : @"NO"), + (unsigned long)[[cdsCore cdsGPU] render3DDepthComparisonThreshold], + ([[cdsCore cdsGPU] render3DThreads] == 0 ? @"Automatic" : [NSString stringWithFormat:@"%ld", (unsigned long)[[cdsCore cdsGPU] render3DThreads]])]; break; case CORE3DLIST_OPENGL: @@ -143,9 +146,7 @@ } finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\n3D Renderer - Engine: "] stringByAppendingString:render3DEngineDetails]; - finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\n3D Renderer - Line Hack: "] stringByAppendingString:([[cdsCore cdsGPU] render3DLineHack] ? @"YES" : @"NO")]; finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\n3D Renderer - Textures: "] stringByAppendingString:([[cdsCore cdsGPU] render3DTextures] ? @"YES" : @"NO")]; - finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\n3D Renderer - Thread Count: "] stringByAppendingString:([[cdsCore cdsGPU] render3DThreads] == 0 ? @"Automatic" : [NSString stringWithFormat:@"%ld", (unsigned long)[[cdsCore cdsGPU] render3DThreads]])]; finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nAudio - Output Engine: "] stringByAppendingString:[[emuControl cdsSpeaker] audioOutputEngineString]]; finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nAudio - Advanced SPU Logic: "] stringByAppendingString:([[emuControl cdsSpeaker] spuAdvancedLogic] ? @"YES" : @"NO")]; finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nAudio - Sound Interpolation Method: "] stringByAppendingString:[[emuControl cdsSpeaker] spuInterpolationModeString]];