From c1ecb40cdb25eb80edd3ea6947e6239e5357b8ae Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Fri, 17 Nov 2023 17:07:22 -0500 Subject: [PATCH] let Ample do the resolution scaling math. --- Ample/LaunchWindowController.m | 12 ++++++++++-- Ample/Resources/ace100.plist | 2 +- Ample/Resources/ace1000.plist | 2 +- Ample/Resources/ace2200.plist | 2 +- Ample/Resources/ace500.plist | 2 +- Ample/Resources/agat7.plist | 2 +- Ample/Resources/agat9.plist | 2 +- Ample/Resources/albert.plist | 2 +- Ample/Resources/am100.plist | 2 +- Ample/Resources/am64.plist | 2 +- Ample/Resources/apple1.plist | 2 +- Ample/Resources/apple2.plist | 2 +- Ample/Resources/apple2c.plist | 2 +- Ample/Resources/apple2cp.plist | 2 +- Ample/Resources/apple2e.plist | 2 +- Ample/Resources/apple2ee.plist | 2 +- Ample/Resources/apple2eefr.plist | 2 +- Ample/Resources/apple2ees.plist | 2 +- Ample/Resources/apple2eeuk.plist | 2 +- Ample/Resources/apple2ep.plist | 2 +- Ample/Resources/apple2euk.plist | 2 +- Ample/Resources/apple2gs.plist | 2 +- Ample/Resources/apple2gsr0.plist | 2 +- Ample/Resources/apple2gsr1.plist | 2 +- Ample/Resources/apple2jp.plist | 2 +- Ample/Resources/apple2p.plist | 2 +- Ample/Resources/apple3.plist | 2 +- Ample/Resources/basis108.plist | 2 +- Ample/Resources/cec2000.plist | 2 +- Ample/Resources/cece.plist | 2 +- Ample/Resources/cecg.plist | 2 +- Ample/Resources/ceci.plist | 2 +- Ample/Resources/cecm.plist | 2 +- Ample/Resources/craft2p.plist | 2 +- Ample/Resources/dodo.plist | 2 +- Ample/Resources/elppa.plist | 2 +- Ample/Resources/hkc8800a.plist | 2 +- Ample/Resources/hp9k320.plist | 2 +- Ample/Resources/hp9k332.plist | 2 +- Ample/Resources/hp9k340.plist | 2 +- Ample/Resources/ivelultr.plist | 2 +- Ample/Resources/las128e2.plist | 2 +- Ample/Resources/las128ex.plist | 2 +- Ample/Resources/las3000.plist | 2 +- Ample/Resources/laser128.plist | 2 +- Ample/Resources/laser128o.plist | 2 +- Ample/Resources/laser2c.plist | 2 +- Ample/Resources/maxxi.plist | 2 +- Ample/Resources/megast.plist | 2 +- Ample/Resources/microeng.plist | 2 +- Ample/Resources/mprof3.plist | 2 +- Ample/Resources/nws1580.plist | 2 +- Ample/Resources/nws3410.plist | 2 +- Ample/Resources/nws5000x.plist | 2 +- Ample/Resources/pdp11qb.plist | 2 +- Ample/Resources/pdp11ub.plist | 2 +- Ample/Resources/pdp11ub2.plist | 2 +- Ample/Resources/prav82.plist | 2 +- Ample/Resources/prav8c.plist | 2 +- Ample/Resources/prav8m.plist | 2 +- Ample/Resources/rc2030.plist | 2 +- Ample/Resources/rtpc010.plist | 2 +- Ample/Resources/rtpc015.plist | 2 +- Ample/Resources/rtpc020.plist | 2 +- Ample/Resources/rtpc025.plist | 2 +- Ample/Resources/rtpca25.plist | 2 +- Ample/Resources/space84.plist | 2 +- Ample/Resources/spectred.plist | 2 +- Ample/Resources/st.plist | 2 +- Ample/Resources/sun1.plist | 2 +- Ample/Resources/tk3000.plist | 2 +- Ample/Resources/uniap2en.plist | 2 +- Ample/Resources/uniap2pt.plist | 2 +- Ample/Resources/uniap2ti.plist | 2 +- Ample/Resources/vt100.plist | 2 +- Ample/Resources/vt101.plist | 2 +- Ample/Resources/vt102.plist | 2 +- Ample/Resources/vt52.plist | 2 +- Ample/Resources/zijini.plist | 2 +- python/mkmachines.py | 4 ++-- 80 files changed, 90 insertions(+), 82 deletions(-) diff --git a/Ample/LaunchWindowController.m b/Ample/LaunchWindowController.m index eceffc5..8f8ddde 100644 --- a/Ample/LaunchWindowController.m +++ b/Ample/LaunchWindowController.m @@ -482,6 +482,8 @@ static NSString *ShellQuote(NSString *s) { * for square pixels, should pass the true size and true aspect ratio. */ + + NSSize screen = [_slotController resolution]; switch(_mameWindowMode) { case 0: // full screen; @@ -498,12 +500,15 @@ static NSString *ShellQuote(NSString *s) { // drop through. case 2: // 2x case 3: // 3x - + if (_mameSquarePixels) { // NSString *aspect = [NSString stringWithFormat: @"%u:%u", (unsigned)screen.width, (unsigned)screen.height]; // [argv addObject: @"-aspect"]; // [argv addObject: aspect]; - [argv addObject: @"-nounevenstretch"]; + + float hscale = round((screen.width * 3 / 4) / screen.height); + if (hscale < 1) hscale = 1; + screen.height *= hscale; } else { screen.height = round(screen.width * 3 / 4); } @@ -516,6 +521,9 @@ static NSString *ShellQuote(NSString *s) { [argv addObject: @"-resolution"]; [argv addObject: res]; + if (_mameSquarePixels) { + [argv addObject: @"-nounevenstretch"]; + } break; } diff --git a/Ample/Resources/ace100.plist b/Ample/Resources/ace100.plist index e7f0fbd..146a11c 100644 --- a/Ample/Resources/ace100.plist +++ b/Ample/Resources/ace100.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/ace1000.plist b/Ample/Resources/ace1000.plist index 2ffbdef..01eaee3 100644 --- a/Ample/Resources/ace1000.plist +++ b/Ample/Resources/ace1000.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/ace2200.plist b/Ample/Resources/ace2200.plist index d30b8db..a77c5bc 100644 --- a/Ample/Resources/ace2200.plist +++ b/Ample/Resources/ace2200.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/ace500.plist b/Ample/Resources/ace500.plist index 1581b64..9961049 100644 --- a/Ample/Resources/ace500.plist +++ b/Ample/Resources/ace500.plist @@ -12,7 +12,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/agat7.plist b/Ample/Resources/agat7.plist index 22e808f..a417402 100644 --- a/Ample/Resources/agat7.plist +++ b/Ample/Resources/agat7.plist @@ -14,7 +14,7 @@ resolution 512 - 512 + 256 slots diff --git a/Ample/Resources/agat9.plist b/Ample/Resources/agat9.plist index 73336c5..55d7403 100644 --- a/Ample/Resources/agat9.plist +++ b/Ample/Resources/agat9.plist @@ -14,7 +14,7 @@ resolution 512 - 512 + 256 slots diff --git a/Ample/Resources/albert.plist b/Ample/Resources/albert.plist index 5b7f67b..c049b29 100644 --- a/Ample/Resources/albert.plist +++ b/Ample/Resources/albert.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/am100.plist b/Ample/Resources/am100.plist index f7d8749..25f276e 100644 --- a/Ample/Resources/am100.plist +++ b/Ample/Resources/am100.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/am64.plist b/Ample/Resources/am64.plist index 1b8fbc9..6457315 100644 --- a/Ample/Resources/am64.plist +++ b/Ample/Resources/am64.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/apple1.plist b/Ample/Resources/apple1.plist index 50ed31e..dc8acc8 100644 --- a/Ample/Resources/apple1.plist +++ b/Ample/Resources/apple1.plist @@ -12,7 +12,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/apple2.plist b/Ample/Resources/apple2.plist index 1ee552e..c4c6a3d 100644 --- a/Ample/Resources/apple2.plist +++ b/Ample/Resources/apple2.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/apple2c.plist b/Ample/Resources/apple2c.plist index 36dd2a1..777b237 100644 --- a/Ample/Resources/apple2c.plist +++ b/Ample/Resources/apple2c.plist @@ -12,7 +12,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/apple2cp.plist b/Ample/Resources/apple2cp.plist index cabfd58..f6c44eb 100644 --- a/Ample/Resources/apple2cp.plist +++ b/Ample/Resources/apple2cp.plist @@ -12,7 +12,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/apple2e.plist b/Ample/Resources/apple2e.plist index e268935..41a5b89 100644 --- a/Ample/Resources/apple2e.plist +++ b/Ample/Resources/apple2e.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/apple2ee.plist b/Ample/Resources/apple2ee.plist index b5c004c..d6037bf 100644 --- a/Ample/Resources/apple2ee.plist +++ b/Ample/Resources/apple2ee.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/apple2eefr.plist b/Ample/Resources/apple2eefr.plist index e9a09b6..eccd86a 100644 --- a/Ample/Resources/apple2eefr.plist +++ b/Ample/Resources/apple2eefr.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/apple2ees.plist b/Ample/Resources/apple2ees.plist index b88133b..21e8218 100644 --- a/Ample/Resources/apple2ees.plist +++ b/Ample/Resources/apple2ees.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/apple2eeuk.plist b/Ample/Resources/apple2eeuk.plist index 3a9f49e..2cee0fd 100644 --- a/Ample/Resources/apple2eeuk.plist +++ b/Ample/Resources/apple2eeuk.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/apple2ep.plist b/Ample/Resources/apple2ep.plist index 8a7b037..fbf8eca 100644 --- a/Ample/Resources/apple2ep.plist +++ b/Ample/Resources/apple2ep.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/apple2euk.plist b/Ample/Resources/apple2euk.plist index 6e8246c..09f76e6 100644 --- a/Ample/Resources/apple2euk.plist +++ b/Ample/Resources/apple2euk.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/apple2gs.plist b/Ample/Resources/apple2gs.plist index f7b9662..249300a 100644 --- a/Ample/Resources/apple2gs.plist +++ b/Ample/Resources/apple2gs.plist @@ -12,7 +12,7 @@ resolution 704 - 462 + 231 slots diff --git a/Ample/Resources/apple2gsr0.plist b/Ample/Resources/apple2gsr0.plist index 83200ef..2de45dc 100644 --- a/Ample/Resources/apple2gsr0.plist +++ b/Ample/Resources/apple2gsr0.plist @@ -12,7 +12,7 @@ resolution 704 - 462 + 231 slots diff --git a/Ample/Resources/apple2gsr1.plist b/Ample/Resources/apple2gsr1.plist index bac8d03..afbacff 100644 --- a/Ample/Resources/apple2gsr1.plist +++ b/Ample/Resources/apple2gsr1.plist @@ -12,7 +12,7 @@ resolution 704 - 462 + 231 slots diff --git a/Ample/Resources/apple2jp.plist b/Ample/Resources/apple2jp.plist index ce326e6..f96514f 100644 --- a/Ample/Resources/apple2jp.plist +++ b/Ample/Resources/apple2jp.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/apple2p.plist b/Ample/Resources/apple2p.plist index 5d2ef5e..181ae4e 100644 --- a/Ample/Resources/apple2p.plist +++ b/Ample/Resources/apple2p.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/apple3.plist b/Ample/Resources/apple3.plist index f9d7f96..21f9ac3 100644 --- a/Ample/Resources/apple3.plist +++ b/Ample/Resources/apple3.plist @@ -12,7 +12,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/basis108.plist b/Ample/Resources/basis108.plist index d155266..20ee88d 100644 --- a/Ample/Resources/basis108.plist +++ b/Ample/Resources/basis108.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/cec2000.plist b/Ample/Resources/cec2000.plist index 22c5205..55bb2f0 100644 --- a/Ample/Resources/cec2000.plist +++ b/Ample/Resources/cec2000.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/cece.plist b/Ample/Resources/cece.plist index fd99e05..f029dd2 100644 --- a/Ample/Resources/cece.plist +++ b/Ample/Resources/cece.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/cecg.plist b/Ample/Resources/cecg.plist index 0b45817..886c75d 100644 --- a/Ample/Resources/cecg.plist +++ b/Ample/Resources/cecg.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/ceci.plist b/Ample/Resources/ceci.plist index cf26ebd..a24dbbf 100644 --- a/Ample/Resources/ceci.plist +++ b/Ample/Resources/ceci.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/cecm.plist b/Ample/Resources/cecm.plist index a7fe7b7..69b1328 100644 --- a/Ample/Resources/cecm.plist +++ b/Ample/Resources/cecm.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/craft2p.plist b/Ample/Resources/craft2p.plist index 8108225..023c004 100644 --- a/Ample/Resources/craft2p.plist +++ b/Ample/Resources/craft2p.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/dodo.plist b/Ample/Resources/dodo.plist index 6112348..7301be1 100644 --- a/Ample/Resources/dodo.plist +++ b/Ample/Resources/dodo.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/elppa.plist b/Ample/Resources/elppa.plist index b82dd6f..6b90437 100644 --- a/Ample/Resources/elppa.plist +++ b/Ample/Resources/elppa.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/hkc8800a.plist b/Ample/Resources/hkc8800a.plist index 7fc9764..9e371b9 100644 --- a/Ample/Resources/hkc8800a.plist +++ b/Ample/Resources/hkc8800a.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/hp9k320.plist b/Ample/Resources/hp9k320.plist index 0d3986a..851407f 100644 --- a/Ample/Resources/hp9k320.plist +++ b/Ample/Resources/hp9k320.plist @@ -12,7 +12,7 @@ resolution 1024 - 800 + 400 slots diff --git a/Ample/Resources/hp9k332.plist b/Ample/Resources/hp9k332.plist index 96ee06f..cb59a6d 100644 --- a/Ample/Resources/hp9k332.plist +++ b/Ample/Resources/hp9k332.plist @@ -12,7 +12,7 @@ resolution 1024 - 800 + 400 slots diff --git a/Ample/Resources/hp9k340.plist b/Ample/Resources/hp9k340.plist index 98a2d69..d00849f 100644 --- a/Ample/Resources/hp9k340.plist +++ b/Ample/Resources/hp9k340.plist @@ -12,7 +12,7 @@ resolution 1024 - 800 + 400 slots diff --git a/Ample/Resources/ivelultr.plist b/Ample/Resources/ivelultr.plist index e9e53a3..cc0c12e 100644 --- a/Ample/Resources/ivelultr.plist +++ b/Ample/Resources/ivelultr.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/las128e2.plist b/Ample/Resources/las128e2.plist index c933ff0..bd71786 100644 --- a/Ample/Resources/las128e2.plist +++ b/Ample/Resources/las128e2.plist @@ -12,7 +12,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/las128ex.plist b/Ample/Resources/las128ex.plist index 736c81a..2e87efa 100644 --- a/Ample/Resources/las128ex.plist +++ b/Ample/Resources/las128ex.plist @@ -12,7 +12,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/las3000.plist b/Ample/Resources/las3000.plist index ff437c1..0f7d18d 100644 --- a/Ample/Resources/las3000.plist +++ b/Ample/Resources/las3000.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/laser128.plist b/Ample/Resources/laser128.plist index 6e5ba38..2c6de9e 100644 --- a/Ample/Resources/laser128.plist +++ b/Ample/Resources/laser128.plist @@ -12,7 +12,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/laser128o.plist b/Ample/Resources/laser128o.plist index 756089b..8f427f6 100644 --- a/Ample/Resources/laser128o.plist +++ b/Ample/Resources/laser128o.plist @@ -12,7 +12,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/laser2c.plist b/Ample/Resources/laser2c.plist index cf858b3..8bb6587 100644 --- a/Ample/Resources/laser2c.plist +++ b/Ample/Resources/laser2c.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/maxxi.plist b/Ample/Resources/maxxi.plist index 95a5663..a90a093 100644 --- a/Ample/Resources/maxxi.plist +++ b/Ample/Resources/maxxi.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/megast.plist b/Ample/Resources/megast.plist index 0228e7c..473274f 100644 --- a/Ample/Resources/megast.plist +++ b/Ample/Resources/megast.plist @@ -12,7 +12,7 @@ resolution 844 - 516 + 258 slots diff --git a/Ample/Resources/microeng.plist b/Ample/Resources/microeng.plist index f439d47..9523fb5 100644 --- a/Ample/Resources/microeng.plist +++ b/Ample/Resources/microeng.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/mprof3.plist b/Ample/Resources/mprof3.plist index 854c718..564bbf0 100644 --- a/Ample/Resources/mprof3.plist +++ b/Ample/Resources/mprof3.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/nws1580.plist b/Ample/Resources/nws1580.plist index e8249ce..b6a097c 100644 --- a/Ample/Resources/nws1580.plist +++ b/Ample/Resources/nws1580.plist @@ -12,7 +12,7 @@ resolution 640 - 480 + 240 slots diff --git a/Ample/Resources/nws3410.plist b/Ample/Resources/nws3410.plist index 3f8de00..4937e98 100644 --- a/Ample/Resources/nws3410.plist +++ b/Ample/Resources/nws3410.plist @@ -12,7 +12,7 @@ resolution 640 - 480 + 240 slots diff --git a/Ample/Resources/nws5000x.plist b/Ample/Resources/nws5000x.plist index 76f690c..34880cd 100644 --- a/Ample/Resources/nws5000x.plist +++ b/Ample/Resources/nws5000x.plist @@ -12,7 +12,7 @@ resolution 640 - 480 + 240 slots diff --git a/Ample/Resources/pdp11qb.plist b/Ample/Resources/pdp11qb.plist index 8659e53..56ca022 100644 --- a/Ample/Resources/pdp11qb.plist +++ b/Ample/Resources/pdp11qb.plist @@ -14,7 +14,7 @@ resolution 640 - 480 + 240 slots diff --git a/Ample/Resources/pdp11ub.plist b/Ample/Resources/pdp11ub.plist index d124a6a..6042ac4 100644 --- a/Ample/Resources/pdp11ub.plist +++ b/Ample/Resources/pdp11ub.plist @@ -14,7 +14,7 @@ resolution 640 - 480 + 240 slots diff --git a/Ample/Resources/pdp11ub2.plist b/Ample/Resources/pdp11ub2.plist index 36991fd..4cd7c82 100644 --- a/Ample/Resources/pdp11ub2.plist +++ b/Ample/Resources/pdp11ub2.plist @@ -14,7 +14,7 @@ resolution 640 - 480 + 240 slots diff --git a/Ample/Resources/prav82.plist b/Ample/Resources/prav82.plist index fb98230..fcef22e 100644 --- a/Ample/Resources/prav82.plist +++ b/Ample/Resources/prav82.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/prav8c.plist b/Ample/Resources/prav8c.plist index 5025f5b..43257c7 100644 --- a/Ample/Resources/prav8c.plist +++ b/Ample/Resources/prav8c.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/prav8m.plist b/Ample/Resources/prav8m.plist index 4155df9..27a4bd4 100644 --- a/Ample/Resources/prav8m.plist +++ b/Ample/Resources/prav8m.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/rc2030.plist b/Ample/Resources/rc2030.plist index 4946bab..6deff5b 100644 --- a/Ample/Resources/rc2030.plist +++ b/Ample/Resources/rc2030.plist @@ -12,7 +12,7 @@ resolution 640 - 480 + 240 slots diff --git a/Ample/Resources/rtpc010.plist b/Ample/Resources/rtpc010.plist index 6ec5425..0af4a6b 100644 --- a/Ample/Resources/rtpc010.plist +++ b/Ample/Resources/rtpc010.plist @@ -12,7 +12,7 @@ resolution 720 - 700 + 350 slots diff --git a/Ample/Resources/rtpc015.plist b/Ample/Resources/rtpc015.plist index 419f979..11b8129 100644 --- a/Ample/Resources/rtpc015.plist +++ b/Ample/Resources/rtpc015.plist @@ -12,7 +12,7 @@ resolution 720 - 700 + 350 slots diff --git a/Ample/Resources/rtpc020.plist b/Ample/Resources/rtpc020.plist index 51331b8..5d31d13 100644 --- a/Ample/Resources/rtpc020.plist +++ b/Ample/Resources/rtpc020.plist @@ -12,7 +12,7 @@ resolution 720 - 700 + 350 slots diff --git a/Ample/Resources/rtpc025.plist b/Ample/Resources/rtpc025.plist index ce67c27..e661522 100644 --- a/Ample/Resources/rtpc025.plist +++ b/Ample/Resources/rtpc025.plist @@ -12,7 +12,7 @@ resolution 720 - 700 + 350 slots diff --git a/Ample/Resources/rtpca25.plist b/Ample/Resources/rtpca25.plist index df81888..6a6c75a 100644 --- a/Ample/Resources/rtpca25.plist +++ b/Ample/Resources/rtpca25.plist @@ -12,7 +12,7 @@ resolution 720 - 700 + 350 slots diff --git a/Ample/Resources/space84.plist b/Ample/Resources/space84.plist index 310009b..1cbd972 100644 --- a/Ample/Resources/space84.plist +++ b/Ample/Resources/space84.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/spectred.plist b/Ample/Resources/spectred.plist index 9c412a7..62ddfde 100644 --- a/Ample/Resources/spectred.plist +++ b/Ample/Resources/spectred.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/st.plist b/Ample/Resources/st.plist index 936e014..070801b 100644 --- a/Ample/Resources/st.plist +++ b/Ample/Resources/st.plist @@ -12,7 +12,7 @@ resolution 844 - 516 + 258 slots diff --git a/Ample/Resources/sun1.plist b/Ample/Resources/sun1.plist index 66e10e2..2c939b0 100644 --- a/Ample/Resources/sun1.plist +++ b/Ample/Resources/sun1.plist @@ -12,7 +12,7 @@ resolution 640 - 480 + 240 slots diff --git a/Ample/Resources/tk3000.plist b/Ample/Resources/tk3000.plist index a889aae..dc995ec 100644 --- a/Ample/Resources/tk3000.plist +++ b/Ample/Resources/tk3000.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/uniap2en.plist b/Ample/Resources/uniap2en.plist index 7a6356b..a177ca3 100644 --- a/Ample/Resources/uniap2en.plist +++ b/Ample/Resources/uniap2en.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/uniap2pt.plist b/Ample/Resources/uniap2pt.plist index 3b3bc3b..c9fbcc0 100644 --- a/Ample/Resources/uniap2pt.plist +++ b/Ample/Resources/uniap2pt.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/uniap2ti.plist b/Ample/Resources/uniap2ti.plist index 4a00439..292cc02 100644 --- a/Ample/Resources/uniap2ti.plist +++ b/Ample/Resources/uniap2ti.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/Ample/Resources/vt100.plist b/Ample/Resources/vt100.plist index 2ba39a4..b049065 100644 --- a/Ample/Resources/vt100.plist +++ b/Ample/Resources/vt100.plist @@ -12,7 +12,7 @@ resolution 800 - 500 + 250 slots diff --git a/Ample/Resources/vt101.plist b/Ample/Resources/vt101.plist index 2cef456..9f6d33b 100644 --- a/Ample/Resources/vt101.plist +++ b/Ample/Resources/vt101.plist @@ -12,7 +12,7 @@ resolution 800 - 500 + 250 slots diff --git a/Ample/Resources/vt102.plist b/Ample/Resources/vt102.plist index b0bad0c..74f6871 100644 --- a/Ample/Resources/vt102.plist +++ b/Ample/Resources/vt102.plist @@ -12,7 +12,7 @@ resolution 800 - 500 + 250 slots diff --git a/Ample/Resources/vt52.plist b/Ample/Resources/vt52.plist index 93e26eb..0a14753 100644 --- a/Ample/Resources/vt52.plist +++ b/Ample/Resources/vt52.plist @@ -12,7 +12,7 @@ resolution 720 - 480 + 240 slots diff --git a/Ample/Resources/zijini.plist b/Ample/Resources/zijini.plist index 8aeff4f..c79e755 100644 --- a/Ample/Resources/zijini.plist +++ b/Ample/Resources/zijini.plist @@ -14,7 +14,7 @@ resolution 560 - 384 + 192 slots diff --git a/python/mkmachines.py b/python/mkmachines.py index 10c3bd6..57f4bc5 100644 --- a/python/mkmachines.py +++ b/python/mkmachines.py @@ -612,8 +612,8 @@ def find_machine_resolution(machine): # raster screens have a default aspect ratio of 4 : 3 # pre-calc something like that, but integer-based. - hscale = round((width * 3 / 4 ) / height) - if hscale < 1 : hscale = 1 + #hscale = round((width * 3 / 4 ) / height) + #if hscale < 1 : hscale = 1 return [width, height * hscale]