Apple-2-Tools
/
ample
mirror of https://github.com/ksherlock/ample.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

let Ample do the resolution scaling math.

This commit is contained in:
Kelvin Sherlock 2023-11-17 17:07:22 -05:00
parent cbf3fd5a34
commit c1ecb40cdb
80 changed files with 90 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Ample/LaunchWindowController.m
View File

@ -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;
}

2
Ample/Resources/ace100.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/ace1000.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/ace2200.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/ace500.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/agat7.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>512</integer>
<integer>512</integer>
<integer>256</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/agat9.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>512</integer>
<integer>512</integer>
<integer>256</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/albert.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/am100.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/am64.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple1.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple2.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple2c.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple2cp.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple2e.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple2ee.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple2eefr.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple2ees.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple2eeuk.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple2ep.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple2euk.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple2gs.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>704</integer>
<integer>462</integer>
<integer>231</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple2gsr0.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>704</integer>
<integer>462</integer>
<integer>231</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple2gsr1.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>704</integer>
<integer>462</integer>
<integer>231</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple2jp.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple2p.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/apple3.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/basis108.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/cec2000.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/cece.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/cecg.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/ceci.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/cecm.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/craft2p.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/dodo.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/elppa.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/hkc8800a.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/hp9k320.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>1024</integer>
<integer>800</integer>
<integer>400</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/hp9k332.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>1024</integer>
<integer>800</integer>
<integer>400</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/hp9k340.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>1024</integer>
<integer>800</integer>
<integer>400</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/ivelultr.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/las128e2.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/las128ex.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/las3000.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/laser128.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/laser128o.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/laser2c.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/maxxi.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/megast.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>844</integer>
<integer>516</integer>
<integer>258</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/microeng.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/mprof3.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/nws1580.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>640</integer>
<integer>480</integer>
<integer>240</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/nws3410.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>640</integer>
<integer>480</integer>
<integer>240</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/nws5000x.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>640</integer>
<integer>480</integer>
<integer>240</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/pdp11qb.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>640</integer>
<integer>480</integer>
<integer>240</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/pdp11ub.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>640</integer>
<integer>480</integer>
<integer>240</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/pdp11ub2.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>640</integer>
<integer>480</integer>
<integer>240</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/prav82.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/prav8c.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/prav8m.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/rc2030.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>640</integer>
<integer>480</integer>
<integer>240</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/rtpc010.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>720</integer>
<integer>700</integer>
<integer>350</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/rtpc015.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>720</integer>
<integer>700</integer>
<integer>350</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/rtpc020.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>720</integer>
<integer>700</integer>
<integer>350</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/rtpc025.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>720</integer>
<integer>700</integer>
<integer>350</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/rtpca25.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>720</integer>
<integer>700</integer>
<integer>350</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/space84.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/spectred.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/st.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>844</integer>
<integer>516</integer>
<integer>258</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/sun1.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>640</integer>
<integer>480</integer>
<integer>240</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/tk3000.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/uniap2en.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/uniap2pt.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/uniap2ti.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/vt100.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>800</integer>
<integer>500</integer>
<integer>250</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/vt101.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>800</integer>
<integer>500</integer>
<integer>250</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/vt102.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>800</integer>
<integer>500</integer>
<integer>250</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/vt52.plist
View File

@ -12,7 +12,7 @@
<key>resolution</key>
<array>
<integer>720</integer>
<integer>480</integer>
<integer>240</integer>
</array>
<key>slots</key>
<array>

2
Ample/Resources/zijini.plist
View File

@ -14,7 +14,7 @@
<key>resolution</key>
<array>
<integer>560</integer>
<integer>384</integer>
<integer>192</integer>
</array>
<key>slots</key>
<array>

4
python/mkmachines.py
View File

@ -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]